summaryrefslogtreecommitdiff
path: root/oox/source/drawingml
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-22 14:25:43 +0200
committerNoel Grandin <noel@peralex.com>2014-04-23 11:11:51 +0200
commite32da7783686f088fa83cdae209bcf1c81d82f1e (patch)
treee1ee63bcb91bcbce5bcfa27c9244407377a57f11 /oox/source/drawingml
parent2692047aacef7b4288f995ce6ff2db5e16b71014 (diff)
oox: sal_Bool->bool
Change-Id: Icddec34e91305cfc3f9d852472bb86eab4d8cb26
Diffstat (limited to 'oox/source/drawingml')
-rw-r--r--oox/source/drawingml/chart/seriesconverter.cxx2
-rw-r--r--oox/source/drawingml/customshapepresetdata.cxx4
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx8
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.hxx2
-rw-r--r--oox/source/drawingml/table/tableproperties.cxx10
-rw-r--r--oox/source/drawingml/textbodypropertiescontext.cxx2
-rw-r--r--oox/source/drawingml/textparagraphproperties.cxx4
-rw-r--r--oox/source/drawingml/textrun.cxx2
8 files changed, 17 insertions, 17 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 0b2b20aa47d6..292e8a4c1e67 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -424,7 +424,7 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat
aPropSet.setProperty( PROP_MovingAveragePeriod, mrModel.mnPeriod );
// Intercept
- sal_Bool hasIntercept = mrModel.mfIntercept.has();
+ bool hasIntercept = mrModel.mfIntercept.has();
aPropSet.setProperty( PROP_ForceIntercept, hasIntercept);
if (hasIntercept)
aPropSet.setProperty( PROP_InterceptValue, mrModel.mfIntercept.get());
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 7e4ecdeb8993..a4856a89e11e 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -801,7 +801,7 @@ void CustomShapeProperties::initializePresetDataMap()
aStream.ReadLine(aLine);
if (aLine == "true" || aLine == "false")
{
- aPropertyMap.setProperty(PROP_MirroredX, sal_Bool(aLine == "true" ? sal_True : sal_False));
+ aPropertyMap.setProperty(PROP_MirroredX, aLine == "true");
}
else
SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected MirroredX parameter");
@@ -811,7 +811,7 @@ void CustomShapeProperties::initializePresetDataMap()
aStream.ReadLine(aLine);
if (aLine == "true" || aLine == "false")
{
- aPropertyMap.setProperty(PROP_MirroredY, sal_Bool(aLine == "true" ? sal_True : sal_False));
+ aPropertyMap.setProperty(PROP_MirroredY, aLine == "true");
}
else
SAL_WARN("oox", "CustomShapeProperties::initializePresetDataMap: unexpected MirroredY parameter");
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 4048cbc0a3a2..276d5bb51efd 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -211,8 +211,8 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
sal_uInt32 i;
PropertyMap aPropertyMap;
aPropertyMap.setProperty( PROP_Type, OUString( "ooxml-non-primitive" ));
- aPropertyMap.setProperty( PROP_MirroredX, (sal_Bool) mbMirroredX );
- aPropertyMap.setProperty( PROP_MirroredY, (sal_Bool) mbMirroredY );
+ aPropertyMap.setProperty( PROP_MirroredX, mbMirroredX );
+ aPropertyMap.setProperty( PROP_MirroredY, mbMirroredY );
// Note 1: If Equations are defined - they are processed using internal div by 360 coordinates
// while if they are not, standard ooxml coordinates are used.
// This size specifically affects scaling.
@@ -261,11 +261,11 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
if ( maPath2DList.size() )
{
- sal_Bool bAllZero = sal_True;
+ bool bAllZero = true;
for ( i=0; i < maPath2DList.size(); i++ )
{
if ( maPath2DList[i].w || maPath2DList[i].h ) {
- bAllZero = sal_False;
+ bAllZero = false;
break;
}
}
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 56ce61bc459a..ade9bde96bdd 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -48,7 +48,7 @@ struct IteratorAttr
sal_Int32 mnAxis;
sal_Int32 mnCnt;
- sal_Bool mbHideLastTrans;
+ bool mbHideLastTrans;
sal_Int32 mnPtType;
sal_Int32 mnSt;
sal_Int32 mnStep;
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 994fe3a70689..e7f5799a248a 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -143,12 +143,12 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
pTableStyle->getLastCol().getTextBoldStyle() = textBoldStyle;
}
- sal_Bool CreateTableStyle(TableStyle* &pTableStyle , const OUString& styleId)
+ bool CreateTableStyle(TableStyle* &pTableStyle , const OUString& styleId)
{
- sal_Bool createdTblStyle = sal_False;
+ bool createdTblStyle = false;
if(styleId.equalsAscii("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}")){ //Medium Style 2 Accenat 1
pTableStyle = new TableStyle();
- createdTblStyle = sal_True;
+ createdTblStyle = true;
//first row style
//fill color and type
oox::drawingml::FillPropertiesPtr pFstRowFillProperties( new oox::drawingml::FillProperties );
@@ -185,7 +185,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
else if (styleId.equalsAscii("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}")) //Medium Style 2 Accent 2
{
pTableStyle = new TableStyle();
- createdTblStyle = sal_True;
+ createdTblStyle = true;
oox::drawingml::FillPropertiesPtr pFstRowFillProperties( new oox::drawingml::FillProperties );
pFstRowFillProperties->moFillType.set(XML_solidFill);
pFstRowFillProperties->maFillColor.setSchemeClr(XML_accent2);
@@ -217,7 +217,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32&
else if (styleId.equalsAscii("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}")) //Medium Style 4 Accent 4
{
pTableStyle = new TableStyle();
- createdTblStyle = sal_True;
+ createdTblStyle = true;
SetTableStyleProperties(pTableStyle, XML_accent4, XML_dk1, XML_accent4);
}
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx
index 5370350b56ca..315f679ed3c7 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -44,7 +44,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler2Helper& rPa
{
// ST_TextWrappingType
sal_Int32 nWrappingType = rAttribs.getToken( XML_wrap, XML_square );
- mrTextBodyProp.maPropertyMap.setProperty( PROP_TextWordWrap, static_cast< sal_Bool >( nWrappingType == XML_square ));
+ mrTextBodyProp.maPropertyMap.setProperty( PROP_TextWordWrap, nWrappingType == XML_square );
// ST_Coordinate
OUString sValue;
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 858a488dedd0..76e162218240 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -296,7 +296,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P
OUString aBulletFontName;
sal_Int16 nBulletFontPitch = 0;
sal_Int16 nBulletFontFamily = 0;
- sal_Bool bSymbolFont = sal_False;
+ bool bSymbolFont = false;
if( pFilterBase) {
if (maBulletFont.getFontData( aBulletFontName, nBulletFontPitch, nBulletFontFamily, *pFilterBase ) )
{
@@ -319,7 +319,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P
aBulletFontName.equalsIgnoreAsciiCase("StarMath") ||
aBulletFontName.equalsIgnoreAsciiCase("ZapfDingbats") ) {
aFontDesc.CharSet = RTL_TEXTENCODING_SYMBOL;
- bSymbolFont = sal_True;
+ bSymbolFont = true;
}
rPropMap.setProperty( PROP_BulletFont, aFontDesc);
rPropMap.setProperty( PROP_BulletFontName, aBulletFontName);
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 1128918fd2aa..953794810e2e 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -90,7 +90,7 @@ sal_Int32 TextRun::insertAt(
while ( true )
{
sal_Int32 nCount = 0;
- sal_Bool bSymbol = ( getText()[ nIndex ] & 0xff00 ) == 0xf000;
+ bool bSymbol = ( getText()[ nIndex ] & 0xff00 ) == 0xf000;
if ( bSymbol )
{
do