From 20223e2374bb6a966e44471c224d22d968d19025 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 17 Jan 2014 17:04:22 +0100 Subject: bool improvements Change-Id: I9f5564100aa64ff4940dd93a81ff5a8d8edc7a07 --- include/sfx2/bindings.hxx | 4 ++-- include/sfx2/frmdescr.hxx | 2 +- include/sfx2/objface.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include/sfx2') diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index f5cbfe47e621..0976d2a10bcb 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -171,7 +171,7 @@ public: void SetActiveFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame ); const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetActiveFrame() const; // Reconfig - int IsInRegistrations() const; + bool IsInRegistrations() const; sal_uInt16 EnterRegistrations(const char *pFile = 0, int nLine = 0); void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = 0, int nLine = 0 ); void Register( SfxControllerItem& rBinding ); @@ -218,7 +218,7 @@ public: //-------------------------------------------------------------------- -inline int SfxBindings::IsInRegistrations() const +inline bool SfxBindings::IsInRegistrations() const /* [Description] diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index bd8a2b0eafbf..c6452b1bd829 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -215,7 +215,7 @@ public: ~SfxFrameProperties() { delete pFrame; } - int operator ==( const SfxFrameProperties& ) const; + bool operator ==( const SfxFrameProperties& ) const; SfxFrameProperties& operator =( const SfxFrameProperties &rProp ); }; diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index d44d49718dfe..c54329f8c6c0 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -92,7 +92,7 @@ public: void Register( SfxModule* ); - SAL_DLLPRIVATE int ContainsSlot_Impl( const SfxSlot *pSlot ) const + SAL_DLLPRIVATE bool ContainsSlot_Impl( const SfxSlot *pSlot ) const { return pSlot >= pSlots && pSlot < pSlots + Count(); } SAL_DLLPRIVATE ResMgr* GetResManager_Impl() const { return aNameResId.GetResMgr(); } -- cgit