diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-01 13:48:55 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:50 +0200 |
commit | 22472e093dc107d01b6d8db1187bfc6bb2c9e80c (patch) | |
tree | 5fad352621f15541fc7458c5bc350ac1603f5203 /oox | |
parent | 8ee4af289f079c1314cdc4f3c370f04f4275f902 (diff) |
oox: sal_Bool->bool
Change-Id: I2ad60bd64cabb29a9e909f31e7d5bd92989120f7
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/table/tablecell.cxx | 6 | ||||
-rw-r--r-- | oox/source/drawingml/table/tableproperties.cxx | 22 | ||||
-rw-r--r-- | oox/source/drawingml/textfield.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/textparagraph.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index c3c4f49ec718..53d8b420ba80 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -46,15 +46,15 @@ TableCell::TableCell() : mpTextBody( new TextBody() ) , mnRowSpan ( 1 ) , mnGridSpan( 1 ) -, mbhMerge( sal_False ) -, mbvMerge( sal_False ) +, mbhMerge( false ) +, mbvMerge( false ) , mnMarL( 91440 ) , mnMarR( 91440 ) , mnMarT( 45720 ) , mnMarB( 45720 ) , mnVertToken( XML_horz ) , mnAnchorToken( XML_t ) -, mbAnchorCtr( sal_False ) +, mbAnchorCtr( false ) , mnHorzOverflowToken( XML_clip ) { } diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index 74b0b9111d31..994fe3a70689 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -39,13 +39,13 @@ using namespace ::com::sun::star::table; namespace oox { namespace drawingml { namespace table { TableProperties::TableProperties() -: mbRtl( sal_False ) -, mbFirstRow( sal_False ) -, mbFirstCol( sal_False ) -, mbLastRow( sal_False ) -, mbLastCol( sal_False ) -, mbBandRow( sal_False ) -, mbBandCol( sal_False ) +: mbRtl( false ) +, mbFirstRow( false ) +, mbFirstCol( false ) +, mbLastRow( false ) +, mbLastCol( false ) +, mbBandRow( false ) +, mbBandCol( false ) { } TableProperties::~TableProperties() @@ -224,7 +224,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32& return createdTblStyle; } -const TableStyle& TableProperties::getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase, sal_Bool &isCreateTabStyle ) +const TableStyle& TableProperties::getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase, bool &isCreateTabStyle ) { ::oox::core::XmlFilterBase& rBase( const_cast< ::oox::core::XmlFilterBase& >( rFilterBase ) ); @@ -267,7 +267,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa CreateTableColumns( xColumnRowRange->getColumns(), mvTableGrid ); CreateTableRows( xColumnRowRange->getRows(), mvTableRows ); - sal_Bool mbOwnTblStyle = sal_False; + bool mbOwnTblStyle = false; const TableStyle& rTableStyle( getUsedTableStyle( rFilterBase, mbOwnTblStyle ) ); sal_Int32 nRow = 0; const std::vector< TableRow >::const_iterator aTableRowEnd( mvTableRows.end() ); @@ -293,7 +293,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa } } - if(mbOwnTblStyle == sal_True) + if(mbOwnTblStyle) { TableStyle* pTableStyle = (TableStyle*)&rTableStyle; if(pTableStyle != NULL) @@ -301,7 +301,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa delete pTableStyle; pTableStyle = NULL; } - mbOwnTblStyle = sal_False; + mbOwnTblStyle = false; } } diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 6006fea11309..55b538b0ee96 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -142,7 +142,7 @@ sal_Int32 TextField::insertAt( Reference< XPropertySet > xProps( xAt, UNO_QUERY); PropertySet aPropSet( xProps ); - maTextParagraphProperties.pushToPropSet( &rFilterBase, xProps, aioBulletList, NULL, sal_True, 18 ); + maTextParagraphProperties.pushToPropSet( &rFilterBase, xProps, aioBulletList, NULL, true, 18 ); TextCharacterProperties aTextCharacterProps( rTextCharacterStyle ); aTextCharacterProps.assignUsed( maTextParagraphProperties.getTextCharacterProperties() ); diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index ac1b7f16ca16..e22096619745 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -115,7 +115,7 @@ void TextParagraph::insertAt( aioBulletList.setProperty( PROP_BulletColor, (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() )); float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 12 ); - aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); + aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, fCharacterSize, true ); } // empty paragraphs do not have bullets in ppt diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 7b87d5c399e2..858a488dedd0 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -383,7 +383,7 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps } void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, - const Reference < XPropertySet >& xPropSet, PropertyMap& rioBulletMap, const BulletList* pMasterBuList, sal_Bool bApplyBulletMap, float fCharacterSize, + const Reference < XPropertySet >& xPropSet, PropertyMap& rioBulletMap, const BulletList* pMasterBuList, bool bApplyBulletMap, float fCharacterSize, bool bPushDefaultValues ) const { PropertySet aPropSet( xPropSet ); |