diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-18 14:54:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-19 09:21:24 +0200 |
commit | 16752a8a773cf8096e28628237238a562016c4e5 (patch) | |
tree | d871056db97706bdb66dfca046aeb68500c5e565 /include/sfx2 | |
parent | be878d7cc54cbe3dc1de410e9ff760fe353ce56a (diff) |
sfx2: sal_Bool->bool
Change-Id: Ief810c49b821e2e60ee2c8b14187dd8d7d81c461
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/tabdlg.hxx | 36 | ||||
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 18 | ||||
-rw-r--r-- | include/sfx2/unoctitm.hxx | 10 |
3 files changed, 32 insertions, 32 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 24653e279933..15853c9573e2 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -90,11 +90,11 @@ friend class SfxTabDialogController; const SfxItemSet* pSet; SfxItemSet* pOutSet; TabDlg_Impl* pImpl; - sal_uInt16* pRanges; + sal_uInt16* pRanges; sal_uInt32 nResId; - sal_uInt16 nAppPageId; - sal_Bool bItemsReset; - sal_Bool bFmt; + sal_uInt16 nAppPageId; + bool bItemsReset; + sal_Bool bFmt; DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * ); DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * ); @@ -140,7 +140,7 @@ public: sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // can be 0 - sal_Bool bItemsOnDemand = sal_False); + bool bItemsOnDemand = false); sal_uInt16 AddTabPage ( const OString &rName, // Name of the label for the page in the notebook .ui sal_uInt16 nPageCreateId ); // Identifier of the Factory Method to create the page @@ -149,22 +149,22 @@ public: const OUString &rRiderText, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // can be 0 - sal_Bool bItemsOnDemand = sal_False, + bool bItemsOnDemand = false, sal_uInt16 nPos = TAB_APPEND); void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // can be 0 - sal_Bool bItemsOnDemand = sal_False, + bool bItemsOnDemand = false, sal_uInt16 nPos = TAB_APPEND); void AddTabPage( sal_uInt16 nId, const OUString &rRiderText, - sal_Bool bItemsOnDemand = sal_False, + bool bItemsOnDemand = false, sal_uInt16 nPos = TAB_APPEND); void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, - sal_Bool bItemsOnDemand = sal_False, + bool bItemsOnDemand = false, sal_uInt16 nPos = TAB_APPEND); void RemoveTabPage( const OString& rName ); // Name of the label for the page in the notebook .ui @@ -199,7 +199,7 @@ public: const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - sal_Bool IsFormat() const { return bFmt; } + bool IsFormat() const { return bFmt; } const PushButton& GetOKButton() const { return *m_pOKBtn; } PushButton& GetOKButton() { return *m_pOKBtn; } @@ -214,7 +214,7 @@ public: short Execute(); void StartExecuteModal( const Link& rEndDialogHdl ); - void Start( sal_Bool bShow = sal_True ); + void Start( bool bShow = true ); const SfxItemSet* GetExampleSet() const { return pExampleSet; } SfxViewFrame* GetViewFrame() const { return pFrame; } @@ -236,7 +236,7 @@ friend class SfxTabDialog; private: const SfxItemSet* pSet; OUString aUserString; - sal_Bool bHasExchangeSupport; + bool bHasExchangeSupport; TabPageImpl* pImpl; SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } @@ -247,9 +247,9 @@ protected: sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - sal_uInt16 GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const + sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const { return pSet->GetPool()->GetWhich( nSlot, bDeep ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); + const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true ); SfxTabDialog* GetTabDialog() const; void AddItemConnection( sfx::ItemConnectionBase* pConnection ); @@ -262,9 +262,9 @@ public: virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); - sal_Bool HasExchangeSupport() const + bool HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( sal_Bool bNew = sal_True ) + void SetExchangeSupport( bool bNew = true ) { bHasExchangeSupport = bNew; } enum sfxpg { @@ -284,9 +284,9 @@ public: { aUserString = rString; } OUString GetUserData() { return aUserString; } virtual void FillUserData(); - virtual sal_Bool IsReadOnly() const; + virtual bool IsReadOnly() const; virtual void PageCreated (SfxAllItemSet aSet); - static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); + static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true ); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame(); diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index a98f43cb3347..49e5ca3ec9cc 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -102,10 +102,10 @@ class SfxFrameStatusListener : public svt::FrameStatusListener class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface { - sal_Bool m_bFloating; - sal_Bool m_bCascading; + bool m_bFloating; + bool m_bCascading; Link m_aDeleteLink; - sal_uInt16 m_nId; + sal_uInt16 m_nId; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; SfxFrameStatusListener* m_pStatusListener; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xStatusListener; @@ -195,7 +195,7 @@ protected: // old SfxToolBoxControl methods virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void Select( bool bMod1 = false ); virtual void Select( sal_uInt16 nModifier ); virtual void DoubleClick(); @@ -260,7 +260,7 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, sal_Bool bShowStrings = sal_False ); + SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, bool bShowStrings = false ); virtual ~SfxToolBoxControl(); ToolBox& GetToolBox() const; @@ -312,7 +312,7 @@ public: SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); virtual Window* CreateItemWindow( Window *pParent ); using SfxToolBoxControl::Select; - virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void Select( bool bMod1 = false ); }; @@ -359,14 +359,14 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl */ { - sal_Bool bBigImages; + bool bBigImages; PopupMenu* pMenu; - sal_Bool m_bShowMenuImages; + bool m_bShowMenuImages; protected: virtual void Click(); using SfxToolBoxControl::Select; - virtual void Select( sal_Bool ); + virtual void Select( bool ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); DECL_LINK( Activate, Menu * ); public: diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 855f40860d93..001a54460b5f 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -132,12 +132,12 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) ; static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier(); - static sal_Bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); + static bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); static OUString GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); - void SetMasterUnoCommand( sal_Bool bSet ); + void SetMasterUnoCommand( bool bSet ); SfxDispatcher* GetDispatcher_Impl(); }; @@ -150,8 +150,8 @@ class SfxDispatchController_Impl : public SfxControllerItem const SfxPoolItem* pLastState; sal_uInt16 nSlot; SfxOfficeDispatch* pDispatch; - sal_Bool bMasterSlave; - sal_Bool bVisible; + bool bMasterSlave; + bool bVisible; const char* pUnoName; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xFrame; @@ -171,7 +171,7 @@ public: void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - void setMasterSlaveCommand( sal_Bool bSet ); + void setMasterSlaveCommand( bool bSet ); void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException ); |