Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
ad930bdd
Kaydet (Commit)
ad930bdd
authored
Ock 28, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
bool improvements
Change-Id: I171212bbfc2f54a16b5669ab4401a3168e7f0552
üst
0f50845d
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
23 deletions
+23
-23
binarycodec.cxx
oox/source/core/binarycodec.cxx
+4
-4
customshapegeometry.cxx
oox/source/drawingml/customshapegeometry.cxx
+2
-2
tablecellcontext.cxx
oox/source/drawingml/table/tablecellcontext.cxx
+3
-3
tablecontext.cxx
oox/source/drawingml/table/tablecontext.cxx
+7
-7
transform2dcontext.cxx
oox/source/drawingml/transform2dcontext.cxx
+1
-1
axcontrol.cxx
oox/source/ole/axcontrol.cxx
+1
-1
headerfootercontext.cxx
oox/source/ppt/headerfootercontext.cxx
+4
-4
slidefragmenthandler.cxx
oox/source/ppt/slidefragmenthandler.cxx
+1
-1
No files found.
oox/source/core/binarycodec.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -176,7 +176,7 @@ void BinaryCodec_XOR::initKey( const sal_uInt8 pnPassData[ 16 ] )
...
@@ -176,7 +176,7 @@ void BinaryCodec_XOR::initKey( const sal_uInt8 pnPassData[ 16 ] )
bool
BinaryCodec_XOR
::
initCodec
(
const
uno
::
Sequence
<
beans
::
NamedValue
>&
aData
)
bool
BinaryCodec_XOR
::
initCodec
(
const
uno
::
Sequence
<
beans
::
NamedValue
>&
aData
)
{
{
bool
bResult
=
sal_F
alse
;
bool
bResult
=
f
alse
;
::
comphelper
::
SequenceAsHashMap
aHashData
(
aData
);
::
comphelper
::
SequenceAsHashMap
aHashData
(
aData
);
uno
::
Sequence
<
sal_Int8
>
aKey
=
aHashData
.
getUnpackedValueOrDefault
(
"XOR95EncryptionKey"
,
uno
::
Sequence
<
sal_Int8
>
()
);
uno
::
Sequence
<
sal_Int8
>
aKey
=
aHashData
.
getUnpackedValueOrDefault
(
"XOR95EncryptionKey"
,
uno
::
Sequence
<
sal_Int8
>
()
);
...
@@ -184,7 +184,7 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence< beans::NamedValue >& aData
...
@@ -184,7 +184,7 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence< beans::NamedValue >& aData
if
(
aKey
.
getLength
()
==
16
)
if
(
aKey
.
getLength
()
==
16
)
{
{
(
void
)
memcpy
(
mpnKey
,
aKey
.
getConstArray
(),
16
);
(
void
)
memcpy
(
mpnKey
,
aKey
.
getConstArray
(),
16
);
bResult
=
sal_T
rue
;
bResult
=
t
rue
;
mnBaseKey
=
(
sal_uInt16
)
aHashData
.
getUnpackedValueOrDefault
(
"XOR95BaseKey"
,
(
sal_Int16
)
0
);
mnBaseKey
=
(
sal_uInt16
)
aHashData
.
getUnpackedValueOrDefault
(
"XOR95BaseKey"
,
(
sal_Int16
)
0
);
mnHash
=
(
sal_uInt16
)
aHashData
.
getUnpackedValueOrDefault
(
"XOR95PasswordHash"
,
(
sal_Int16
)
0
);
mnHash
=
(
sal_uInt16
)
aHashData
.
getUnpackedValueOrDefault
(
"XOR95PasswordHash"
,
(
sal_Int16
)
0
);
...
@@ -283,7 +283,7 @@ BinaryCodec_RCF::~BinaryCodec_RCF()
...
@@ -283,7 +283,7 @@ BinaryCodec_RCF::~BinaryCodec_RCF()
bool
BinaryCodec_RCF
::
initCodec
(
const
uno
::
Sequence
<
beans
::
NamedValue
>&
aData
)
bool
BinaryCodec_RCF
::
initCodec
(
const
uno
::
Sequence
<
beans
::
NamedValue
>&
aData
)
{
{
bool
bResult
=
sal_F
alse
;
bool
bResult
=
f
alse
;
::
comphelper
::
SequenceAsHashMap
aHashData
(
aData
);
::
comphelper
::
SequenceAsHashMap
aHashData
(
aData
);
uno
::
Sequence
<
sal_Int8
>
aKey
=
aHashData
.
getUnpackedValueOrDefault
(
"STD97EncryptionKey"
,
uno
::
Sequence
<
sal_Int8
>
()
);
uno
::
Sequence
<
sal_Int8
>
aKey
=
aHashData
.
getUnpackedValueOrDefault
(
"STD97EncryptionKey"
,
uno
::
Sequence
<
sal_Int8
>
()
);
...
@@ -295,7 +295,7 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence< beans::NamedValue >& aData
...
@@ -295,7 +295,7 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence< beans::NamedValue >& aData
if
(
aUniqueID
.
getLength
()
==
16
)
if
(
aUniqueID
.
getLength
()
==
16
)
{
{
(
void
)
memcpy
(
mpnUnique
,
aUniqueID
.
getConstArray
(),
16
);
(
void
)
memcpy
(
mpnUnique
,
aUniqueID
.
getConstArray
(),
16
);
bResult
=
sal_F
alse
;
bResult
=
f
alse
;
}
}
else
else
OSL_FAIL
(
"Unexpected document ID!
\n
"
);
OSL_FAIL
(
"Unexpected document ID!
\n
"
);
...
...
oox/source/drawingml/customshapegeometry.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -979,8 +979,8 @@ Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeLis
...
@@ -979,8 +979,8 @@ Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeLis
rPath2D
.
w
=
rAttribs
.
getString
(
XML_w
,
aEmptyString
).
toInt64
();
rPath2D
.
w
=
rAttribs
.
getString
(
XML_w
,
aEmptyString
).
toInt64
();
rPath2D
.
h
=
rAttribs
.
getString
(
XML_h
,
aEmptyString
).
toInt64
();
rPath2D
.
h
=
rAttribs
.
getString
(
XML_h
,
aEmptyString
).
toInt64
();
rPath2D
.
fill
=
rAttribs
.
getToken
(
XML_fill
,
XML_norm
);
rPath2D
.
fill
=
rAttribs
.
getToken
(
XML_fill
,
XML_norm
);
rPath2D
.
stroke
=
rAttribs
.
getBool
(
XML_stroke
,
sal_T
rue
);
rPath2D
.
stroke
=
rAttribs
.
getBool
(
XML_stroke
,
t
rue
);
rPath2D
.
extrusionOk
=
rAttribs
.
getBool
(
XML_extrusionOk
,
sal_T
rue
);
rPath2D
.
extrusionOk
=
rAttribs
.
getBool
(
XML_extrusionOk
,
t
rue
);
}
}
Path2DContext
::~
Path2DContext
()
Path2DContext
::~
Path2DContext
()
...
...
oox/source/drawingml/table/tablecellcontext.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -39,8 +39,8 @@ TableCellContext::TableCellContext( ContextHandler2Helper& rParent, const Attrib
...
@@ -39,8 +39,8 @@ TableCellContext::TableCellContext( ContextHandler2Helper& rParent, const Attrib
if
(
rAttribs
.
hasAttribute
(
XML_gridSpan
)
)
if
(
rAttribs
.
hasAttribute
(
XML_gridSpan
)
)
mrTableCell
.
setGridSpan
(
rAttribs
.
getString
(
XML_gridSpan
).
get
().
toInt32
()
);
mrTableCell
.
setGridSpan
(
rAttribs
.
getString
(
XML_gridSpan
).
get
().
toInt32
()
);
mrTableCell
.
sethMerge
(
rAttribs
.
getBool
(
XML_hMerge
,
sal_F
alse
)
);
mrTableCell
.
sethMerge
(
rAttribs
.
getBool
(
XML_hMerge
,
f
alse
)
);
mrTableCell
.
setvMerge
(
rAttribs
.
getBool
(
XML_vMerge
,
sal_F
alse
)
);
mrTableCell
.
setvMerge
(
rAttribs
.
getBool
(
XML_vMerge
,
f
alse
)
);
}
}
TableCellContext
::~
TableCellContext
()
TableCellContext
::~
TableCellContext
()
...
@@ -67,7 +67,7 @@ TableCellContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeLis
...
@@ -67,7 +67,7 @@ TableCellContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeLis
mrTableCell
.
setBottomMargin
(
rAttribs
.
getInteger
(
XML_marB
,
45720
)
);
mrTableCell
.
setBottomMargin
(
rAttribs
.
getInteger
(
XML_marB
,
45720
)
);
mrTableCell
.
setVertToken
(
rAttribs
.
getToken
(
XML_vert
,
XML_horz
)
);
// ST_TextVerticalType
mrTableCell
.
setVertToken
(
rAttribs
.
getToken
(
XML_vert
,
XML_horz
)
);
// ST_TextVerticalType
mrTableCell
.
setAnchorToken
(
rAttribs
.
getToken
(
XML_anchor
,
XML_t
)
);
// ST_TextAnchoringType
mrTableCell
.
setAnchorToken
(
rAttribs
.
getToken
(
XML_anchor
,
XML_t
)
);
// ST_TextAnchoringType
mrTableCell
.
setAnchorCtr
(
rAttribs
.
getBool
(
XML_anchorCtr
,
sal_F
alse
)
);
mrTableCell
.
setAnchorCtr
(
rAttribs
.
getBool
(
XML_anchorCtr
,
f
alse
)
);
mrTableCell
.
setHorzOverflowToken
(
rAttribs
.
getToken
(
XML_horzOverflow
,
XML_clip
)
);
// ST_TextHorzOverflowType
mrTableCell
.
setHorzOverflowToken
(
rAttribs
.
getToken
(
XML_horzOverflow
,
XML_clip
)
);
// ST_TextHorzOverflowType
}
}
break
;
break
;
...
...
oox/source/drawingml/table/tablecontext.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -48,13 +48,13 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r
...
@@ -48,13 +48,13 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r
{
{
case
A_TOKEN
(
tblPr
):
// CT_TableProperties
case
A_TOKEN
(
tblPr
):
// CT_TableProperties
{
{
mrTableProperties
.
isRtl
()
=
rAttribs
.
getBool
(
XML_rtl
,
sal_F
alse
);
mrTableProperties
.
isRtl
()
=
rAttribs
.
getBool
(
XML_rtl
,
f
alse
);
mrTableProperties
.
isFirstRow
()
=
rAttribs
.
getBool
(
XML_firstRow
,
sal_F
alse
);
mrTableProperties
.
isFirstRow
()
=
rAttribs
.
getBool
(
XML_firstRow
,
f
alse
);
mrTableProperties
.
isFirstCol
()
=
rAttribs
.
getBool
(
XML_firstCol
,
sal_F
alse
);
mrTableProperties
.
isFirstCol
()
=
rAttribs
.
getBool
(
XML_firstCol
,
f
alse
);
mrTableProperties
.
isLastRow
()
=
rAttribs
.
getBool
(
XML_lastRow
,
sal_F
alse
);
mrTableProperties
.
isLastRow
()
=
rAttribs
.
getBool
(
XML_lastRow
,
f
alse
);
mrTableProperties
.
isLastCol
()
=
rAttribs
.
getBool
(
XML_lastCol
,
sal_F
alse
);
mrTableProperties
.
isLastCol
()
=
rAttribs
.
getBool
(
XML_lastCol
,
f
alse
);
mrTableProperties
.
isBandRow
()
=
rAttribs
.
getBool
(
XML_bandRow
,
sal_F
alse
);
mrTableProperties
.
isBandRow
()
=
rAttribs
.
getBool
(
XML_bandRow
,
f
alse
);
mrTableProperties
.
isBandCol
()
=
rAttribs
.
getBool
(
XML_bandCol
,
sal_F
alse
);
mrTableProperties
.
isBandCol
()
=
rAttribs
.
getBool
(
XML_bandCol
,
f
alse
);
}
}
break
;
break
;
case
A_TOKEN
(
tableStyle
):
// CT_TableStyle
case
A_TOKEN
(
tableStyle
):
// CT_TableStyle
...
...
oox/source/drawingml/transform2dcontext.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -42,7 +42,7 @@ Transform2DContext::Transform2DContext( ContextHandler2Helper& rParent, const At
...
@@ -42,7 +42,7 @@ Transform2DContext::Transform2DContext( ContextHandler2Helper& rParent, const At
if
(
!
btxXfrm
)
if
(
!
btxXfrm
)
{
{
mrShape
.
setRotation
(
rAttribs
.
getInteger
(
XML_rot
,
0
)
);
// 60000ths of a degree Positive angles are clockwise; negative angles are counter-clockwise
mrShape
.
setRotation
(
rAttribs
.
getInteger
(
XML_rot
,
0
)
);
// 60000ths of a degree Positive angles are clockwise; negative angles are counter-clockwise
mrShape
.
setFlip
(
rAttribs
.
getBool
(
XML_flipH
,
sal_False
),
rAttribs
.
getBool
(
XML_flipV
,
sal_F
alse
)
);
mrShape
.
setFlip
(
rAttribs
.
getBool
(
XML_flipH
,
false
),
rAttribs
.
getBool
(
XML_flipV
,
f
alse
)
);
}
}
else
else
{
{
...
...
oox/source/ole/axcontrol.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -2629,7 +2629,7 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm )
...
@@ -2629,7 +2629,7 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm )
for
(
std
::
vector
<
sal_Int16
>::
iterator
it
=
selectedIndices
.
begin
();
it
!=
selectedIndices
.
end
();
++
it
,
++
index
)
for
(
std
::
vector
<
sal_Int16
>::
iterator
it
=
selectedIndices
.
begin
();
it
!=
selectedIndices
.
end
();
++
it
,
++
index
)
msIndices
[
index
]
=
*
it
;
msIndices
[
index
]
=
*
it
;
}
}
return
sal_T
rue
;
return
t
rue
;
}
}
...
...
oox/source/ppt/headerfootercontext.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -32,19 +32,19 @@ namespace oox { namespace ppt {
...
@@ -32,19 +32,19 @@ namespace oox { namespace ppt {
{
{
if
(
rAttribs
.
hasAttribute
(
XML_sldNum
)
)
if
(
rAttribs
.
hasAttribute
(
XML_sldNum
)
)
{
{
rHeaderFooter
.
mbSlideNumber
=
rAttribs
.
getBool
(
XML_sldNum
,
sal_T
rue
);
rHeaderFooter
.
mbSlideNumber
=
rAttribs
.
getBool
(
XML_sldNum
,
t
rue
);
}
}
if
(
rAttribs
.
hasAttribute
(
XML_hdr
)
)
if
(
rAttribs
.
hasAttribute
(
XML_hdr
)
)
{
{
rHeaderFooter
.
mbHeader
=
rAttribs
.
getBool
(
XML_hdr
,
sal_T
rue
);
rHeaderFooter
.
mbHeader
=
rAttribs
.
getBool
(
XML_hdr
,
t
rue
);
}
}
if
(
rAttribs
.
hasAttribute
(
XML_ftr
)
)
if
(
rAttribs
.
hasAttribute
(
XML_ftr
)
)
{
{
rHeaderFooter
.
mbFooter
=
rAttribs
.
getBool
(
XML_ftr
,
sal_T
rue
);
rHeaderFooter
.
mbFooter
=
rAttribs
.
getBool
(
XML_ftr
,
t
rue
);
}
}
if
(
rAttribs
.
hasAttribute
(
XML_dt
)
)
if
(
rAttribs
.
hasAttribute
(
XML_dt
)
)
{
{
rHeaderFooter
.
mbDateTime
=
rAttribs
.
getBool
(
XML_dt
,
sal_T
rue
);
rHeaderFooter
.
mbDateTime
=
rAttribs
.
getBool
(
XML_dt
,
t
rue
);
}
}
}
}
...
...
oox/source/ppt/slidefragmenthandler.cxx
Dosyayı görüntüle @
ad930bdd
...
@@ -78,7 +78,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
...
@@ -78,7 +78,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
PropertyMap
aPropMap
;
PropertyMap
aPropMap
;
PropertySet
aSlideProp
(
xSlide
);
PropertySet
aSlideProp
(
xSlide
);
aPropMap
[
PROP_Visible
]
=
Any
(
rAttribs
.
getBool
(
XML_show
,
sal_T
rue
)
);
aPropMap
[
PROP_Visible
]
=
Any
(
rAttribs
.
getBool
(
XML_show
,
t
rue
)
);
aSlideProp
.
setProperties
(
aPropMap
);
aSlideProp
.
setProperties
(
aPropMap
);
return
this
;
return
this
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment