diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-11 11:17:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-14 07:50:31 +0200 |
commit | 86ffac74e3e0a725abe6b0f79946b3381828bc8e (patch) | |
tree | b4e38b61202b3bd1ca0e0929e5da3bb0d18be68e /svx | |
parent | 358be80f65d335910a4add147cd15e35d3505afd (diff) |
svx: sal_Bool->bool
Change-Id: I8cee08b48660c850e32c061dde0b0e3fdde38349
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/unodraw/unomod.cxx | 6 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 14 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 10 | ||||
-rw-r--r-- | svx/source/unodraw/unoshape.cxx | 36 | ||||
-rw-r--r-- | svx/source/xml/xmlexport.cxx | 12 |
5 files changed, 39 insertions, 39 deletions
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 1f18880693fa..9b5a3d6f45e9 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -114,7 +114,7 @@ static const SvEventDescription* ImplGetSupportedMacroItems() true if the SdrHint could be translated to an EventObject<br> false if not */ -sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, ::com::sun::star::document::EventObject& aEvent ) +bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, ::com::sun::star::document::EventObject& aEvent ) { const SdrObject* pObj = NULL; const SdrPage* pPage = NULL; @@ -152,7 +152,7 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* // HINT_SWITCHTOPAGE, // #94278# UNDO/REDO at an object evtl. on another page // HINT_OBJLISTCLEAR // Is called before an SdrObjList will be cleared default: - return sal_False; + return false; } if( pObj ) @@ -162,7 +162,7 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* else aEvent.Source = (const_cast<SdrModel*>(pDoc))->getUnoModel(); - return sal_True; + return true; } namespace { diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index da19e34fb04e..f7a385519d55 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1002,7 +1002,7 @@ sal_Bool SvxMeasureUnitToMapUnit( const short eApi, int& eVcl ) throw() /** maps the vcl MapUnit enum to a API constant MeasureUnit. Returns false if conversion is not supported. */ -sal_Bool SvxMapUnitToMeasureUnit( const short eVcl, short& eApi ) throw() +bool SvxMapUnitToMeasureUnit( const short eVcl, short& eApi ) throw() { switch( eVcl ) { @@ -1028,7 +1028,7 @@ sal_Bool SvxMapUnitToMeasureUnit( const short eVcl, short& eApi ) throw() Returns false if conversion is not supported. */ -sal_Bool SvxMeasureUnitToFieldUnit( const short eApi, short& eVcl ) throw() +bool SvxMeasureUnitToFieldUnit( const short eApi, short& eVcl ) throw() { switch( eApi ) { @@ -1045,16 +1045,16 @@ sal_Bool SvxMeasureUnitToFieldUnit( const short eApi, short& eVcl ) throw() case util::MeasureUnit::PERCENT: eVcl = FUNIT_PERCENT; break; case util::MeasureUnit::MM_100TH: eVcl = FUNIT_100TH_MM; break; default: - return sal_False; + return false; } - return sal_True; + return true; } /** maps the vcl MapUnit enum to a API constant MeasureUnit. Returns false if conversion is not supported. */ -sal_Bool SvxFieldUnitToMeasureUnit( const short eVcl, short& eApi ) throw() +bool SvxFieldUnitToMeasureUnit( const short eVcl, short& eApi ) throw() { switch( eVcl ) { @@ -1071,10 +1071,10 @@ sal_Bool SvxFieldUnitToMeasureUnit( const short eVcl, short& eApi ) throw() case FUNIT_PERCENT: eApi = util::MeasureUnit::PERCENT; break; case FUNIT_100TH_MM: eApi = util::MeasureUnit::MM_100TH; break; default: - return sal_False; + return false; } - return sal_True; + return true; } bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResIds, int& nCount ) throw() diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 9f1339a705f4..e422239cbcf4 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -256,7 +256,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro } else { - rValue = GetBitmap( sal_True ); + rValue = GetBitmap( true ); } break; } @@ -395,13 +395,13 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro return true; } -sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) +bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) { DBG_TESTSOLARMUTEX(); SdrOle2Obj* pOle2Obj = dynamic_cast< SdrOle2Obj* >( mpObj.get() ); if ( !pOle2Obj || !pOle2Obj->IsEmpty() ) - return sal_False; + return false; // create storage and inplace object ::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist(); @@ -448,13 +448,13 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName ) return xObj.is(); } -sal_Bool SvxOle2Shape::createLink( const OUString& aLinkURL ) +bool SvxOle2Shape::createLink( const OUString& aLinkURL ) { DBG_TESTSOLARMUTEX(); SdrOle2Obj* pOle2Obj = dynamic_cast< SdrOle2Obj* >( mpObj.get() ); if ( !pOle2Obj || !pOle2Obj->IsEmpty() ) - return sal_False; + return false; OUString aPersistName; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 962df11958d4..887c9670ab9f 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -674,7 +674,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) -uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw() +uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const throw() { DBG_TESTSOLARMUTEX(); uno::Any aAny; @@ -1446,7 +1446,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re -sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) +bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { SfxItemSet aSet( mpModel->GetItemPool(), (sal_uInt16)nWID, (sal_uInt16)nWID ); @@ -1455,17 +1455,17 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN //mpObj->SetItemSetAndBroadcast(aSet); mpObj->SetMergedItemSetAndBroadcast(aSet); - return sal_True; + return true; } else { - return sal_False; + return false; } } -sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) +bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) { // check if an item with the given name and which id is inside the models // pool or the stylesheet pool, if found its puttet in the itemse @@ -1483,7 +1483,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN XBitmapListRef pBitmapList = pModel->GetBitmapList(); if( !pBitmapList.is() ) - return sal_False; + return false; long nPos = pBitmapList->GetIndex(aStrName); if( nPos == -1 ) @@ -1502,7 +1502,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN XGradientListRef pGradientList = pModel->GetGradientList(); if( !pGradientList.is() ) - return sal_False; + return false; long nPos = pGradientList->GetIndex(aStrName); if( nPos == -1 ) @@ -1521,7 +1521,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN XHatchListRef pHatchList = pModel->GetHatchList(); if( !pHatchList.is() ) - return sal_False; + return false; long nPos = pHatchList->GetIndex(aStrName); if( nPos == -1 ) @@ -1541,7 +1541,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN XLineEndListRef pLineEndList = pModel->GetLineEndList(); if( !pLineEndList.is() ) - return sal_False; + return false; long nPos = pLineEndList->GetIndex(aStrName); if( nPos == -1 ) @@ -1587,16 +1587,16 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN break; } default: - return sal_False; + return false; } } - return sal_True; + return true; } -sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ) +bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ) { OUString aName = SvxUnogetInternalNameForItem((sal_Int16)nWID, rName); @@ -1614,18 +1614,18 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN else rSet.Put( XLineStartItem( aEmpty, aEmptyPoly ) ); - return sal_True; + return true; } case XATTR_FILLFLOATTRANSPARENCE: { // #85953# Set a disabled XFillFloatTransparenceItem rSet.Put(XFillFloatTransparenceItem()); - return sal_True; + return true; } } - return sal_False; + return false; } const SfxItemPool* pPool = rSet.GetPool(); @@ -1640,11 +1640,11 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN if( pItem && ( pItem->GetName() == aSearchName ) ) { rSet.Put( *pItem ); - return sal_True; + return true; } } - return sal_False; + return false; } @@ -2966,7 +2966,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } else { - rValue = GetBitmap( sal_True ); + rValue = GetBitmap( true ); } break; } diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 079d88aff1a5..1fb02714c845 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -43,12 +43,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut, const Reference< lang::XComponent >& xComponent ) +bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut, const Reference< lang::XComponent >& xComponent ) { return SvxDrawingLayerExport( pModel, xOut, xComponent, "com.sun.star.comp.DrawingLayer.XMLExporter" ); } -sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut, const Reference< lang::XComponent >& xComponent, const char* pExportService ) +bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut, const Reference< lang::XComponent >& xComponent, const char* pExportService ) { sal_Bool bDocRet = xOut.is(); @@ -135,7 +135,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp return bDocRet; } -sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut ) +bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputStream>& xOut ) { Reference< lang::XComponent > xComponent; return SvxDrawingLayerExport( pModel, xOut, xComponent ); @@ -143,12 +143,12 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp //- -sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent ) +bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent ) { return SvxDrawingLayerImport( pModel, xInputStream, xComponent, "com.sun.star.comp.Draw.XMLOasisImporter" ); } -sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent, const char* pImportService ) +bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream, const Reference< lang::XComponent >& xComponent, const char* pImportService ) { sal_uInt32 nRet = 0; @@ -248,7 +248,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu return nRet == 0; } -sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream ) +bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStream>& xInputStream ) { Reference< lang::XComponent > xComponent; return SvxDrawingLayerImport( pModel, xInputStream, xComponent ); |