diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-01 12:39:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:49 +0200 |
| commit | 2cf50102a057e97b2a89a673b6378177714c9ed5 (patch) | |
| tree | 0c684c217fee81c0b9f74f2f34e19fcf90b6c49c /include/sfx2 | |
| parent | a1c57dd89780d73a74b1408608198da0567f0257 (diff) | |
sfx2/objface.xx: sal_Bool->bool
Change-Id: I1227c958d58903dc114a4e4173fb2714b2ec33f2
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/objface.hxx | 10 | ||||
| -rw-r--r-- | include/sfx2/shell.hxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index 20c7d7689829..e31d56ea7782 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -38,7 +38,7 @@ friend class SfxSlotPool; const char* pName; // Sfx-internal name of interface const SfxInterface* pGenoType; // base interface SfxSlot* pSlots; // SlotMap - sal_uInt16 nCount; // number of slots in SlotMap + sal_uInt16 nCount; // number of slots in SlotMap SfxInterfaceId nClassId; // Id of interface ResId aNameResId; // ResId of external interface name SfxInterface_Impl* pImpData; @@ -63,7 +63,7 @@ public: const char* GetClassName() const { return pName; } bool HasName() const { return 0 != aNameResId.GetId(); } - OUString GetName() const + OUString GetName() const { return HasName() ? aNameResId.toString() : OUString(); } ResMgr* GetResMgr() const { return aNameResId.GetResMgr(); } @@ -73,8 +73,8 @@ public: void RegisterObjectBar( sal_uInt16, const ResId&, const OUString* pST=0 ); void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const OUString* pST=0 ); - void RegisterChildWindow( sal_uInt16, sal_Bool bContext, const OUString* pST=0 ); - void RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const OUString* pST=0 ); + void RegisterChildWindow( sal_uInt16, bool bContext, const OUString* pST=0 ); + void RegisterChildWindow( sal_uInt16, bool bContext, sal_uInt32 nFeature, const OUString* pST=0 ); void RegisterStatusBar( const ResId& ); const ResId& GetObjectBarResId( sal_uInt16 nNo ) const; sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; @@ -82,7 +82,7 @@ public: sal_uInt16 GetObjectBarCount() const; void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId ); const OUString* GetObjectBarName( sal_uInt16 nNo ) const; - sal_Bool IsObjectBarVisible( sal_uInt16 nNo) const; + bool IsObjectBarVisible( sal_uInt16 nNo) const; sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const; sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const; sal_uInt16 GetChildWindowCount() const; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 295fc6e611ab..1bc565d88a8e 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -365,13 +365,13 @@ inline void SfxShell::SetPool GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature ) #define SFX_CHILDWINDOW_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False ) + GetStaticInterface()->RegisterChildWindow( nId, false ) #define SFX_FEATURED_CHILDWINDOW_REGISTRATION(nId,nFeature) \ - GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False, nFeature ) + GetStaticInterface()->RegisterChildWindow( nId, false, nFeature ) #define SFX_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_True ) + GetStaticInterface()->RegisterChildWindow( nId, true ) #define SFX_POPUPMENU_REGISTRATION(rResId) \ GetStaticInterface()->RegisterPopupMenu( rResId ) |