diff options
Diffstat (limited to 'xmloff/source/style')
-rw-r--r-- | xmloff/source/style/DashStyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/FillStyleContext.cxx | 24 | ||||
-rw-r--r-- | xmloff/source/style/FillStyleContext.hxx | 12 | ||||
-rw-r--r-- | xmloff/source/style/GradientStyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/HatchStyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/ImageStyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/MarkerStyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/TransGradientStyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/XMLFontStylesContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/XMLPageExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/prstylei.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/styleexp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnume.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 18 | ||||
-rw-r--r-- | xmloff/source/style/xmlprmap.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/style/xmlstyle.cxx | 37 |
16 files changed, 61 insertions, 62 deletions
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index efd388fb062c..fa0471f6e4da 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -236,7 +236,7 @@ bool XMLDashStyleExport::exportXML( OUStringBuffer aOut; // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 72df20b90af1..de9fda1e593a 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -72,9 +72,9 @@ void XMLGradientStyleContext::EndElement() {} } -sal_Bool XMLGradientStyleContext::IsTransient() const +bool XMLGradientStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext ); @@ -115,9 +115,9 @@ void XMLHatchStyleContext::EndElement() {} } -sal_Bool XMLHatchStyleContext::IsTransient() const +bool XMLHatchStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext ); @@ -192,9 +192,9 @@ void XMLBitmapStyleContext::EndElement() {} } -sal_Bool XMLBitmapStyleContext::IsTransient() const +bool XMLBitmapStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext ); @@ -235,9 +235,9 @@ void XMLTransGradientStyleContext::EndElement() {} } -sal_Bool XMLTransGradientStyleContext::IsTransient() const +bool XMLTransGradientStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext ); @@ -278,9 +278,9 @@ void XMLMarkerStyleContext::EndElement() {} } -sal_Bool XMLMarkerStyleContext::IsTransient() const +bool XMLMarkerStyleContext::IsTransient() const { - return sal_True; + return true; } TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext ); @@ -321,9 +321,9 @@ void XMLDashStyleContext::EndElement() {} } -sal_Bool XMLDashStyleContext::IsTransient() const +bool XMLDashStyleContext::IsTransient() const { - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index fc8489a977f7..388561c13f0d 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -41,7 +41,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:hatch context @@ -61,7 +61,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:fill-image context @@ -87,7 +87,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:transparency context @@ -107,7 +107,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:marker context @@ -127,7 +127,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; // draw:marker context @@ -147,7 +147,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - virtual sal_Bool IsTransient() const SAL_OVERRIDE; + virtual bool IsTransient() const SAL_OVERRIDE; }; #endif // INCLUDED_XMLOFF_SOURCE_STYLE_FILLSTYLECONTEXT_HXX diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 111b0dba135a..36f0351cedae 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -242,7 +242,7 @@ bool XMLGradientStyleExport::exportXML( else { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; OUString aStrName( rStrName ); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( aStrName, diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index 589c0e6e8b57..6d1db910ad4e 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -201,7 +201,7 @@ bool XMLHatchStyleExport::exportXML( else { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index 745dc277a2dc..64958bd0be44 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -69,7 +69,7 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal if( rValue >>= sImageURL ) { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index acad58b5eb34..a2c138689009 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -164,7 +164,7 @@ void XMLMarkerStyleExport::exportXML( if(rValue >>= aBezier) { // Name - sal_Bool bEncoded(sal_False); + bool bEncoded(false); OUString aStrName( rStrName ); rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( aStrName, &bEncoded ) ); diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 1c66c25824ac..29695320901c 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -243,7 +243,7 @@ sal_Bool XMLTransGradientStyleExport::exportXML( else { // Name - sal_Bool bEncoded = sal_False; + bool bEncoded = false; rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rExport.EncodeStyleName( rStrName, &bEncoded ) ); diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index e19bb47b9b68..5f7dfa87855d 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -383,7 +383,7 @@ bool XMLFontStylesContext::FillProperties( const OUString& rName, sal_Int32 nPitchIdx, sal_Int32 nCharsetIdx ) const { - const SvXMLStyleContext* pStyle = FindStyleChildContext( XML_STYLE_FAMILY_FONT, rName, sal_True ); + const SvXMLStyleContext* pStyle = FindStyleChildContext( XML_STYLE_FAMILY_FONT, rName, true ); const XMLFontStyleContextFontFace *pFontStyle = PTR_CAST( XMLFontStyleContextFontFace,pStyle);// use temp var, PTR_CAST is a bad macro, FindStyleChildContext will be called twice if( pFontStyle ) pFontStyle->FillProperties( rProps, nFamilyNameIdx, nStyleNameIdx, diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 973d648d9c73..a79f2b6f83a9 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -107,7 +107,7 @@ bool XMLPageExport::exportStyle( else { OUString sName( rStyle->getName() ); - sal_Bool bEncoded = sal_False; + bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( sName, &bEncoded ) ); diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 3b0538de3421..1549564aec99 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -324,7 +324,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) } else { - SetValid( sal_False ); + SetValid( false ); } } } diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index e37ba3288c51..3f94f3d819ee 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -109,7 +109,7 @@ bool XMLStyleExport::exportStyle( sName = *pPrefix; sName += rStyle->getName(); - sal_Bool bEncoded = sal_False; + bool bEncoded = false; const OUString sEncodedStyleName(GetExport().EncodeStyleName( sName, &bEncoded )); GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, sEncodedStyleName ); diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index a5718fd5921a..cf9637be4c46 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -662,7 +662,7 @@ void SvxXMLNumRuleExport::exportNumberingRule( // style:name="..." if( !rName.isEmpty() ) { - sal_Bool bEncoded = sal_False; + bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( rName, &bEncoded ) ); if( bEncoded ) @@ -773,7 +773,7 @@ void SvxXMLNumRuleExport::exportOutline() GetExport().CheckAttrList(); if ( !sOutlineStyleName.isEmpty() ) { - sal_Bool bEncoded = sal_False; + bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( sOutlineStyleName, &bEncoded ) ); diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index bdd57891bdb8..8b8e8e89658b 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -425,7 +425,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( { eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( - eType, sNumFormat, sNumLetterSync, sal_True ); + eType, sNumFormat, sNumLetterSync, true ); nCount = 15; } @@ -1027,7 +1027,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, - sal_Bool bOutl ) + bool bOutl ) : SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, bOutl ? XML_STYLE_FAMILY_TEXT_OUTLINE : XML_STYLE_FAMILY_TEXT_LIST ) , sIsPhysical( "IsPhysical" ) , sNumberingRules( "NumberingRules" ) @@ -1035,7 +1035,7 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, , sIsContinuousNumbering( "IsContinuousNumbering" ) , pLevelStyles( 0 ) , nLevels( 0 ) -, bConsecutive( sal_False ) +, bConsecutive( false ) , bOutline( bOutl ) { } @@ -1134,7 +1134,7 @@ void SvxXMLListStyleContext::FillUnoNumRule( } } -void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) +void SvxXMLListStyleContext::CreateAndInsertLate( bool bOverwrite ) { if( bOutline ) { @@ -1154,7 +1154,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) const OUString& rName = GetDisplayName(); if( rName.isEmpty() ) { - SetValid( sal_False ); + SetValid( false ); return; } @@ -1162,7 +1162,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) GetImport().GetTextImport()->GetNumberingStyles(); if( !rNumStyles.is() ) { - SetValid( sal_False ); + SetValid( false ); return; } @@ -1221,7 +1221,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) } else { - SetValid( sal_False ); + SetValid( false ); } SetNew( bNew ); @@ -1236,7 +1236,7 @@ void SvxXMLListStyleContext::CreateAndInsertAuto() const const OUString& rName = GetName(); if( bOutline || xNumRules.is() || rName.isEmpty() ) { - ((SvxXMLListStyleContext *)this)->SetValid( sal_False ); + ((SvxXMLListStyleContext *)this)->SetValid( false ); return; } @@ -1270,7 +1270,7 @@ Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule( void SvxXMLListStyleContext::SetDefaultStyle( const Reference < XIndexReplace > & rNumRule, sal_Int16 nLevel, - sal_Bool bOrdered ) + bool bOrdered ) { Sequence<beans::PropertyValue> aPropSeq( bOrdered ? 1 : 4 ); beans::PropertyValue *pProps = aPropSeq.getArray(); diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index b9478b2a9764..bf3f9f0358f2 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -125,12 +125,12 @@ void XMLPropertySetMapper::AddMapperEntry( } // Export a Property -sal_Bool XMLPropertySetMapper::exportXML( +bool XMLPropertySetMapper::exportXML( OUString& rStrExpValue, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; const XMLPropertyHandler* pHdl = GetPropertyHandler( rProperty.mnIndex ); @@ -143,12 +143,12 @@ sal_Bool XMLPropertySetMapper::exportXML( } // Import a Property -sal_Bool XMLPropertySetMapper::importXML( +bool XMLPropertySetMapper::importXML( const OUString& rStrImpValue, XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter ) const { - sal_Bool bRet = sal_False; + bool bRet = false; const XMLPropertyHandler* pHdl = GetPropertyHandler( rProperty.mnIndex ); diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 0ad232b35482..c08e744980f3 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -145,13 +145,13 @@ SvXMLStyleContext::SvXMLStyleContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >&, - sal_uInt16 nFam, sal_Bool bDefault ) : + sal_uInt16 nFam, bool bDefault ) : SvXMLImportContext( rImp, nPrfx, rLName ), - mbHidden( sal_False ), + mbHidden( false ), mnHelpId( UCHAR_MAX ), mnFamily( nFam ), - mbValid( sal_True ), - mbNew( sal_True ), + mbValid( true ), + mbNew( true ), mbDefaultStyle( bDefault ) { } @@ -189,7 +189,7 @@ void SvXMLStyleContext::CreateAndInsert( bool /*bOverwrite*/ ) { } -void SvXMLStyleContext::CreateAndInsertLate( sal_Bool /*bOverwrite*/ ) +void SvXMLStyleContext::CreateAndInsertLate( bool /*bOverwrite*/ ) { } @@ -197,9 +197,9 @@ void SvXMLStyleContext::Finish( bool /*bOverwrite*/ ) { } -sal_Bool SvXMLStyleContext::IsTransient() const +bool SvXMLStyleContext::IsTransient() const { - return sal_False; + return false; } class SvXMLStyleIndex_Impl @@ -282,8 +282,8 @@ public: const SvXMLStyleContext *FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, - sal_Bool bCreateIndex ) const; - sal_Bool IsAutomaticStyle() const { return bAutomaticStyle; } + bool bCreateIndex ) const; + bool IsAutomaticStyle() const { return bAutomaticStyle; } }; SvXMLStylesContext_Impl::SvXMLStylesContext_Impl( bool bAuto ) : @@ -328,7 +328,7 @@ void SvXMLStylesContext_Impl::Clear() const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, - sal_Bool bCreateIndex ) const + bool bCreateIndex ) const { const SvXMLStyleContext *pStyle = 0; @@ -382,7 +382,7 @@ const SvXMLStyleContext *SvXMLStylesContext::GetStyle( sal_uInt32 i ) const return mpImpl->GetStyle( i ); } -sal_Bool SvXMLStylesContext::IsAutomaticStyle() const +bool SvXMLStylesContext::IsAutomaticStyle() const { return mpImpl->IsAutomaticStyle(); } @@ -436,8 +436,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr case XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT: { //there is not page family in ODF now, so I specify one for it - sal_Bool bDefaultStyle = XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT == nToken - ? sal_True: sal_False; + bool bDefaultStyle = XML_TOK_STYLE_DEFAULT_PAGE_LAYOUT == nToken; pStyle = new PageStyleContext( GetImport(), p_nPrefix, rLocalName, xAttrList, *this, bDefaultStyle ); } @@ -448,7 +447,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr break; case XML_TOK_TEXT_OUTLINE: pStyle = new SvxXMLListStyleContext( GetImport(), p_nPrefix, - rLocalName, xAttrList, sal_True ); + rLocalName, xAttrList, true ); break; case XML_TOK_TEXT_NOTE_CONFIG: pStyle = new XMLFootnoteConfigurationImportContext(GetImport(), @@ -785,7 +784,7 @@ OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const uno::Reference< xml::sax::XAttributeList > &, sal_Bool bAuto ) : + const uno::Reference< xml::sax::XAttributeList > &, bool bAuto ) : SvXMLImportContext( rImport, nPrfx, rLName ), msParaStyleServiceName( "com.sun.star.style.ParagraphStyle" ), msTextStyleServiceName( "com.sun.star.style.CharacterStyle" ), @@ -852,8 +851,8 @@ void SvXMLStylesContext::CopyAutoStylesToDoc() } } -void SvXMLStylesContext::CopyStylesToDoc( sal_Bool bOverwrite, - sal_Bool bFinish ) +void SvXMLStylesContext::CopyStylesToDoc( bool bOverwrite, + bool bFinish ) { // pass 1: create text, paragraph and frame styles sal_uInt32 nCount = GetStyleCount(); @@ -887,7 +886,7 @@ void SvXMLStylesContext::CopyStylesToDoc( sal_Bool bOverwrite, FinishStyles( bOverwrite ); } -void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite ) +void SvXMLStylesContext::FinishStyles( bool bOverwrite ) { sal_uInt32 nCount = GetStyleCount(); for( sal_uInt32 i=0; i<nCount; i++ ) @@ -904,7 +903,7 @@ void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite ) const SvXMLStyleContext *SvXMLStylesContext::FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, - sal_Bool bCreateIndex ) const + bool bCreateIndex ) const { return mpImpl->FindStyleChildContext( nFamily, rName, bCreateIndex ); } |