diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-04-22 09:10:41 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-04-22 09:29:41 +0900 |
commit | 550546a2fc651913a5624f4bcc4bec6e6d382c26 (patch) | |
tree | 851f31025cfdb69cf57871ef7515f9bbe78e56da /svx/source/xml | |
parent | d5e5de641cef7664a605f474bf7c18a70008806b (diff) |
sal_Bool to bool
Change-Id: Ibaa2a843e16c22b6e2fb7e53da335b9b35b70a96
Diffstat (limited to 'svx/source/xml')
-rw-r--r-- | svx/source/xml/xmleohlp.cxx | 14 | ||||
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 4 | ||||
-rw-r--r-- | svx/source/xml/xmlxtexp.cxx | 2 | ||||
-rw-r--r-- | svx/source/xml/xmlxtimp.cxx | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index c8dbc57129d0..02839abbe05e 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -66,7 +66,7 @@ class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper1<XOutputStream> ::osl::Mutex maMutex; Reference < XOutputStream > xOut; TempFile aTempFile; - sal_Bool bStreamClosed : 1; + bool bStreamClosed : 1; SvStream* pStream; public: @@ -82,7 +82,7 @@ public: }; OutputStorageWrapper_Impl::OutputStorageWrapper_Impl() - : bStreamClosed( sal_False ) + : bStreamClosed( false ) , pStream(0) { aTempFile.EnableKillingFile(); @@ -121,7 +121,7 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput() { MutexGuard aGuard( maMutex ); xOut->closeOutput(); - bStreamClosed = sal_True; + bStreamClosed = true; } struct OUStringLess @@ -283,7 +283,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( if( -1 == nPos ) return sal_False; sal_Bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE ); - sal_Bool bGrUrl = !bObjUrl && + bool bGrUrl = !bObjUrl && aURLNoPar.startsWith( XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE ); if( !(bObjUrl || bGrUrl) ) return sal_False; @@ -305,7 +305,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( if( bGrUrl ) { - sal_Bool bOASIS = mxRootStorage.is() && + bool bOASIS = mxRootStorage.is() && ( SotStorage::GetVersion( mxRootStorage ) > SOFFICE_FILEFORMAT_60 ); rContainerStorageName = bOASIS ? maReplacementGraphicsContainerStorageName @@ -515,7 +515,7 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement { try { - sal_Bool bSwitchBackToLoaded = sal_False; + bool bSwitchBackToLoaded = false; sal_Int32 nCurState = xObj->getCurrentState(); if ( nCurState == embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING ) { @@ -530,7 +530,7 @@ uno::Reference< io::XInputStream > SvXMLEmbeddedObjectHelper::ImplGetReplacement // the image must be regenerated // TODO/LATER: another aspect could be used if ( nCurState == embed::EmbedStates::LOADED ) - bSwitchBackToLoaded = sal_True; + bSwitchBackToLoaded = true; OUString aMediaType; xStream = svt::EmbeddedObjectRef::GetGraphicReplacementStream( diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 3f09fe847eb9..438427da897e 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -91,7 +91,7 @@ public: SvXMLGraphicInputStream( const OUString& rGraphicId ); virtual ~SvXMLGraphicInputStream(); - sal_Bool Exists() const { return mxStmWrapper.is(); } + bool Exists() const { return mxStmWrapper.is(); } }; SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) @@ -222,7 +222,7 @@ public: SvXMLGraphicOutputStream(); virtual ~SvXMLGraphicOutputStream(); - sal_Bool Exists() const { return mxStmWrapper.is(); } + bool Exists() const { return mxStmWrapper.is(); } const GraphicObject& GetGraphicObject(); }; diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 9cb97d9fafba..4d74dbdbebc9 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -220,7 +220,7 @@ bool SvxXMLXTableExportComponent::save( INetURLObject aURLObj( rURL ); bool bToStorage = aURLObj.GetProtocol() == INET_PROT_NOT_VALID; // a relative path - sal_Bool bSaveAsStorage = xTable->getElementType() == ::getCppuType((const OUString*)0); + bool bSaveAsStorage = xTable->getElementType() == ::getCppuType((const OUString*)0); if( pOptName ) *pOptName = rURL; diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 99d3e13a3dc1..c5746f32a418 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -84,7 +84,7 @@ class SvxXMLTableImportContext : public SvXMLImportContext { public: SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, - sal_Bool bOOoFormat ); + bool bOOoFormat ); virtual ~SvxXMLTableImportContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); @@ -102,12 +102,12 @@ protected: private: uno::Reference< XNameContainer > mxTable; SvxXMLTableImportContextEnum meContext; - sal_Bool mbOOoFormat; + bool mbOOoFormat; }; /////////////////////////////////////////////////////////////////////// -SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat ) +SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ), mbOOoFormat( bOOoFormat ) { @@ -467,7 +467,7 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix, const if( XML_NAMESPACE_OOO == nPrefix || XML_NAMESPACE_OFFICE == nPrefix ) { - sal_Bool bOOoFormat = (XML_NAMESPACE_OFFICE == nPrefix); + bool bOOoFormat = (XML_NAMESPACE_OFFICE == nPrefix); Type aType = mrTable->getElementType(); if ( rLocalName == "color-table" ) |