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 /include/svx | |
parent | 358be80f65d335910a4add147cd15e35d3505afd (diff) |
svx: sal_Bool->bool
Change-Id: I8cee08b48660c850e32c061dde0b0e3fdde38349
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/unoapi.hxx | 6 | ||||
-rw-r--r-- | include/svx/unomaster.hxx | 2 | ||||
-rw-r--r-- | include/svx/unomod.hxx | 2 | ||||
-rw-r--r-- | include/svx/unomodel.hxx | 12 | ||||
-rw-r--r-- | include/svx/unoshape.hxx | 12 |
5 files changed, 17 insertions, 17 deletions
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 1f81aa9e218c..44157213bf1b 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -61,19 +61,19 @@ SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const OUString& * Maps the vcl MapUnit enum to a API constant MeasureUnit. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC sal_Bool SvxMapUnitToMeasureUnit( const short nVcl, short& eApi ) throw(); +SVX_DLLPUBLIC bool SvxMapUnitToMeasureUnit( const short nVcl, short& eApi ) throw(); /** * Maps the API constant MeasureUnit to a vcl MapUnit enum. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC sal_Bool SvxMeasureUnitToFieldUnit( const short eApi, short& nVcl ) throw(); +SVX_DLLPUBLIC bool SvxMeasureUnitToFieldUnit( const short eApi, short& nVcl ) throw(); /** * Maps the vcl MapUnit enum to a API constant MeasureUnit. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC sal_Bool SvxFieldUnitToMeasureUnit( const short nVcl, short& eApi ) throw(); +SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const short nVcl, short& eApi ) throw(); /** * If the given name is a predefined name for the current language it is replaced by diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx index d0cbb0925b1d..3f2c661c80cc 100644 --- a/include/svx/unomaster.hxx +++ b/include/svx/unomaster.hxx @@ -33,7 +33,7 @@ class SvxShapeMaster { public: - virtual sal_Bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) = 0; + virtual bool queryAggregation( const com::sun::star::uno::Type & rType, com::sun::star::uno::Any& aAny ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx index 048ab88c6677..671e05eca094 100644 --- a/include/svx/unomod.hxx +++ b/include/svx/unomod.hxx @@ -51,7 +51,7 @@ public: true if the SdrHint could be translated to an EventObject<br> false if not */ - static sal_Bool createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, ::com::sun::star::document::EventObject& aEvent ); + static bool createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, ::com::sun::star::document::EventObject& aEvent ); protected: ~SvxUnoDrawMSFactory() {} diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 9149e8dc2a32..f238260a323c 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -89,12 +89,12 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; -SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut ); -SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent ); -SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent, const char* pExportService ); -SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream ); -SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent ); -SVX_DLLPUBLIC extern sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent, const char* pImportService ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent, const char* pExportService ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent ); +SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xComponent, const char* pImportService ); #endif diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index b1fc30c79524..1f2056c3d9a9 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -141,7 +141,7 @@ protected: ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const; - sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); + bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); /** called from the XActionLockable interface methods on initial locking */ virtual void lock(); @@ -186,7 +186,7 @@ public: const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; } SdrObject* GetSdrObject() const {return mpObj.get();} void SetShapeType( const OUString& ShapeType ) { maShapeType = ShapeType; } - ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw (); + ::com::sun::star::uno::Any GetBitmap( bool bMetaFile = false ) const throw (); ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); @@ -194,8 +194,8 @@ public: sal_uInt32 getShapeKind() const; // styles need this - static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); - static sal_Bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ); + static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ); + static bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ); /** same as SetFillAttribute but for property names instead of which ids, and the property found is returned instead of set at the object @@ -575,9 +575,9 @@ public: SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); virtual ~SvxOle2Shape() throw(); - sal_Bool createObject( const SvGlobalName &aClassName ); + bool createObject( const SvGlobalName &aClassName ); - sal_Bool createLink( const OUString& aLinkURL ); + bool createLink( const OUString& aLinkURL ); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); |