diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-07 09:15:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-07 13:53:50 +0200 |
commit | 74fdda0cd41d97b6c97d2115584ee48fd552514e (patch) | |
tree | fa29308f180abbd7dec4c16f5603604a15fa079e /sfx2/source/inc | |
parent | 1eee88dd6bf2c647aa3458d33a5f45c51c024186 (diff) |
sfx2: sal_Bool->bool
Change-Id: I48ae51781f64e60deb0c03352087100729c8c3cd
Diffstat (limited to 'sfx2/source/inc')
-rw-r--r-- | sfx2/source/inc/appbaslib.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/appdata.hxx | 10 | ||||
-rw-r--r-- | sfx2/source/inc/eventsupplier.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/fltoptint.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/objshimp.hxx | 24 | ||||
-rw-r--r-- | sfx2/source/inc/partwnd.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/sfxtypes.hxx | 6 | ||||
-rw-r--r-- | sfx2/source/inc/splitwin.hxx | 40 | ||||
-rw-r--r-- | sfx2/source/inc/statcach.hxx | 30 | ||||
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 54 | ||||
-rw-r--r-- | sfx2/source/inc/versdlg.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 28 | ||||
-rw-r--r-- | sfx2/source/inc/workwin.hxx | 106 |
13 files changed, 155 insertions, 155 deletions
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index 2763b75c5a1e..5810afdbb789 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -82,7 +82,7 @@ public: /** checks if any modules in the SfxLibraryContainer exceed the binary limits. */ - sal_Bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); + bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); private: diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 29b82b2eb1fe..87226020cfe1 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -135,11 +135,11 @@ public: sal_uInt16 nDocNo; // current Doc-Number (AutoName) sal_uInt16 nInterfaces; - sal_Bool bDispatcherLocked:1; // do nothing - sal_Bool bDowning:1; // sal_True on Exit and afterwards - sal_Bool bInQuit : 1; - sal_Bool bInvalidateOnUnlock : 1; - sal_Bool bODFVersionWarningLater : 1; + bool bDispatcherLocked:1; // do nothing + bool bDowning:1; // sal_True on Exit and afterwards + bool bInQuit : 1; + bool bInvalidateOnUnlock : 1; + bool bODFVersionWarningLater : 1; SfxAppData_Impl( SfxApplication* ); ~SfxAppData_Impl(); diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 62d74f213b9f..91e409e5f1ce 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -88,7 +88,7 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro ); + static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, bool bNormalizeMacro ); static void NormalizeMacro( const css::uno::Any& rIn, css::uno::Any& rOut, SfxObjectShell* pDoc ); static void NormalizeMacro( const ::comphelper::NamedValueCollection& i_eventDescriptor, diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index 248d0534b2ea..eafe21ab4a39 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -51,7 +51,7 @@ public: RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties ); - sal_Bool isAbort() { return m_pAbort->wasSelected(); } + bool isAbort() { return m_pAbort->wasSelected(); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions() { diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 9af90843c915..72cbd9657767 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -63,7 +63,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess sal_uInt16 nVisualDocumentNumber; sal_Int16 nDocumentSignatureState; sal_Int16 nScriptingSignatureState; - sal_Bool bInList:1, // if reachable by First/Next + bool bInList:1, // if reachable by First/Next bClosing:1, // sal_True while Close(), to prevent recurrences Notification bIsSaving:1, bPasswd:1, @@ -101,40 +101,40 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess MarkData_Impl* pMarkData; sal_uInt16 nLoadedFlags; sal_uInt16 nFlagsInProgress; - sal_Bool bModalMode; - sal_Bool bRunningMacro; - sal_Bool bReloadAvailable; + bool bModalMode; + bool bRunningMacro; + bool bReloadAvailable; sal_uInt16 nAutoLoadLocks; SfxModule* pModule; SfxObjectShellFlags eFlags; - sal_Bool bReadOnlyUI; + bool bReadOnlyUI; SvRefBaseRef xHeaderAttributes; ::rtl::Reference< SfxBaseModel > pBaseModel; sal_uInt16 nStyleFilter; - sal_Bool bDisposing; + bool bDisposing; - sal_Bool m_bEnableSetModified; - sal_Bool m_bIsModified; + bool m_bEnableSetModified; + bool m_bIsModified; Rectangle m_aVisArea; MapUnit m_nMapUnit; - sal_Bool m_bCreateTempStor; + bool m_bCreateTempStor; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xDocStorage; - sal_Bool m_bIsInit; + bool m_bIsInit; OUString m_aSharedFileURL; ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; - sal_Bool m_bIncomplEncrWarnShown; + bool m_bIncomplEncrWarnShown; // TODO/LATER: m_aModifyPasswordInfo should completely replace m_nModifyPasswordHash in future sal_uInt32 m_nModifyPasswordHash; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aModifyPasswordInfo; - sal_Bool m_bModifyPasswordEntered; + bool m_bModifyPasswordEntered; SfxObjectShell_Impl( SfxObjectShell& _rDocShell ); virtual ~SfxObjectShell_Impl(); diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 6798d161f227..b3a5c946f772 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -70,7 +70,7 @@ public: WinBits nBits ); virtual ~SfxPartDockWnd_Impl(); - sal_Bool QueryClose(); + bool QueryClose(); virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > ForgetFrame(); }; diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index d55e299688b2..680a454ead1a 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -83,11 +83,11 @@ struct StringList_Impl : private Resource ResId aResId; StringList_Impl( const ResId& rErrIdP, sal_uInt16 nId) - : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr()){} + : Resource( rErrIdP ), aResId(nId, *rErrIdP.GetResMgr()) {} ~StringList_Impl() { FreeResource(); } - OUString GetString(){ return aResId.toString(); } - operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));} + OUString GetString() { return aResId.toString(); } + operator bool() { return IsAvailableRes(aResId.SetRT(RSC_STRING)); } }; diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index f3a985bee804..e01b44e88f8e 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -36,8 +36,8 @@ private: SfxChildAlignment eAlign; SfxWorkWindow* pWorkWin; SfxDockArr_Impl* pDockArr; - sal_Bool bLocked; - sal_Bool bPinned; + bool bLocked; + bool bPinned; SfxEmptySplitWin_Impl* pEmptyWin; SfxDockingWindow* pActive; @@ -45,12 +45,12 @@ private: const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, - sal_Bool bNewLine=sal_False ); + bool bNewLine=false ); DECL_LINK( TimerHdl, Timer* ); - sal_Bool CursorIsOverRect( sal_Bool bForceAdding = sal_False ) const; - void SetPinned_Impl( sal_Bool ); - void SetFadeIn_Impl( sal_Bool ); + bool CursorIsOverRect( bool bForceAdding = false ) const; + void SetPinned_Impl( bool ); + void SetFadeIn_Impl( bool ); void SaveConfig_Impl(); void FadeOut_Impl(); @@ -64,12 +64,12 @@ protected: public: SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, - SfxWorkWindow *pW, sal_Bool bWithButtons, + SfxWorkWindow *pW, bool bWithButtons, WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK ); virtual ~SfxSplitWindow(); - void ReleaseWindow_Impl(SfxDockingWindow *pWin, sal_Bool bSaveConfig=sal_True); + void ReleaseWindow_Impl(SfxDockingWindow *pWin, bool bSaveConfig=true); void InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize); @@ -78,43 +78,43 @@ public: const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, - sal_Bool bNewLine=sal_False ); + bool bNewLine=false ); void MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, - sal_Bool bNewLine=sal_False ); + bool bNewLine=false ); - void RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide=sal_True); + void RemoveWindow( SfxDockingWindow* pDockWin, bool bHide=true); - void Lock( sal_Bool bLock=sal_True ) + void Lock( bool bLock=true ) { bLocked = bLock; SetUpdateMode( !bLock ); } using Window::IsLocked; - sal_Bool IsLocked() const { return bLocked; } - sal_Bool GetWindowPos( const SfxDockingWindow* pWindow, + bool IsLocked() const { return bLocked; } + bool GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const; - sal_Bool GetWindowPos( const Point& rTestPos, + bool GetWindowPos( const Point& rTestPos, sal_uInt16& rLine, sal_uInt16& rPos ) const; sal_uInt16 GetLineCount() const; long GetLineSize( sal_uInt16 ) const; sal_uInt16 GetWindowCount(sal_uInt16 nLine) const; sal_uInt16 GetWindowCount() const; - sal_Bool IsPinned() const { return bPinned; } - sal_Bool IsFadeIn() const; - sal_Bool IsAutoHide( sal_Bool bSelf = sal_False ) const; + bool IsPinned() const { return bPinned; } + bool IsFadeIn() const; + bool IsAutoHide( bool bSelf = false ) const; SplitWindow* GetSplitWindow(); virtual void AutoHide() SAL_OVERRIDE; virtual void FadeOut() SAL_OVERRIDE; virtual void FadeIn() SAL_OVERRIDE; void Show_Impl(); - void Pin_Impl( sal_Bool bPinned ); - sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); + void Pin_Impl( bool bPinned ); + bool ActivateNextChild_Impl( bool bForward = true ); void SetActiveWindow_Impl( SfxDockingWindow* pWin ); }; diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index e472c404aaec..eb900ea00171 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -56,7 +56,7 @@ public: void Release(); const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; - void Dispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False ); + void Dispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, bool bForceSynchron = false ); }; class SfxStateCache @@ -70,14 +70,14 @@ friend class BindDispatch_Impl; SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> not on Stack SfxPoolItem* pLastItem; // Last sent Item, never -1 SfxItemState eLastState; // Last sent State - sal_Bool bCtrlDirty:1; // Update Controller? - sal_Bool bSlotDirty:1; // Present Funktion, must be updated - sal_Bool bItemVisible:1; // item visibility - sal_Bool bItemDirty; // Validity of pLastItem + bool bCtrlDirty:1; // Update Controller? + bool bSlotDirty:1; // Present Funktion, must be updated + bool bItemVisible:1; // item visibility + bool bItemDirty; // Validity of pLastItem private: SfxStateCache( const SfxStateCache& rOrig ); // inward - void SetState_Impl( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False ); + void SetState_Impl( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); public: SfxStateCache( sal_uInt16 nFuncId ); @@ -89,17 +89,17 @@ public: const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat ) { return GetSlotServer( rDispat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > () ); } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > GetDispatch() const; - void Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron = sal_False ); - sal_Bool IsControllerDirty() const + void Dispatch( const SfxItemSet* pSet, bool bForceSynchron = false ); + bool IsControllerDirty() const { return bCtrlDirty ? sal_True : sal_False; } SfxPoolItem* GetItem() const { return pLastItem; } void ClearCache(); - void SetState( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False ); - void SetCachedState(sal_Bool bAlways = sal_False); + void SetState( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); + void SetCachedState(bool bAlways = false); void DeleteFloatingWindows(); - void Invalidate( sal_Bool bWithSlot ); - void SetVisibleState( sal_Bool bShow=sal_True ); + void Invalidate( bool bWithSlot ); + void SetVisibleState( bool bShow=true ); SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewBinding ); SfxControllerItem* GetItemLink() const; @@ -120,7 +120,7 @@ public: inline void SfxStateCache::ClearCache() { - bItemDirty = sal_True; + bItemDirty = true; } @@ -133,8 +133,8 @@ inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem* pNew pController = pNewBinding; if ( pNewBinding ) { - bCtrlDirty = sal_True; - bItemDirty = sal_True; + bCtrlDirty = true; + bItemDirty = true; } return pOldBinding; } diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 751d9bb77354..d5cc46fe0c75 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -193,7 +193,7 @@ protected: sal_uInt16 nActFilter; // FilterIdx sal_uInt16 nAppFilter; // Filter, which has set the application (for automatic) - sal_Bool bDontUpdate :1, + bool bDontUpdate :1, bIsWater :1, bEnabled :1, bUpdate :1, @@ -218,14 +218,14 @@ protected: DECL_LINK( TimeOut, Timer * ); - virtual void EnableItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {} - virtual void CheckItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {} - virtual sal_Bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return sal_True; } + virtual void EnableItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true ) {} + virtual void CheckItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true ) {} + virtual bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return true; } virtual void LoadedFamilies() {} virtual void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); } virtual void InvalidateBindings(); virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0; - virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) = 0; + virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) = 0; virtual void ClearFamilyList() = 0; virtual void ReplaceUpdateButtonByMenu(); @@ -235,24 +235,24 @@ protected: void HideHdl( void* ); void ShowHdl( void* ); - sal_Bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, + bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, sal_uInt16 nFamily, sal_uInt16 nMask = 0, sal_uInt16* pIdx = NULL, const sal_uInt16* pModifier = NULL ); void UpdateStyles_Impl(sal_uInt16 nFlags); const SfxStyleFamilyItem* GetFamilyItem_Impl() const; - sal_Bool IsInitialized() const { return nActFamily != 0xffff; } + bool IsInitialized() const { return nActFamily != 0xffff; } void ResetFocus(); void EnableDelete(); void Initialize(); void EnableHierarchical(bool); - void FilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = sal_False ); + void FilterSelect( sal_uInt16 nFilterIdx, bool bForce = false ); void SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* ); void SetWaterCanState( const SfxBoolItem* pItem ); void SelectStyle( const OUString& rStyle ); - sal_Bool HasSelectedStyle() const; + bool HasSelectedStyle() const; SfxStyleSheetBase *GetSelectedStyle() const; void FillTreeBox(); void Update_Impl(); @@ -280,29 +280,29 @@ public: DECL_LINK( MenuSelectHdl, Menu * ); - virtual void EnableEdit( sal_Bool b = sal_True ) { bCanEdit = b; } - virtual void EnableDel( sal_Bool b = sal_True ) { bCanDel = b; } - virtual void EnableNew( sal_Bool b = sal_True ) { bCanNew = b; } - virtual void EnableHide( sal_Bool b = sal_True ) { bCanHide = b; } - virtual void EnableShow( sal_Bool b = sal_True ) { bCanShow = b; } + virtual void EnableEdit( bool b = true ) { bCanEdit = b; } + virtual void EnableDel( bool b = true ) { bCanDel = b; } + virtual void EnableNew( bool b = true ) { bCanNew = b; } + virtual void EnableHide( bool b = true ) { bCanHide = b; } + virtual void EnableShow( bool b = true ) { bCanShow = b; } ISfxTemplateCommon* GetISfxTemplateCommon() { return &aISfxTemplateCommon; } Window* GetWindow() { return pWindow; } - void EnableTreeDrag( sal_Bool b = sal_True ); + void EnableTreeDrag( bool b = true ); void ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ); - void EnableExample_Impl( sal_uInt16 nId, sal_Bool bEnable ); + void EnableExample_Impl( sal_uInt16 nId, bool bEnable ); SfxStyleFamily GetActualFamily() const; OUString GetSelectedEntry() const; SfxObjectShell* GetObjectShell() const { return pCurObjShell; } virtual void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen - inline sal_Bool CanEdit( void ) const { return bCanEdit; } - inline sal_Bool CanDel( void ) const { return bCanDel; } - inline sal_Bool CanNew( void ) const { return bCanNew; } - inline sal_Bool CanHide( void ) const { return bCanHide; } - inline sal_Bool CanShow( void ) const { return bCanShow; } + inline bool CanEdit( void ) const { return bCanEdit; } + inline bool CanDel( void ) const { return bCanDel; } + inline bool CanNew( void ) const { return bCanNew; } + inline bool CanHide( void ) const { return bCanHide; } + inline bool CanShow( void ) const { return bCanShow; } // normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus virtual PopupMenu* CreateContextMenu( void ); @@ -334,7 +334,7 @@ private: friend class SfxTemplatePanelControl; Window* m_pFloat; - sal_Bool m_bZoomIn; + bool m_bZoomIn; DropToolBox_Impl m_aActionTbL; ToolBox m_aActionTbR; @@ -345,13 +345,13 @@ private: protected: virtual void Command( const CommandEvent& rMEvt ); - virtual void EnableEdit( sal_Bool = sal_True ) SAL_OVERRIDE; - virtual void EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ) SAL_OVERRIDE; - virtual void CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ) SAL_OVERRIDE; - virtual sal_Bool IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE; + virtual void EnableEdit( bool = true ) SAL_OVERRIDE; + virtual void EnableItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; + virtual void CheckItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; + virtual bool IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE; virtual void LoadedFamilies() SAL_OVERRIDE; virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) SAL_OVERRIDE; - virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) SAL_OVERRIDE; + virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) SAL_OVERRIDE; virtual void ClearFamilyList() SAL_OVERRIDE; virtual void ReplaceUpdateButtonByMenu() SAL_OVERRIDE; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 5170d537ae19..bba4b4f781bc 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -64,7 +64,7 @@ class SfxVersionDialog : public SfxModalDialog void Open_Impl(); public: - SfxVersionDialog ( SfxViewFrame* pFrame, sal_Bool ); + SfxVersionDialog ( SfxViewFrame* pFrame, bool ); virtual ~SfxVersionDialog (); bool IsSaveVersionOnClose() const { return m_bIsSaveVersionOnClose; } }; @@ -102,7 +102,7 @@ class SfxCmisVersionsDialog : public SfxModalDialog void LoadVersions(); public: - SfxCmisVersionsDialog ( SfxViewFrame* pFrame, sal_Bool ); + SfxCmisVersionsDialog ( SfxViewFrame* pFrame, bool ); virtual ~SfxCmisVersionsDialog (); }; diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 0c002cdfb78a..fcb3d9090d05 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -47,12 +47,12 @@ private: sal_uInt16 nId; sal_uInt16 nCount; sal_uInt16 nLocks; - sal_Bool bResCtor : 1; // SV Menu created from resource - sal_Bool bOLE : 1; // InPlaceMenu - sal_Bool bHelpInitialized : 1; - sal_Bool bIsActive : 1; - sal_Bool bControllersUnBound : 1; - sal_Bool bIsAddonPopupMenu : 1; + bool bResCtor : 1; // SV Menu created from resource + bool bOLE : 1; // InPlaceMenu + bool bHelpInitialized : 1; + bool bIsActive : 1; + bool bControllersUnBound : 1; + bool bIsAddonPopupMenu : 1; private: void Construct_Impl(); @@ -65,8 +65,8 @@ private: void BindControllers(); protected: - SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, sal_Bool bWithHelp, - SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False ); + SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, bool bWithHelp, + SfxBindings &rBind, bool bOLEServer=false, bool bRes=false, bool bIsAddonMenu=false ); void CreateFromSVMenu(); DECL_LINK( Highlight, void * ); @@ -81,10 +81,10 @@ protected: public: ~SfxVirtualMenu(); - SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp, - SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False ); - void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ); - void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ); + SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, + SfxBindings &rBind, bool bOLEServer=false, bool bRes=false, bool bIsAddonMenu=false ); + void CheckItem( sal_uInt16 nItemId, bool bCheck ); + void EnableItem( sal_uInt16 nItemId, bool bEnable ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); sal_uInt16 GetItemCount() const; @@ -98,9 +98,9 @@ public: { pParent = pNewParent; } void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); - sal_Bool IsFromResource() const + bool IsFromResource() const { return bResCtor; } - void InitPopup(sal_uInt16 nPos, sal_Bool bOLE = sal_True); + void InitPopup(sal_uInt16 nPos, bool bOLE = true); void InitializeHelp(); void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() { return pResMgr; } diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index bc54c75cbfd5..19a0bbc6b4ce 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -50,7 +50,7 @@ struct SfxObjectBar_Impl sal_uInt16 nMode; // special visibility flags sal_uInt16 nPos; sal_uInt16 nIndex; - sal_Bool bDestroy; + bool bDestroy; OUString aName; SfxInterface* pIFace; @@ -59,7 +59,7 @@ struct SfxObjectBar_Impl nMode(0), nPos(0), nIndex(0), - bDestroy(sal_False), + bDestroy(false), pIFace(0) {} }; @@ -70,13 +70,13 @@ struct SfxObjectBar_Impl struct SfxStatBar_Impl { sal_uInt16 nId; - sal_Bool bOn; - sal_Bool bTemp; + bool bOn; + bool bTemp; SfxStatBar_Impl() : nId(0), - bOn(sal_True), - bTemp(sal_False) + bOn(true), + bTemp(false) {} }; @@ -94,14 +94,14 @@ struct SfxChild_Impl Size aSize; SfxChildAlignment eAlign; sal_uInt16 nVisible; - sal_Bool bResize; - sal_Bool bCanGetFocus; - sal_Bool bSetFocus; + bool bResize; + bool bCanGetFocus; + bool bSetFocus; SfxChild_Impl( Window& rChild, const Size& rSize, - SfxChildAlignment eAlignment, sal_Bool bIsVisible ): - pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(sal_False), - bCanGetFocus( sal_False ), bSetFocus( sal_False ) + SfxChildAlignment eAlignment, bool bIsVisible ): + pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(false), + bCanGetFocus( false ), bSetFocus( false ) { nVisible = bIsVisible ? CHILD_VISIBLE : CHILD_NOT_VISIBLE; } @@ -113,23 +113,23 @@ struct SfxChildWin_Impl sal_uInt16 nInterfaceId; // the current context sal_uInt16 nId; // current Id SfxChildWindow* pWin; - sal_Bool bCreate; + bool bCreate; SfxChildWinInfo aInfo; SfxChild_Impl* pCli; // != 0 at direct Children sal_uInt16 nVisibility; - sal_Bool bEnable; - sal_Bool bDisabled; + bool bEnable; + bool bDisabled; SfxChildWin_Impl( sal_uInt32 nID ) : nSaveId((sal_uInt16) (nID & 0xFFFF) ), nInterfaceId((sal_uInt16) (nID >> 16)), nId(nSaveId), pWin(0), - bCreate(sal_False), + bCreate(false), pCli(0), nVisibility( sal_False ), - bEnable( sal_True ), - bDisabled( sal_False ) + bEnable( true ), + bDisabled( false ) {} }; @@ -200,7 +200,7 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper2< virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - sal_Bool m_bHasFrame; + bool m_bHasFrame; SfxWorkWindow* m_pWrkWin; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xFrame; OUString m_aLayoutManagerPropName; @@ -227,12 +227,12 @@ protected: sal_uInt16 nUpdateMode; sal_uInt16 nChildren; sal_uInt16 nOrigMode; - sal_Bool bSorted : 1; - sal_Bool bDockingAllowed : 1; - sal_Bool bInternalDockingAllowed : 1; - sal_Bool bAllChildrenVisible : 1; - sal_Bool bIsFullScreen : 1; - sal_Bool bShowStatusBar : 1; + bool bSorted : 1; + bool bDockingAllowed : 1; + bool bInternalDockingAllowed : 1; + bool bAllChildrenVisible : 1; + bool bIsFullScreen : 1; + bool bShowStatusBar : 1; sal_Int32 m_nLock; OUString m_aStatusBarResName; OUString m_aLayoutManagerPropName; @@ -241,15 +241,15 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener; protected: - void CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool); + void CreateChildWin_Impl(SfxChildWin_Impl*,bool); void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const; - virtual sal_Bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); + virtual bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); virtual void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); - static sal_Bool IsPluginMode( SfxObjectShell* pObjShell ); + static bool IsPluginMode( SfxObjectShell* pObjShell ); public: SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); @@ -258,14 +258,14 @@ public: { return *pBindings; } Window* GetWindow() const { return pWorkWin; } - Rectangle GetFreeArea( sal_Bool bAutoHide ) const; - void SetDockingAllowed(sal_Bool bSet) + Rectangle GetFreeArea( bool bAutoHide ) const; + void SetDockingAllowed(bool bSet) { bDockingAllowed = bSet; } - void SetInternalDockingAllowed(sal_Bool bSet) + void SetInternalDockingAllowed(bool bSet) { bInternalDockingAllowed = bSet; } - sal_Bool IsDockingAllowed() const + bool IsDockingAllowed() const { return bDockingAllowed; } - sal_Bool IsInternalDockingAllowed() const + bool IsInternalDockingAllowed() const { return bInternalDockingAllowed; } SfxWorkWindow* GetParent_Impl() const { return pParent; } @@ -273,21 +273,21 @@ public: // Methods for all Child windows void DataChanged_Impl( const DataChangedEvent& rDCEvt ); void ReleaseChild_Impl( Window& rWindow ); - SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False ); + SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus=false ); void ShowChildren_Impl(); void HideChildren_Impl(); - sal_Bool PrepareClose_Impl(); + bool PrepareClose_Impl(); virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ); void DeleteControllers_Impl(); - void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0); + void HidePopups_Impl(bool bHide, bool bParent=false, sal_uInt16 nId=0); void ConfigChild_Impl(SfxChildIdentifier, SfxDockingConfig, sal_uInt16); - void MakeChildrenVisible_Impl( sal_Bool bVis ); + void MakeChildrenVisible_Impl( bool bVis ); void ArrangeAutoHideWindows( SfxSplitWindow *pSplit ); - sal_Bool IsAutoHideMode( const SfxSplitWindow *pSplit ); + bool IsAutoHideMode( const SfxSplitWindow *pSplit ); void EndAutoShow_Impl( Point aPos ); - void SetFullScreen_Impl( sal_Bool bSet ) { bIsFullScreen = bSet; } - sal_Bool IsFullScreen_Impl() const { return bIsFullScreen; } + void SetFullScreen_Impl( bool bSet ) { bIsFullScreen = bSet; } + bool IsFullScreen_Impl() const { return bIsFullScreen; } // Methods for Objectbars virtual void UpdateObjectBars_Impl(); @@ -295,29 +295,29 @@ public: void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, SfxInterface *pIFace, const OUString* pName=0 ); bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const; - sal_Bool IsVisible_Impl(); - void MakeVisible_Impl( sal_Bool ); + bool IsVisible_Impl(); + void MakeVisible_Impl( bool ); void SetObjectBarVisibility_Impl( sal_uInt16 nVis ); - sal_Bool IsContainer_Impl() const; - void Lock_Impl( sal_Bool ); + bool IsContainer_Impl() const; + void Lock_Impl( bool ); // Methods for ChildWindows void UpdateChildWindows_Impl(); void ResetChildWindows_Impl(); - void SetChildWindowVisible_Impl( sal_uInt32, sal_Bool, sal_uInt16 ); - void ToggleChildWindow_Impl(sal_uInt16,sal_Bool); - sal_Bool HasChildWindow_Impl(sal_uInt16); - sal_Bool KnowsChildWindow_Impl(sal_uInt16); - void ShowChildWindow_Impl(sal_uInt16, sal_Bool bVisible, sal_Bool bSetFocus); - void SetChildWindow_Impl(sal_uInt16, sal_Bool bOn, sal_Bool bSetFocus); + void SetChildWindowVisible_Impl( sal_uInt32, bool, sal_uInt16 ); + void ToggleChildWindow_Impl(sal_uInt16,bool); + bool HasChildWindow_Impl(sal_uInt16); + bool KnowsChildWindow_Impl(sal_uInt16); + void ShowChildWindow_Impl(sal_uInt16, bool bVisible, bool bSetFocus); + void SetChildWindow_Impl(sal_uInt16, bool bOn, bool bSetFocus); SfxChildWindow* GetChildWindow_Impl(sal_uInt16); virtual void InitializeChild_Impl(SfxChildWin_Impl*); SfxSplitWindow* GetSplitWindow_Impl(SfxChildAlignment); - sal_Bool IsVisible_Impl( sal_uInt16 nMode ) const; - sal_Bool IsFloating( sal_uInt16 nId ); + bool IsVisible_Impl( sal_uInt16 nMode ) const; + bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( Window *pChild ); - virtual sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); + virtual bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; // Methods for StatusBar |