From be88947bac607013c6b7a3c923a2eccd09e50942 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 14 Apr 2014 16:15:22 +0200 Subject: svx: sal_Bool->bool Change-Id: I464eba5fd5521c31868c6fc8a2137f17428d421e --- svx/source/xml/xmleohlp.cxx | 6 +++--- svx/source/xml/xmlexport.cxx | 6 +++--- svx/source/xml/xmlgrhlp.cxx | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'svx/source/xml') diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index b9d6e4f0fe96..3e4dd0e9a444 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -279,7 +279,7 @@ bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( nPos = aURLNoPar.indexOf( ':' ); if( -1 == nPos ) return false; - sal_Bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE ); + bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE ); bool bGrUrl = !bObjUrl && aURLNoPar.startsWith( XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE ); if( !(bObjUrl || bGrUrl) ) @@ -384,7 +384,7 @@ bool SvXMLEmbeddedObjectHelper::ImplReadObject( // Is the object name unique? // if the object is already instantiated by GetEmbeddedObject // that means that the duplication is being loaded - sal_Bool bDuplicate = rContainer.HasInstantiatedEmbeddedObject( rObjName ); + bool bDuplicate = rContainer.HasInstantiatedEmbeddedObject( rObjName ); DBG_ASSERT( !bDuplicate, "An object in the document is referenced twice!" ); if( xDocStor != xCntnrStor || pTemp || bDuplicate ) @@ -678,7 +678,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( comphelper::OStorageHelper::GetTemporaryStorage(); Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 ); aEmbDescr[0].Name = "StoreVisualReplacement"; - aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat); + aEmbDescr[0].Value <<= !bOasisFormat; if ( !bOasisFormat ) { uno::Reference< io::XInputStream > xGrInStream = ImplGetReplacementImage( xObj ); diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 1fb02714c845..c642e0a376fa 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -50,7 +50,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference& xOut, const Reference< lang::XComponent >& xComponent, const char* pExportService ) { - sal_Bool bDocRet = xOut.is(); + bool bDocRet = xOut.is(); Reference< document::XGraphicObjectResolver > xGraphicResolver; SvXMLGraphicHelper *pGraphicHelper = 0; @@ -101,7 +101,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference mxStmWrapper; GraphicObject maGrfObj; - sal_Bool mbClosed; + bool mbClosed; public: @@ -227,7 +227,7 @@ public: SvXMLGraphicOutputStream::SvXMLGraphicOutputStream() : mpTmp( new ::utl::TempFile ), - mbClosed( sal_False ) + mbClosed( false ) { mpTmp->EnableKillingFile(); @@ -270,7 +270,7 @@ void SAL_CALL SvXMLGraphicOutputStream::closeOutput() mxStmWrapper->closeOutput(); mxStmWrapper.clear(); - mbClosed = sal_True; + mbClosed = true; } const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() @@ -374,7 +374,7 @@ bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr, OUString& rPictureStreamName ) { OUString aURLStr( rURLStr ); - sal_Bool bRet = sal_False; + bool bRet = false; if( !aURLStr.isEmpty() ) { @@ -511,7 +511,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, bool bUseGfxLink ) { GraphicObject aGrfObject( OUStringToOString(rGraphicId, RTL_TEXTENCODING_ASCII_US) ); - sal_Bool bRet = sal_False; + bool bRet = false; if( aGrfObject.GetType() != GRAPHIC_NONE ) { @@ -531,7 +531,7 @@ bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, xProps->setPropertyValue( "MediaType", aAny ); } - const sal_Bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff" || aMimeType == "image/svg+xml"; + const bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff" || aMimeType == "image/svg+xml"; aAny <<= bCompressed; xProps->setPropertyValue( "Compressed", aAny ); -- cgit