summaryrefslogtreecommitdiff
path: root/svx/source/xml
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/xml')
-rw-r--r--svx/source/xml/xmleohlp.cxx6
-rw-r--r--svx/source/xml/xmlexport.cxx6
-rw-r--r--svx/source/xml/xmlgrhlp.cxx14
3 files changed, 13 insertions, 13 deletions
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<io::XOutputSt
bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& 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<io::XOutputSt
if( !xFilter.is() )
{
OSL_FAIL( "com.sun.star.comp.Draw.XMLExporter service missing" );
- bDocRet = sal_False;
+ bDocRet = false;
}
if( bDocRet )
@@ -121,7 +121,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
catch(uno::Exception const&)
{
DBG_UNHANDLED_EXCEPTION();
- bDocRet = sal_False;
+ bDocRet = false;
}
if( pGraphicHelper )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 7e00eb37c239..8d73719b84c5 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -110,7 +110,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId )
{
Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() );
const GfxLink aGfxLink( aGraphic.GetLink() );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( aGfxLink.GetDataSize() && aGfxLink.GetData() )
{
@@ -214,7 +214,7 @@ private:
SvStream* mpOStm;
Reference< XOutputStream > 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 );