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
dbf05f8e
Kaydet (Commit)
dbf05f8e
authored
Ock 17, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
bool improvements
Change-Id: Id890cfe8767b1ee760bb2049191a5cfc356f1af8
üst
6ba099a0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
23 deletions
+24
-23
xecontent.cxx
sc/source/filter/excel/xecontent.cxx
+8
-8
xeescher.cxx
sc/source/filter/excel/xeescher.cxx
+1
-1
xltoolbar.hxx
sc/source/filter/excel/xltoolbar.hxx
+5
-4
scflt.hxx
sc/source/filter/inc/scflt.hxx
+5
-5
unitconverter.cxx
sc/source/filter/oox/unitconverter.cxx
+1
-1
scflt.cxx
sc/source/filter/starcalc/scflt.cxx
+4
-4
No files found.
sc/source/filter/excel/xecontent.cxx
Dosyayı görüntüle @
dbf05f8e
...
@@ -900,13 +900,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
...
@@ -900,13 +900,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
{
{
bool
bFmla2
=
false
;
bool
bFmla2
=
false
;
ScConditionMode
eOperation
=
mrFormatEntry
.
GetOperation
();
ScConditionMode
eOperation
=
mrFormatEntry
.
GetOperation
();
sal_Int32
nAboveAverage
=
eOperation
==
SC_COND_ABOVE_AVERAGE
||
bool
nAboveAverage
=
eOperation
==
SC_COND_ABOVE_AVERAGE
||
eOperation
==
SC_COND_ABOVE_EQUAL_AVERAGE
;
eOperation
==
SC_COND_ABOVE_EQUAL_AVERAGE
;
sal_Int32
nEqualAverage
=
eOperation
==
SC_COND_ABOVE_EQUAL_AVERAGE
||
bool
nEqualAverage
=
eOperation
==
SC_COND_ABOVE_EQUAL_AVERAGE
||
eOperation
==
SC_COND_BELOW_EQUAL_AVERAGE
;
eOperation
==
SC_COND_BELOW_EQUAL_AVERAGE
;
sal_Int32
nBottom
=
eOperation
==
SC_COND_BOTTOM10
bool
nBottom
=
eOperation
==
SC_COND_BOTTOM10
||
eOperation
==
SC_COND_BOTTOM_PERCENT
;
||
eOperation
==
SC_COND_BOTTOM_PERCENT
;
sal_Int32
nPercent
=
eOperation
==
SC_COND_TOP_PERCENT
||
bool
nPercent
=
eOperation
==
SC_COND_TOP_PERCENT
||
eOperation
==
SC_COND_BOTTOM_PERCENT
;
eOperation
==
SC_COND_BOTTOM_PERCENT
;
OString
aRank
(
"0"
);
OString
aRank
(
"0"
);
if
(
IsTopBottomRule
(
eOperation
))
if
(
IsTopBottomRule
(
eOperation
))
...
@@ -931,10 +931,10 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
...
@@ -931,10 +931,10 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
XML_type
,
GetTypeString
(
mrFormatEntry
.
GetOperation
()
),
XML_type
,
GetTypeString
(
mrFormatEntry
.
GetOperation
()
),
XML_priority
,
OString
::
number
(
mnPriority
+
1
).
getStr
(),
XML_priority
,
OString
::
number
(
mnPriority
+
1
).
getStr
(),
XML_operator
,
GetOperatorString
(
mrFormatEntry
.
GetOperation
(),
bFmla2
),
XML_operator
,
GetOperatorString
(
mrFormatEntry
.
GetOperation
(),
bFmla2
),
XML_aboveAverage
,
OString
::
number
(
nAboveAverage
).
getStr
(),
XML_aboveAverage
,
OString
::
number
(
int
(
nAboveAverage
)
).
getStr
(),
XML_equalAverage
,
OString
::
number
(
nEqualAverage
).
getStr
(),
XML_equalAverage
,
OString
::
number
(
int
(
nEqualAverage
)
).
getStr
(),
XML_bottom
,
OString
::
number
(
nBottom
).
getStr
(),
XML_bottom
,
OString
::
number
(
int
(
nBottom
)
).
getStr
(),
XML_percent
,
OString
::
number
(
nPercent
).
getStr
(),
XML_percent
,
OString
::
number
(
int
(
nPercent
)
).
getStr
(),
XML_rank
,
aRank
.
getStr
(),
XML_rank
,
aRank
.
getStr
(),
XML_text
,
aText
.
getStr
(),
XML_text
,
aText
.
getStr
(),
XML_dxfId
,
OString
::
number
(
GetDxfs
().
GetDxfId
(
mrFormatEntry
.
GetStyle
()
)
).
getStr
(),
XML_dxfId
,
OString
::
number
(
GetDxfs
().
GetDxfId
(
mrFormatEntry
.
GetStyle
()
)
).
getStr
(),
...
...
sc/source/filter/excel/xeescher.cxx
Dosyayı görüntüle @
dbf05f8e
...
@@ -1247,7 +1247,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
...
@@ -1247,7 +1247,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos,
meTVA
=
pCaption
->
GetTextVerticalAdjust
();
meTVA
=
pCaption
->
GetTextVerticalAdjust
();
meTHA
=
pCaption
->
GetTextHorizontalAdjust
();
meTHA
=
pCaption
->
GetTextHorizontalAdjust
();
mbAutoScale
=
pCaption
->
GetFitToSize
()
?
true
:
false
;
mbAutoScale
=
pCaption
->
GetFitToSize
()
?
true
:
false
;
mbLocked
=
pCaption
->
IsMoveProtect
()
|
pCaption
->
IsResizeProtect
();
mbLocked
=
pCaption
->
IsMoveProtect
()
|
|
pCaption
->
IsResizeProtect
();
// AutoFill style would change if Postit.cxx object creation values are changed
// AutoFill style would change if Postit.cxx object creation values are changed
OUString
aCol
(((
XFillColorItem
&
)
GETITEM
(
aItemSet
,
XFillColorItem
,
XATTR_FILLCOLOR
)).
GetValue
());
OUString
aCol
(((
XFillColorItem
&
)
GETITEM
(
aItemSet
,
XFillColorItem
,
XATTR_FILLCOLOR
)).
GetValue
());
...
...
sc/source/filter/excel/xltoolbar.hxx
Dosyayı görüntüle @
dbf05f8e
...
@@ -17,12 +17,13 @@ class ScCTBWrapper;
...
@@ -17,12 +17,13 @@ class ScCTBWrapper;
class
TBCCmd
:
public
TBBase
class
TBCCmd
:
public
TBBase
{
{
public
:
public
:
TBCCmd
()
:
cmdID
(
0
),
A
(
0
),
B
(
0
),
cmdType
(
0
),
C
(
0
),
reserved3
(
0
)
{}
TBCCmd
()
:
cmdID
(
0
),
A
(
false
),
B
(
false
),
cmdType
(
0
),
C
(
false
),
reserved3
(
0
)
{}
sal_uInt16
cmdID
;
sal_uInt16
cmdID
;
sal_uInt16
A
:
1
;
bool
A
:
1
;
sal_uInt16
B
:
1
;
bool
B
:
1
;
sal_uInt16
cmdType
:
5
;
sal_uInt16
cmdType
:
5
;
sal_uInt16
C
:
1
;
bool
C
:
1
;
sal_uInt16
reserved3
:
8
;
sal_uInt16
reserved3
:
8
;
bool
Read
(
SvStream
&
rS
);
bool
Read
(
SvStream
&
rS
);
void
Print
(
FILE
*
fp
);
void
Print
(
FILE
*
fp
);
...
...
sc/source/filter/inc/scflt.hxx
Dosyayı görüntüle @
dbf05f8e
...
@@ -212,7 +212,7 @@ struct Sc10LogFont
...
@@ -212,7 +212,7 @@ struct Sc10LogFont
sal_uInt8
lfPitchAndFamily
;
sal_uInt8
lfPitchAndFamily
;
sal_Char
lfFaceName
[
32
];
sal_Char
lfFaceName
[
32
];
int
operator
==
(
const
Sc10LogFont
&
rData
)
const
;
bool
operator
==
(
const
Sc10LogFont
&
rData
)
const
;
};
};
// RGB-Frabwerte
// RGB-Frabwerte
...
@@ -222,7 +222,7 @@ struct Sc10Color
...
@@ -222,7 +222,7 @@ struct Sc10Color
sal_uInt8
Blue
;
sal_uInt8
Blue
;
sal_uInt8
Green
;
sal_uInt8
Green
;
sal_uInt8
Red
;
sal_uInt8
Red
;
int
operator
==
(
const
Sc10Color
&
rColor
)
const
;
bool
operator
==
(
const
Sc10Color
&
rColor
)
const
;
};
};
// Blockbeschreibung
// Blockbeschreibung
...
@@ -282,7 +282,7 @@ struct Sc10HeadFootLine
...
@@ -282,7 +282,7 @@ struct Sc10HeadFootLine
sal_uInt16
FrameColor
;
// Nibble Codierte Farben link oben rechts unten
sal_uInt16
FrameColor
;
// Nibble Codierte Farben link oben rechts unten
sal_uInt16
Reserved
;
sal_uInt16
Reserved
;
int
operator
==
(
const
Sc10HeadFootLine
&
rData
)
const
;
bool
operator
==
(
const
Sc10HeadFootLine
&
rData
)
const
;
};
};
// Seitenformat
// Seitenformat
...
@@ -317,7 +317,7 @@ struct Sc10PageFormat
...
@@ -317,7 +317,7 @@ struct Sc10PageFormat
sal_Int16
ColRepeatEnd
;
sal_Int16
ColRepeatEnd
;
sal_Char
Reserved
[
26
];
sal_Char
Reserved
[
26
];
int
operator
==
(
const
Sc10PageFormat
&
rData
)
const
;
bool
operator
==
(
const
Sc10PageFormat
&
rData
)
const
;
};
};
// Tabellenschutz
// Tabellenschutz
...
@@ -677,7 +677,7 @@ class Sc10PageData : public ScDataObject
...
@@ -677,7 +677,7 @@ class Sc10PageData : public ScDataObject
public
:
public
:
Sc10PageFormat
aPageFormat
;
Sc10PageFormat
aPageFormat
;
Sc10PageData
(
const
Sc10PageFormat
&
rFormat
)
:
aPageFormat
(
rFormat
)
{}
Sc10PageData
(
const
Sc10PageFormat
&
rFormat
)
:
aPageFormat
(
rFormat
)
{}
int
operator
==
(
const
Sc10PageData
&
rData
)
const
bool
operator
==
(
const
Sc10PageData
&
rData
)
const
{
return
aPageFormat
==
rData
.
aPageFormat
;
}
{
return
aPageFormat
==
rData
.
aPageFormat
;
}
virtual
ScDataObject
*
Clone
()
const
;
virtual
ScDataObject
*
Clone
()
const
;
};
};
...
...
sc/source/filter/oox/unitconverter.cxx
Dosyayı görüntüle @
dbf05f8e
...
@@ -53,7 +53,7 @@ const double MM100_PER_EMU = 1.0 / 360.0;
...
@@ -53,7 +53,7 @@ const double MM100_PER_EMU = 1.0 / 360.0;
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
/** Returns true, if the passed year is a leap year. */
/** Returns true, if the passed year is a leap year. */
inline
sal_Int32
lclIsLeapYear
(
sal_Int32
nYear
)
inline
bool
lclIsLeapYear
(
sal_Int32
nYear
)
{
{
return
((
nYear
%
4
)
==
0
)
&&
(((
nYear
%
100
)
!=
0
)
||
((
nYear
%
400
)
==
0
));
return
((
nYear
%
4
)
==
0
)
&&
(((
nYear
%
100
)
!=
0
)
||
((
nYear
%
400
)
==
0
));
}
}
...
...
sc/source/filter/starcalc/scflt.cxx
Dosyayı görüntüle @
dbf05f8e
...
@@ -592,7 +592,7 @@ Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) :
...
@@ -592,7 +592,7 @@ Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) :
}
}
int
Sc10LogFont
::
operator
==
(
const
Sc10LogFont
&
rData
)
const
bool
Sc10LogFont
::
operator
==
(
const
Sc10LogFont
&
rData
)
const
{
{
return
!
strcmp
(
lfFaceName
,
rData
.
lfFaceName
)
return
!
strcmp
(
lfFaceName
,
rData
.
lfFaceName
)
&&
lfHeight
==
rData
.
lfHeight
&&
lfHeight
==
rData
.
lfHeight
...
@@ -611,13 +611,13 @@ int Sc10LogFont::operator==( const Sc10LogFont& rData ) const
...
@@ -611,13 +611,13 @@ int Sc10LogFont::operator==( const Sc10LogFont& rData ) const
}
}
int
Sc10Color
::
operator
==
(
const
Sc10Color
&
rColor
)
const
bool
Sc10Color
::
operator
==
(
const
Sc10Color
&
rColor
)
const
{
{
return
((
Red
==
rColor
.
Red
)
&&
(
Green
==
rColor
.
Green
)
&&
(
Blue
==
rColor
.
Blue
));
return
((
Red
==
rColor
.
Red
)
&&
(
Green
==
rColor
.
Green
)
&&
(
Blue
==
rColor
.
Blue
));
}
}
int
Sc10HeadFootLine
::
operator
==
(
const
Sc10HeadFootLine
&
rData
)
const
bool
Sc10HeadFootLine
::
operator
==
(
const
Sc10HeadFootLine
&
rData
)
const
{
{
return
!
strcmp
(
Title
,
rData
.
Title
)
return
!
strcmp
(
Title
,
rData
.
Title
)
&&
LogFont
==
rData
.
LogFont
&&
LogFont
==
rData
.
LogFont
...
@@ -633,7 +633,7 @@ int Sc10HeadFootLine::operator==( const Sc10HeadFootLine& rData ) const
...
@@ -633,7 +633,7 @@ int Sc10HeadFootLine::operator==( const Sc10HeadFootLine& rData ) const
}
}
int
Sc10PageFormat
::
operator
==
(
const
Sc10PageFormat
&
rData
)
const
bool
Sc10PageFormat
::
operator
==
(
const
Sc10PageFormat
&
rData
)
const
{
{
return
!
strcmp
(
PrintAreaName
,
rData
.
PrintAreaName
)
return
!
strcmp
(
PrintAreaName
,
rData
.
PrintAreaName
)
&&
HeadLine
==
rData
.
HeadLine
&&
HeadLine
==
rData
.
HeadLine
...
...
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