summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/oox/drawingml/table/tablecell.hxx18
-rw-r--r--include/oox/drawingml/table/tableproperties.hxx34
-rw-r--r--include/oox/drawingml/table/tablestylepart.hxx8
-rw-r--r--include/oox/drawingml/textparagraphproperties.hxx2
-rw-r--r--oox/source/drawingml/table/tablecell.cxx6
-rw-r--r--oox/source/drawingml/table/tableproperties.cxx22
-rw-r--r--oox/source/drawingml/textfield.cxx2
-rw-r--r--oox/source/drawingml/textparagraph.cxx2
-rw-r--r--oox/source/drawingml/textparagraphproperties.cxx2
9 files changed, 48 insertions, 48 deletions
diff --git a/include/oox/drawingml/table/tablecell.hxx b/include/oox/drawingml/table/tablecell.hxx
index 373070bb14a4..c484ed20ba02 100644
--- a/include/oox/drawingml/table/tablecell.hxx
+++ b/include/oox/drawingml/table/tablecell.hxx
@@ -52,10 +52,10 @@ public:
void setRowSpan( sal_Int32 nRowSpan ){ mnRowSpan = nRowSpan; };
sal_Int32 getGridSpan() const { return mnGridSpan; };
void setGridSpan( sal_Int32 nGridSpan ){ mnGridSpan = nGridSpan; };
- sal_Bool gethMerge() const { return mbhMerge; };
- void sethMerge( sal_Bool bhMerge ){ mbhMerge = bhMerge; };
- sal_Bool getvMerge() const { return mbvMerge; };
- void setvMerge( sal_Bool bvMerge ){ mbvMerge = bvMerge; };
+ bool gethMerge() const { return mbhMerge; };
+ void sethMerge( bool bhMerge ){ mbhMerge = bhMerge; };
+ bool getvMerge() const { return mbvMerge; };
+ void setvMerge( bool bvMerge ){ mbvMerge = bvMerge; };
sal_Int32 getLeftMargin() const { return mnMarL; };
void setLeftMargin( sal_Int32 nMargin ){ mnMarL = nMargin; };
sal_Int32 getRightMargin() const { return mnMarR; };
@@ -68,8 +68,8 @@ public:
void setVertToken( sal_Int32 nToken ){ mnVertToken = nToken; };
sal_Int32 getAnchorToken() const { return mnAnchorToken; };
void setAnchorToken( sal_Int32 nToken ){ mnAnchorToken = nToken; };
- sal_Bool getAnchorCtr() const { return mbAnchorCtr; };
- void setAnchorCtr( sal_Bool bAnchorCtr ){ mbAnchorCtr = bAnchorCtr; };
+ bool getAnchorCtr() const { return mbAnchorCtr; };
+ void setAnchorCtr( bool bAnchorCtr ){ mbAnchorCtr = bAnchorCtr; };
sal_Int32 getHorzOverflowToken() const { return mnHorzOverflowToken; };
void setHorzOverflowToken( sal_Int32 nToken ){ mnHorzOverflowToken = nToken; };
@@ -95,8 +95,8 @@ private:
sal_Int32 mnRowSpan;
sal_Int32 mnGridSpan;
- sal_Bool mbhMerge;
- sal_Bool mbvMerge;
+ bool mbhMerge;
+ bool mbvMerge;
sal_Int32 mnMarL;
sal_Int32 mnMarR;
@@ -104,7 +104,7 @@ private:
sal_Int32 mnMarB;
sal_Int32 mnVertToken;
sal_Int32 mnAnchorToken;
- sal_Bool mbAnchorCtr;
+ bool mbAnchorCtr;
sal_Int32 mnHorzOverflowToken;
};
diff --git a/include/oox/drawingml/table/tableproperties.hxx b/include/oox/drawingml/table/tableproperties.hxx
index 59c975a588b3..98bb1a14cc26 100644
--- a/include/oox/drawingml/table/tableproperties.hxx
+++ b/include/oox/drawingml/table/tableproperties.hxx
@@ -42,35 +42,35 @@ public:
std::vector< sal_Int32 >& getTableGrid() { return mvTableGrid; };
std::vector< TableRow >& getTableRows() { return mvTableRows; };
- OUString& getStyleId(){ return maStyleId; };
+ OUString& getStyleId(){ return maStyleId; };
boost::shared_ptr< TableStyle >& getTableStyle(){ return mpTableStyle; };
- sal_Bool& isRtl(){ return mbRtl; };
- sal_Bool& isFirstRow(){ return mbFirstRow; };
- sal_Bool& isFirstCol(){ return mbFirstCol; };
- sal_Bool& isLastRow(){ return mbLastRow; };
- sal_Bool& isLastCol(){ return mbLastCol; };
- sal_Bool& isBandRow(){ return mbBandRow; };
- sal_Bool& isBandCol(){ return mbBandCol; };
+ bool& isRtl(){ return mbRtl; };
+ bool& isFirstRow(){ return mbFirstRow; };
+ bool& isFirstCol(){ return mbFirstCol; };
+ bool& isLastRow(){ return mbLastRow; };
+ bool& isLastCol(){ return mbLastCol; };
+ bool& isBandRow(){ return mbBandRow; };
+ bool& isBandCol(){ return mbBandCol; };
void pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, ::oox::drawingml::TextListStylePtr pMasterTextListStyle );
private:
- const TableStyle& getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase, sal_Bool &isCreateTabStyle);
+ const TableStyle& getUsedTableStyle( const ::oox::core::XmlFilterBase& rFilterBase, bool &isCreateTabStyle);
- OUString maStyleId; // either StyleId is available
+ OUString maStyleId; // either StyleId is available
boost::shared_ptr< TableStyle > mpTableStyle; // or the complete TableStyle
std::vector< sal_Int32 > mvTableGrid;
std::vector< TableRow > mvTableRows;
- sal_Bool mbRtl;
- sal_Bool mbFirstRow;
- sal_Bool mbFirstCol;
- sal_Bool mbLastRow;
- sal_Bool mbLastCol;
- sal_Bool mbBandRow;
- sal_Bool mbBandCol;
+ bool mbRtl;
+ bool mbFirstRow;
+ bool mbFirstCol;
+ bool mbLastRow;
+ bool mbLastCol;
+ bool mbBandRow;
+ bool mbBandCol;
};
} } }
diff --git a/include/oox/drawingml/table/tablestylepart.hxx b/include/oox/drawingml/table/tablestylepart.hxx
index 4b56d4edee1a..7177deb5b982 100644
--- a/include/oox/drawingml/table/tablestylepart.hxx
+++ b/include/oox/drawingml/table/tablestylepart.hxx
@@ -39,8 +39,8 @@ public:
~TableStylePart();
::oox::drawingml::Color& getTextColor(){ return maTextColor; }
- ::boost::optional< sal_Bool >& getTextBoldStyle(){ return maTextBoldStyle; }
- ::boost::optional< sal_Bool >& getTextItalicStyle(){ return maTextItalicStyle; }
+ ::boost::optional< bool >& getTextBoldStyle(){ return maTextBoldStyle; }
+ ::boost::optional< bool >& getTextItalicStyle(){ return maTextItalicStyle; }
::oox::drawingml::TextFont& getAsianFont(){ return maAsianFont; }
::oox::drawingml::TextFont& getComplexFont(){ return maComplexFont; }
::oox::drawingml::TextFont& getSymbolFont(){ return maSymbolFont; }
@@ -54,8 +54,8 @@ public:
private:
::oox::drawingml::Color maTextColor;
- ::boost::optional< sal_Bool > maTextBoldStyle;
- ::boost::optional< sal_Bool > maTextItalicStyle;
+ ::boost::optional< bool > maTextBoldStyle;
+ ::boost::optional< bool > maTextItalicStyle;
::oox::drawingml::TextFont maAsianFont;
::oox::drawingml::TextFont maComplexFont;
::oox::drawingml::TextFont maSymbolFont;
diff --git a/include/oox/drawingml/textparagraphproperties.hxx b/include/oox/drawingml/textparagraphproperties.hxx
index 2ed69f95c014..14f56268a0d5 100644
--- a/include/oox/drawingml/textparagraphproperties.hxx
+++ b/include/oox/drawingml/textparagraphproperties.hxx
@@ -100,7 +100,7 @@ public:
void apply( const TextParagraphProperties& rSourceProps );
void pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
- PropertyMap& rioBulletList, const BulletList* pMasterBuList, sal_Bool bApplyBulletList, float fFontSize, bool bPushDefaultValues = false ) const;
+ PropertyMap& rioBulletList, const BulletList* pMasterBuList, bool bApplyBulletList, float fFontSize, bool bPushDefaultValues = false ) const;
void pushToPropSet( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet) const;
/** Returns the largest character size of this paragraph. If possible the
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 );
generated by cgit (git 2.34.1) at 2025-01-31 21:04:24 +0000