diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-13 13:54:31 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-14 14:15:15 +0200 |
commit | 8b34d05cb13d839d80aca696bf6ba766dd7e28cb (patch) | |
tree | 339d910a54c7e2031888946fb4eee0fd97a9b7de | |
parent | f44024d1a065005bcbc991525df059cd86bc2363 (diff) |
sal_Bool->bool
Change-Id: Iab0165ef642dfee5bd315fc1f42f4bad8e86aa47
22 files changed, 55 insertions, 55 deletions
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 3ebe9a247050..537ed67a6217 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -58,7 +58,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); virtual void FillPropertySet( const ::com::sun::star::uno::Reference< diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index b51d384559d2..26fb62896b1e 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -77,11 +77,11 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bFooter, - const sal_Bool bLeft, - const sal_Bool bFirst ); + const bool bFooter, + const bool bLeft, + const bool bFirst ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); }; #endif diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index a26c568c35ef..526fb1de5806 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -37,7 +37,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: TYPEINFO(); diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index 01d3a437faca..d95675dcb425 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -58,7 +58,7 @@ public: virtual void CreateAndInsert( sal_Bool bOverwrite ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); }; #endif diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 873146e396b6..b5a99a0031a9 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -91,7 +91,7 @@ public: virtual void SetDefaults(); virtual void CreateAndInsert( sal_Bool bOverwrite ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); }; #endif diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index b39ceaf270e8..7fea288089bf 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -93,7 +93,7 @@ public: const OUString& GetDataStyleName() const { return sDataStyleName; } virtual void CreateAndInsert( sal_Bool bOverwrite ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); virtual void SetDefaults(); // overload FillPropertySet, so we can get at the combined characters diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index 81f8dc6bc23e..2a7b41fdaa79 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -176,7 +176,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void CreateAndInsert(sal_Bool bOverwrite); - virtual void Finish(sal_Bool bOverwrite); + virtual void Finish(bool bOverwrite); SvXMLNumImpData* GetData() const { return pData; } sal_Int32 GetKey(); diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 1b325bdab9d9..ab43cefc250e 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -141,7 +141,7 @@ public: // This method is called fpr every style after all styles have been // inserted into the document. - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); sal_Bool IsDefaultStyle() const { return mbDefaultStyle; } @@ -210,7 +210,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: TYPEINFO(); diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index bd15eb289712..753177e46858 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -932,9 +932,9 @@ sal_Int32 XMLTableStylesContext::GetIndex(const sal_Int16 nContextID) // --------------------------------------------------------------------------- TYPEINIT1( ScXMLMasterStylesContext, SvXMLStylesContext ); -sal_Bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const +bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const { - return sal_True; + return true; } ScXMLMasterStylesContext::ScXMLMasterStylesContext( @@ -1010,16 +1010,16 @@ SvXMLImportContext *ScMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bFooter, - const sal_Bool bLeft, - const sal_Bool /*bFirst*/ ) + const bool bFooter, + const bool bLeft, + const bool /*bFirst*/ ) { if (!bLeft) { if (bFooter) - bContainsRightFooter = sal_True; + bContainsRightFooter = true; else - bContainsRightHeader = sal_True; + bContainsRightHeader = true; } if (!xPropSet.is()) xPropSet.set(GetStyle(), UNO_QUERY ); @@ -1048,7 +1048,7 @@ void ScMasterPageContext::ClearContent(const OUString& rContent) } } -void ScMasterPageContext::Finish( sal_Bool bOverwrite ) +void ScMasterPageContext::Finish( bool bOverwrite ) { XMLTextMasterPageContext::Finish(bOverwrite); if (!bContainsRightFooter) @@ -1061,7 +1061,7 @@ void ScMasterPageContext::Finish( sal_Bool bOverwrite ) ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, - SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) : + SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) : XMLTextStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ), nLastSheet(-1) { diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 865e4d00d974..bf452db576fb 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -197,7 +197,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: TYPEINFO(); @@ -219,8 +219,8 @@ class ScMasterPageContext : public XMLTextMasterPageContext { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; const OUString sEmpty; - sal_Bool bContainsRightHeader; - sal_Bool bContainsRightFooter; + bool bContainsRightHeader; + bool bContainsRightFooter; void ClearContent(const OUString& rContent); public: @@ -243,11 +243,11 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bFooter, - const sal_Bool bLeft, - const sal_Bool bFirst ); + const bool bFooter, + const bool bLeft, + const bool bFirst ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); }; class ScCellTextStyleContext : public XMLTextStyleContext @@ -263,7 +263,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, - sal_Bool bDefaultStyle = false ); + bool bDefaultStyle = false ); virtual ~ScCellTextStyleContext(); // overload FillPropertySet to store style information diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index f0bca134e4f9..1f94975c5fd7 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -287,7 +287,7 @@ public: const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); }; TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext ); @@ -371,7 +371,7 @@ SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext( return pContext; } -void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) +void SwXMLTextStyleContext_Impl::Finish( bool bOverwrite ) { XMLTextStyleContext::Finish( bOverwrite ); @@ -755,7 +755,7 @@ public: sal_Bool bAuto ); virtual ~SwXMLStylesContext_Impl(); - virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; virtual void EndElement(); }; @@ -848,12 +848,12 @@ SwXMLStylesContext_Impl::~SwXMLStylesContext_Impl() { } -sal_Bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const +bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const { const SwXMLImport& rSwImport = GetSwImport(); sal_uInt16 nStyleFamilyMask = rSwImport.GetStyleFamilyMask(); - sal_Bool bIns = sal_True; + bool bIns = true; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -932,7 +932,7 @@ void SwXMLStylesContext_Impl::EndElement() class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext { protected: - virtual sal_Bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } const SwXMLImport& GetSwImport() const @@ -964,9 +964,9 @@ SwXMLMasterStylesContext_Impl::~SwXMLMasterStylesContext_Impl() { } -sal_Bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const +bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const { - sal_Bool bIns; + bool bIns; const SwXMLImport& rSwImport = GetSwImport(); sal_uInt16 nStyleFamilyMask = rSwImport.GetStyleFamilyMask(); diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 2822538c1c17..1dc354aa55dd 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -95,7 +95,7 @@ public: /* Move code from <CreateAndInsertLate(..)> to <Finish(..)>, because at this time all styles it references have been set. (#i40579#) */ - virtual void Finish( sal_Bool bOverwrite); + virtual void Finish( bool bOverwrite); /// set configuration at document void ProcessSettings( diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 794c102226fa..0eac5f4fb24d 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -304,7 +304,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet } } -void XMLShapeStyleContext::Finish( sal_Bool /*bOverwrite*/ ) +void XMLShapeStyleContext::Finish( bool /*bOverwrite*/ ) { } diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a210fee3be51..e148ba143718 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -147,7 +147,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - virtual void Finish( sal_Bool bOverwrite ); + virtual void Finish( bool bOverwrite ); // #i35918# virtual void FillPropertySet( @@ -198,7 +198,7 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext( return pContext; } -void SdXMLDrawingPageStyleContext::Finish( sal_Bool bOverwrite ) +void SdXMLDrawingPageStyleContext::Finish( bool bOverwrite ) { XMLPropStyleContext::Finish( bOverwrite ); diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index b0c9ade38fb7..805da8573fbf 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -329,7 +329,7 @@ void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite ) } } -void XMLPropStyleContext::Finish( sal_Bool bOverwrite ) +void XMLPropStyleContext::Finish( bool bOverwrite ) { if( mxStyle.is() && (IsNew() || bOverwrite) ) { diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 5224b3084542..0b9c2d918ee1 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1707,7 +1707,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) return nKey; } -void SvXMLNumFormatContext::Finish( sal_Bool bOverwrite ) +void SvXMLNumFormatContext::Finish( bool bOverwrite ) { SvXMLStyleContext::Finish( bOverwrite ); } diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 00a43032a5ab..252fc9a85006 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -193,7 +193,7 @@ void SvXMLStyleContext::CreateAndInsertLate( sal_Bool /*bOverwrite*/ ) { } -void SvXMLStyleContext::Finish( sal_Bool /*bOverwrite*/ ) +void SvXMLStyleContext::Finish( bool /*bOverwrite*/ ) { } @@ -547,9 +547,9 @@ SvXMLStyleContext *SvXMLStylesContext::CreateDefaultStyleStyleChildContext( return 0; } -sal_Bool SvXMLStylesContext::InsertStyleFamily( sal_uInt16 ) const +bool SvXMLStylesContext::InsertStyleFamily( sal_uInt16 ) const { - return sal_True; + return true; } sal_uInt16 SvXMLStylesContext::GetFamily( const OUString& rValue ) const diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 9dd724f8d30b..69bdd8776534 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -332,7 +332,7 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext( } // Rename method <CreateAndInsertLate(..)> to <Finish(..)> (#i40597#) -void XMLFootnoteConfigurationImportContext::Finish( sal_Bool bOverwrite ) +void XMLFootnoteConfigurationImportContext::Finish( bool bOverwrite ) { if (bOverwrite) diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 8c7b0632693b..d4e90b404a70 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -237,9 +237,9 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - const sal_Bool bFooter, - const sal_Bool bLeft, - const sal_Bool bFirst ) + const bool bFooter, + const bool bLeft, + const bool bFirst ) { Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY ); return new XMLTextHeaderFooterContext( GetImport(), @@ -249,7 +249,7 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( bFooter, bLeft, bFirst ); } -void XMLTextMasterPageContext::Finish( sal_Bool bOverwrite ) +void XMLTextMasterPageContext::Finish( bool bOverwrite ) { if( xStyle.is() && (IsNew() || bOverwrite) ) { diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index 2d7185175aab..d51d4fa0ca91 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -33,9 +33,9 @@ using ::xmloff::token::XML_MASTER_PAGE; TYPEINIT1( XMLTextMasterStylesContext, SvXMLStylesContext ); -sal_Bool XMLTextMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const +bool XMLTextMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const { - return sal_True; + return true; } XMLTextMasterStylesContext::XMLTextMasterStylesContext( diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 0b9b69f38e60..11747f1176ce 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -227,7 +227,7 @@ void XMLTextShapeStyleContext::CreateAndInsert( sal_Bool bOverwrite ) } } -void XMLTextShapeStyleContext::Finish( sal_Bool bOverwrite ) +void XMLTextShapeStyleContext::Finish( bool bOverwrite ) { XMLPropStyleContext::Finish( bOverwrite ); } diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 49b9a564722c..4388a72a373e 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -264,7 +264,7 @@ void XMLTextStyleContext::SetDefaults( ) } } -void XMLTextStyleContext::Finish( sal_Bool bOverwrite ) +void XMLTextStyleContext::Finish( bool bOverwrite ) { XMLPropStyleContext::Finish( bOverwrite ); |