summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-19 09:01:06 +0200
committerNoel Grandin <noel@peralex.com>2014-03-19 09:21:24 +0200
commit9278df2c21fed09b6b10465ca33b227ad7c49b41 (patch)
tree5dc447f593f0244e7e8c5848a8da34f25cc4aa41 /include
parent16752a8a773cf8096e28628237238a562016c4e5 (diff)
sfx2: sal_Bool->bool
Change-Id: I73acb3a150b01114d32274a6842f6db9654b3e63
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/viewfrm.hxx46
-rw-r--r--include/sfx2/viewsh.hxx46
2 files changed, 46 insertions, 46 deletions
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 7076f2313c68..63a1cc8c71b4 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -102,13 +102,13 @@ public:
static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 );
static SfxViewFrame* Current();
- static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
- static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True );
+ static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, bool bOnlyVisible = true );
+ static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, bool bOnlyVisible = true );
static SfxViewFrame* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL );
- void DoActivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL);
- void DoDeactivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL);
+ void DoActivate(bool bMDI, SfxViewFrame *pOld=NULL);
+ void DoDeactivate(bool bMDI, SfxViewFrame *pOld=NULL);
SfxViewFrame* GetParentViewFrame() const;
@@ -131,10 +131,10 @@ public:
void DoAdjustPosSizePixel( SfxViewShell * pSh,
const Point &rPos, const Size &rSize );
void Show();
- sal_Bool IsVisible() const;
+ bool IsVisible() const;
void ToTop();
- void Enable( sal_Bool bEnable );
- virtual sal_Bool Close();
+ void Enable( bool bEnable );
+ virtual bool Close();
virtual void Activate( bool bUI );
virtual void Deactivate( bool bUI );
@@ -153,7 +153,7 @@ public:
static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL );
// interne Handler
- SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
+ SAL_DLLPRIVATE virtual bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh );
@@ -162,7 +162,7 @@ public:
SfxFrame& GetFrame() const;
SfxViewFrame* GetTopViewFrame() const;
- sal_Bool DoClose();
+ bool DoClose();
sal_uIntPtr GetFrameType() const
{ return GetFrame().GetFrameType(); }
SfxFrame& GetTopFrame() const
@@ -172,15 +172,15 @@ public:
void CancelTransfers()
{ GetFrame().CancelTransfers(); }
- void SetModalMode( sal_Bool );
- sal_Bool IsInModalMode() const;
- void Resize(sal_Bool bForce=sal_False);
+ void SetModalMode( bool );
+ bool IsInModalMode() const;
+ void Resize(bool bForce=false);
- void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True);
+ void SetChildWindow(sal_uInt16 nId, bool bVisible, bool bSetFocus=true);
void ToggleChildWindow(sal_uInt16);
bool HasChildWindow(sal_uInt16);
- sal_Bool KnowsChildWindow(sal_uInt16);
- void ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True);
+ bool KnowsChildWindow(sal_uInt16);
+ void ShowChildWindow(sal_uInt16,bool bVisible=true);
SfxChildWindow* GetChildWindow(sal_uInt16);
void ChildWindowExecute(SfxRequest&);
void ChildWindowState(SfxItemSet&);
@@ -195,7 +195,7 @@ public:
SAL_DLLPRIVATE void SetDowning_Impl();
SAL_DLLPRIVATE void GetDocNumber_Impl();
- SAL_DLLPRIVATE sal_Bool IsDowning_Impl() const;
+ SAL_DLLPRIVATE bool IsDowning_Impl() const;
SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh );
SAL_DLLPRIVATE void ReleaseObjectShell_Impl();
@@ -207,16 +207,16 @@ public:
SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const;
- SAL_DLLPRIVATE void ForceOuterResize_Impl(sal_Bool bOn=sal_True);
- SAL_DLLPRIVATE sal_Bool IsResizeInToOut_Impl() const;
- SAL_DLLPRIVATE sal_Bool IsAdjustPosSizePixelLocked_Impl() const
+ SAL_DLLPRIVATE void ForceOuterResize_Impl(bool bOn=true);
+ SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const;
+ SAL_DLLPRIVATE bool IsAdjustPosSizePixelLocked_Impl() const
{ return nAdjustPosPixelLock != 0; }
SAL_DLLPRIVATE void UpdateDocument_Impl();
- SAL_DLLPRIVATE void LockObjectShell_Impl(sal_Bool bLock=sal_True);
+ SAL_DLLPRIVATE void LockObjectShell_Impl(bool bLock=true);
- SAL_DLLPRIVATE void MakeActive_Impl( sal_Bool bActivate );
- SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool );
+ SAL_DLLPRIVATE void MakeActive_Impl( bool bActivate );
+ SAL_DLLPRIVATE void SetQuietMode_Impl( bool );
SAL_DLLPRIVATE const Size& GetMargin_Impl() const;
SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* );
SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const;
@@ -234,7 +234,7 @@ public:
SAL_DLLPRIVATE void ActivateToolPanel_Impl( const OUString& i_rPanelURL );
private:
- SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False );
+ SAL_DLLPRIVATE bool SwitchToViewShell_Impl( sal_uInt16 nNo, bool bIsIndex = false );
SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell );
SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId );
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 8488234d9344..a6bbf56e14bb 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -138,7 +138,7 @@ friend class SfxPrinterController;
SfxViewFrame* pFrame;
SfxShell* pSubShell;
Window* pWindow;
- sal_Bool bNoNewWindow;
+ bool bNoNewWindow;
protected:
virtual void Activate(bool IsMDIActivate);
@@ -154,9 +154,9 @@ protected:
public:
// Iteration
- static SfxViewShell* GetFirst( const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True );
+ static SfxViewShell* GetFirst( const TypeId* pType = 0, bool bOnlyVisible = true );
static SfxViewShell* GetNext( const SfxViewShell& rPrev,
- const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True );
+ const TypeId* pType = 0, bool bOnlyVisible = true );
static SfxViewShell* Current();
static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController );
@@ -174,7 +174,7 @@ public:
virtual ErrCode DoVerb(long nVerb);
- virtual void OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* pClient );
+ virtual void OutplaceActivated( bool bActive, SfxInPlaceClient* pClient );
virtual void InplaceActivating( SfxInPlaceClient* pClient );
virtual void InplaceDeactivated( SfxInPlaceClient* pClient );
virtual void UIActivating( SfxInPlaceClient* pClient );
@@ -184,9 +184,9 @@ public:
void VisAreaChanged(const Rectangle& rRect);
// Misc
- virtual bool PrepareClose( sal_Bool bUI = sal_True );
+ virtual bool PrepareClose( bool bUI = true );
virtual OUString GetSelectionText( bool bCompleteWords = false );
- virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const;
+ virtual bool HasSelection( bool bText = true ) const;
virtual SdrView* GetDrawView() const;
SfxShell* GetSubShell() const { return pSubShell; }
@@ -199,7 +199,7 @@ public:
inline void LostFocus() const;
virtual void ShowCursor( bool bOn = true );
virtual bool KeyInput( const KeyEvent &rKeyEvent );
- sal_Bool Escape();
+ bool Escape();
// Viewing Interface
Window* GetWindow() const { return pWindow; }
@@ -211,7 +211,7 @@ public:
inline SfxViewFrame* GetViewFrame() const;
// Printing Interface
- virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False );
+ virtual SfxPrinter* GetPrinter( bool bCreate = false );
virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
@@ -221,8 +221,8 @@ public:
// Working set
virtual void WriteUserData( OUString&, bool bBrowse = false );
virtual void ReadUserData( const OUString&, bool bBrowse = false );
- virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
- virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False );
+ virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false );
+ virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false );
virtual void QueryObjAreaPixel( Rectangle& rRect ) const;
virtual SfxObjectShell* GetObjectShell();
@@ -247,18 +247,18 @@ public:
void SetMargin( const Size& );
void DisconnectAllClients();
virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium );
- sal_Bool NewWindowAllowed() const { return !bNoNewWindow; }
- void SetNewWindowAllowed( sal_Bool bSet ) { bNoNewWindow = !bSet; }
+ bool NewWindowAllowed() const { return !bNoNewWindow; }
+ void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; }
void SetController( SfxBaseController* pController );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController();
- sal_Bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
+ bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
- void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
+ void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool, bool );
- void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool );
+ void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, bool );
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
@@ -267,18 +267,18 @@ public:
SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
- { GetIPClientList_Impl(sal_True)->push_back(pIPClient); }
+ { GetIPClientList_Impl(true)->push_back(pIPClient); }
SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient );
- SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const;
+ SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( bool bCreate = true ) const;
SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
SAL_DLLPRIVATE void DiscardClients_Impl();
SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter );
- SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const;
+ SAL_DLLPRIVATE bool IsShowView_Impl() const;
SAL_DLLPRIVATE bool HandleNotifyEvent_Impl( NotifyEvent& rEvent );
- SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
- SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
+ SAL_DLLPRIVATE bool HasKeyListeners_Impl();
+ SAL_DLLPRIVATE bool HasMouseClickListeners_Impl();
SAL_DLLPRIVATE SfxBaseController* GetBaseController_Impl() const;
@@ -289,11 +289,11 @@ public:
SAL_DLLPRIVATE SfxFrameSetDescriptor* GetFrameSet_Impl() const;
SAL_DLLPRIVATE void SetFrameSet_Impl(SfxFrameSetDescriptor*);
SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& );
- SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True );
- SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); }
+ SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true );
+ SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); }
SAL_DLLPRIVATE void TakeOwnership_Impl();
SAL_DLLPRIVATE void TakeFrameOwnership_Impl();
- SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey);
+ SAL_DLLPRIVATE bool ExecKey_Impl(const KeyEvent& aKey);
};