diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-19 09:01:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-19 09:21:24 +0200 |
| commit | 9278df2c21fed09b6b10465ca33b227ad7c49b41 (patch) | |
| tree | 5dc447f593f0244e7e8c5848a8da34f25cc4aa41 | |
| parent | 16752a8a773cf8096e28628237238a562016c4e5 (diff) | |
sfx2: sal_Bool->bool
Change-Id: I73acb3a150b01114d32274a6842f6db9654b3e63
52 files changed, 315 insertions, 318 deletions
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 927b670abaff..8912b7f79cb7 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -52,7 +52,7 @@ Reference< view::XRenderable > Shell::GetRenderable() return Reference<view::XRenderable>( new Renderable(pCurWin) ); } -sal_Bool Shell::HasSelection( sal_Bool /* bText */ ) const +bool Shell::HasSelection( bool /* bText */ ) const { if (ModulWindow* pMCurWin = dynamic_cast<ModulWindow*>(pCurWin)) { @@ -85,7 +85,7 @@ OUString Shell::GetSelectionText( bool bWholeWord ) return aText; } -SfxPrinter* Shell::GetPrinter( sal_Bool bCreate ) +SfxPrinter* Shell::GetPrinter( bool bCreate ) { if ( pCurWin ) { diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 61146c1f1fe5..df54b84f83b3 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -374,7 +374,7 @@ void Shell::StoreAllWindowData( bool bPersistent ) } -bool Shell::PrepareClose( sal_Bool bUI ) +bool Shell::PrepareClose( bool bUI ) { // reset here because it's modified after printing etc. (DocInfo) GetViewFrame()->GetObjectShell()->SetModified(false); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index fdb8ef2893d6..6a75f159d2dd 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -115,8 +115,8 @@ private: private: virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); virtual void OuterResizePixel( const Point &rPos, const Size &rSize ); - sal_uInt16 InsertWindowInTable (BaseWindow* pNewWin); - virtual bool PrepareClose( sal_Bool bUI ) SAL_OVERRIDE; + sal_uInt16 InsertWindowInTable (BaseWindow* pNewWin); + virtual bool PrepareClose( bool bUI ) SAL_OVERRIDE; void SetCurWindow (BaseWindow* pNewWin, bool bUpdateTabBar = false, bool bRememberAsCurrent = true); void ManageToolbars(); @@ -174,10 +174,10 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable(); // virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 ); - virtual SfxPrinter* GetPrinter( sal_Bool bCreate ); + virtual SfxPrinter* GetPrinter( bool bCreate ); virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual OUString GetSelectionText( bool bCompleteWords ); - virtual sal_Bool HasSelection( sal_Bool bText ) const; + virtual bool HasSelection( bool bText ) const; void GetState( SfxItemSet& ); void ExecuteGlobal( SfxRequest& rReq ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 300f8766095a..9b2223718f94 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1059,7 +1059,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, } SfxViewShell* pViewShell = SfxViewShell::Current(); - if( pViewShell && pViewShell->HasSelection( sal_True ) ) + if( pViewShell && pViewShell->HasSelection( true ) ) { bHasSelectionText = sal_True; const OUString sSelection( pViewShell->GetSelectionText() ); 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); }; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index f182ab152422..c0941fece774 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -761,7 +761,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm ) { - pViewFrm->ShowChildWindow( ScAcceptChgDlgWrapper::GetChildWindowId(), sal_True ); //@51669 + pViewFrm->ShowChildWindow( ScAcceptChgDlgWrapper::GetChildWindowId(), true ); //@51669 } if ( pBindings ) { diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index e9d352c9c39c..ebf0ea560f0b 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -76,8 +76,8 @@ protected: 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 = false ); - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = 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 ); public: TYPEINFO_VISIBILITY( SC_DLLPUBLIC ); @@ -107,7 +107,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual SfxPrinter* GetPrinter( sal_Bool bCreate = 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 ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index c5cdb6e8558c..6885e7d381dc 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -202,7 +202,7 @@ private: protected: virtual void Activate(bool bMDI); virtual void Deactivate(bool bMDI); - virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; + virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; virtual void ShowCursor(bool bOn); @@ -217,13 +217,13 @@ protected: virtual void QueryObjAreaPixel( Rectangle& rRect ) const; virtual OUString GetSelectionText( bool bWholeWord ); - virtual sal_Bool HasSelection( sal_Bool bText ) const; + virtual bool HasSelection( bool bText ) const; virtual OUString GetDescription() const; 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 = false ); - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = 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 UIDeactivated( SfxInPlaceClient* pClient ); @@ -350,7 +350,7 @@ public: ScNavigatorSettings* GetNavigatorSettings(); // Drucken: - virtual SfxPrinter* GetPrinter( sal_Bool bCreate = false ); + virtual SfxPrinter* GetPrinter( bool bCreate = false ); virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 452038a8bab9..25e83fcc5329 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2191,7 +2191,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pStyleSheet->GetName() ); ScPrintFunc( pViewData->GetDocShell(), - pViewData->GetViewShell()->GetPrinter(sal_True), + pViewData->GetViewShell()->GetPrinter(true), pViewData->GetTabNo() ).UpdatePages(); rBindings.Invalidate( SID_STATUS_PAGESTYLE ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index bf8311bffd22..b84d81b1e544 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -523,7 +523,7 @@ bool ScPreviewShell::ScrollCommand( const CommandEvent& rCEvt ) return bDone; } -SfxPrinter* ScPreviewShell::GetPrinter( sal_Bool bCreate ) +SfxPrinter* ScPreviewShell::GetPrinter( bool bCreate ) { return pDocShell->GetPrinter(bCreate); } @@ -948,7 +948,7 @@ void ScPreviewShell::ReadUserData(const OUString& rData, bool /* bBrowse */) } } -void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue >& rSeq, sal_Bool /* bBrowse */) +void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue >& rSeq, bool /* bBrowse */) { rSeq.realloc(3); beans::PropertyValue* pSeq = rSeq.getArray(); @@ -967,7 +967,7 @@ void ScPreviewShell::WriteUserDataSequence(uno::Sequence < beans::PropertyValue } } -void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq, sal_Bool /* bBrowse */) +void ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans::PropertyValue >& rSeq, bool /* bBrowse */) { sal_Int32 nCount(rSeq.getLength()); if (nCount) diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 48fe120bbe74..a600de0bbbce 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -280,7 +280,7 @@ void ScTabViewShell::SetActive() ActiveGrabFocus(); } -bool ScTabViewShell::PrepareClose(sal_Bool bUI) +bool ScTabViewShell::PrepareClose(bool bUI) { // Call EnterHandler even in formula mode here, // so a formula change in an embedded object isn't lost @@ -489,7 +489,7 @@ void ScTabViewShell::WriteUserData(OUString& rData, bool /* bBrowse */) GetViewData()->WriteUserData(rData); } -void ScTabViewShell::WriteUserDataSequence (uno::Sequence < beans::PropertyValue >& rSettings, sal_Bool /* bBrowse */ ) +void ScTabViewShell::WriteUserDataSequence (uno::Sequence < beans::PropertyValue >& rSettings, bool /* bBrowse */ ) { GetViewData()->WriteUserDataSequence (rSettings); } @@ -500,7 +500,7 @@ void ScTabViewShell::ReadUserData(const OUString& rData, bool /* bBrowse */) DoReadUserData( rData ); } -void ScTabViewShell::ReadUserDataSequence (const uno::Sequence < beans::PropertyValue >& rSettings, sal_Bool /* bBrowse */ ) +void ScTabViewShell::ReadUserDataSequence (const uno::Sequence < beans::PropertyValue >& rSettings, bool /* bBrowse */ ) { if ( !GetViewData()->GetDocShell()->IsPreview() ) DoReadUserDataSequence( rSettings ); @@ -1065,7 +1065,7 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell() -SfxPrinter* ScTabViewShell::GetPrinter( sal_Bool bCreate ) +SfxPrinter* ScTabViewShell::GetPrinter( bool bCreate ) { // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) return GetViewData()->GetDocShell()->GetPrinter(bCreate); diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index 6674445d28b3..fa3f31cbc069 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -44,9 +44,9 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine -sal_Bool ScTabViewShell::HasSelection( sal_Bool bText ) const +bool ScTabViewShell::HasSelection( bool bText ) const { - sal_Bool bHas = false; + bool bHas = false; ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted if ( bText ) { @@ -65,7 +65,7 @@ sal_Bool ScTabViewShell::HasSelection( sal_Bool bText ) const if ( eMarkType == SC_MARK_SIMPLE ) bHas = ( aRange.aStart != aRange.aEnd ); // more than 1 cell else - bHas = sal_True; // multiple selection or filtered + bHas = true; // multiple selection or filtered } return bHas; } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index d3624a54a787..1bcd6e350eeb 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -594,7 +594,7 @@ void BasicViewFactory::ActivateCenterView ( // have to request a resize now. rpDescriptor->mpViewShell->UIFeatureChanged(); if (mpBase->GetDocShell()->IsInPlaceActive()) - mpBase->GetViewFrame()->Resize(sal_True); + mpBase->GetViewFrame()->Resize(true); mpBase->GetDrawController().SetSubController( rpDescriptor->mpViewShell->CreateSubController()); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 41e179818950..3a208ace6ecf 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -59,7 +59,7 @@ ChildWindowPane::ChildWindowPane ( { // The ViewShellBase has already been activated. Make // the child window visible as soon as possible. - pViewFrame->SetChildWindow(mnChildWindowId, sal_True); + pViewFrame->SetChildWindow(mnChildWindowId, true); OSL_TRACE("ChildWindowPane:activating now"); } else @@ -81,7 +81,7 @@ ChildWindowPane::ChildWindowPane ( // The ViewShellBase has not yet been activated. Hide the // window and wait a little before it is made visible. See // comments in the GetWindow() method for an explanation. - pViewFrame->SetChildWindow(mnChildWindowId, sal_False); + pViewFrame->SetChildWindow(mnChildWindowId, false); OSL_TRACE("ChildWindowPane:base not active"); } } @@ -103,7 +103,7 @@ void ChildWindowPane::Hide (void) if (pViewFrame != NULL) if (pViewFrame->KnowsChildWindow(mnChildWindowId)) if (pViewFrame->HasChildWindow(mnChildWindowId)) - pViewFrame->SetChildWindow(mnChildWindowId, sal_False); + pViewFrame->SetChildWindow(mnChildWindowId, false); // Release the window because when the child window is shown again it // may use a different window. @@ -159,7 +159,7 @@ void SAL_CALL ChildWindowPane::disposing (void) if ( ! pViewFrame->KnowsChildWindow(mnChildWindowId)) break; - pViewFrame->SetChildWindow(mnChildWindowId, sal_True); + pViewFrame->SetChildWindow(mnChildWindowId, true); SfxChildWindow* pChildWindow = pViewFrame->GetChildWindow(mnChildWindowId); if (pChildWindow == NULL) if (pViewFrame->HasChildWindow(mnChildWindowId)) @@ -167,7 +167,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // The child window is not yet visible. Ask the view frame // to show it and try again to get access to the child // window. - pViewFrame->ShowChildWindow(mnChildWindowId, sal_True); + pViewFrame->ShowChildWindow(mnChildWindowId, true); pChildWindow = pViewFrame->GetChildWindow(mnChildWindowId); } diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 03689244a198..231e5dadc89a 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -113,7 +113,7 @@ public: /* override these from SfxViewShell */ virtual OUString GetSelectionText(bool); - virtual sal_Bool HasSelection(sal_Bool) const; + virtual bool HasSelection(bool) const; SvBorder GetBorder (bool bOuterResize); virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize); @@ -129,7 +129,7 @@ public: virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void); /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (sal_Bool bCreate = sal_False); + virtual SfxPrinter* GetPrinter (bool bCreate = false); /// Forwarded to the print manager. virtual sal_uInt16 SetPrinter ( @@ -140,7 +140,7 @@ public: virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, - sal_Bool bBrowse = sal_False); + bool bBrowse = false); /** Pass the given properties to the main view shell. After that we ensure that the right view shell type is displayed in the center @@ -149,7 +149,7 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, - sal_Bool bBrowse = sal_False); + bool bBrowse = false); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); @@ -158,7 +158,7 @@ public: virtual void SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY); - virtual bool PrepareClose (sal_Bool bUI = sal_True) SAL_OVERRIDE; + virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE; virtual void WriteUserData (OUString&, bool bBrowse = false); virtual void ReadUserData (const OUString&, bool bBrowse = false); virtual SdrView* GetDrawView (void) const; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 9d9f35c879d6..00ffb1204cf0 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -326,7 +326,7 @@ bool ShowWindow::SetEndMode() // hide navigator if it is visible if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, false ); mbShowNavigatorAfterSpecialMode = true; } @@ -360,7 +360,7 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout // hide navigator if it is visible if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, false ); mbShowNavigatorAfterSpecialMode = true; } @@ -390,7 +390,7 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan // hide navigator if it is visible if( mpViewShell->GetViewFrame()->GetChildWindow( SID_NAVIGATOR ) ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_False ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, false ); mbShowNavigatorAfterSpecialMode = true; } @@ -424,7 +424,7 @@ void ShowWindow::TerminateShow() // show navigator? if( mbShowNavigatorAfterSpecialMode ) { - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_True ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, true ); mbShowNavigatorAfterSpecialMode = false; } } @@ -482,7 +482,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) if( mbShowNavigatorAfterSpecialMode ) { if (mpViewShell) - mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, sal_True ); + mpViewShell->GetViewFrame()->ShowChildWindow( SID_NAVIGATOR, true ); mbShowNavigatorAfterSpecialMode = false; } } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c7e3ad4f4ce8..ffc7c6ddc88e 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2606,7 +2606,7 @@ void SlideshowImpl::hideChildWindows() if( pViewFrame->GetChildWindow( nId ) ) { - pViewFrame->SetChildWindow( nId, sal_False ); + pViewFrame->SetChildWindow( nId, false ); mnChildMask |= 1 << i; } } @@ -2628,7 +2628,7 @@ void SlideshowImpl::showChildWindows() for( sal_uLong i = 0, nCount = sizeof( aShowChildren ) / sizeof( FncGetChildWindowId ); i < nCount; i++ ) { if( mnChildMask & ( 1 << i ) ) - pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), sal_True ); + pViewFrame->SetChildWindow( ( *aShowChildren[ i ] )(), true ); } } } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 9c14f4aaba6a..b651ecf71c38 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -469,7 +469,7 @@ OUString ViewShellBase::GetSelectionText(bool bCompleteWords) : SfxViewShell::GetSelectionText(bCompleteWords); } -sal_Bool ViewShellBase::HasSelection(sal_Bool bText) const +bool ViewShellBase::HasSelection(bool bText) const { ::boost::shared_ptr<ViewShell> const pMainShell(GetMainViewShell()); DrawViewShell *const pDrawViewShell( @@ -526,7 +526,7 @@ void ViewShellBase::Rearrange (void) OSL_TRACE("Rearrange: window missing"); } - GetViewFrame()->Resize(sal_True); + GetViewFrame()->Resize(true); } @@ -556,7 +556,7 @@ Reference<view::XRenderable> ViewShellBase::GetRenderable (void) -SfxPrinter* ViewShellBase::GetPrinter (sal_Bool bCreate) +SfxPrinter* ViewShellBase::GetPrinter (bool bCreate) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -732,7 +732,7 @@ void ViewShellBase::GetState (SfxItemSet& rSet) void ViewShellBase::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, - sal_Bool bBrowse) + bool bBrowse) { // Forward call to main sub shell. ViewShell* pShell = GetMainViewShell().get(); @@ -746,7 +746,7 @@ void ViewShellBase::WriteUserDataSequence ( void ViewShellBase::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, - sal_Bool bBrowse) + bool bBrowse) { // Forward call to main sub shell. ViewShell* pShell = GetMainViewShell().get(); @@ -833,7 +833,7 @@ void ViewShellBase::SetZoomFactor ( -bool ViewShellBase::PrepareClose (sal_Bool bUI) +bool ViewShellBase::PrepareClose (bool bUI) { bool nResult = SfxViewShell::PrepareClose (bUI); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 51db4f60a4b4..230497bf9c1b 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -400,7 +400,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) * MASTERPAGE ******************************************************************/ GetViewFrame()->SetChildWindow( - AnimationChildWindow::GetChildWindowId(), sal_False ); + AnimationChildWindow::GetChildWindowId(), false ); if (!mpActualPage) { diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index d1c64c1f01d4..01402bb06bb5 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -131,7 +131,7 @@ SfxModule* SfxApplication::GetModule_Impl() { SfxModule* pModule = SfxModule::GetActiveModule(); if ( !pModule ) - pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( 0, sal_False ) ); + pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( 0, false ) ); if( pModule ) return pModule; else diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 57f383d197ac..2e73c243794d 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -1122,7 +1122,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // try to find the SfxFrame for the controller SfxFrame* pCntrFrame = NULL; - for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, sal_False ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, sal_False ) ) + for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, false ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, false ) ) { if ( pShell->GetController() == xController ) { diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index fa2a848a8987..3752887eaac3 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -183,7 +183,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) return; // ignore hidden documents - if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) ) + if ( !SfxViewFrame::GetFirst( pDocSh, true ) ) return; OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index d9b109dadda4..6b5544cf06aa 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1274,7 +1274,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) { case SID_ACTIVATE: { - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_True ); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, true ); if ( pFrame ) pFrame->GetFrame().Appear(); rReq.SetReturnValue( SfxObjectItem( 0, pFrame ) ); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 2d14e61ba26c..84b16e49f7be 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -495,7 +495,7 @@ SfxObjectShell* SfxObjectShell::GetFirst continue; if ( ( !pType || pSh->IsA(*pType) ) && - ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, sal_True ))) + ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, true ))) return pSh; } @@ -528,7 +528,7 @@ SfxObjectShell* SfxObjectShell::GetNext continue; if ( ( !pType || pSh->IsA(*pType) ) && - ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, sal_True ))) + ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, true ))) return pSh; } return 0; diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index d92a31fb80b1..2b1c529862d2 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -260,17 +260,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() thro // search for any view of this document that is currently printing const Printer *pPrinter = NULL; - SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ) : 0; + SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ) : 0; SfxViewFrame* pFirst = pViewFrm; while ( pViewFrm && !pPrinter ) { pPrinter = pViewFrm->GetViewShell()->GetActivePrinter(); - pViewFrm = SfxViewFrame::GetNext( *pViewFrm, m_pData->m_pObjectShell, sal_False ); + pViewFrm = SfxViewFrame::GetNext( *pViewFrm, m_pData->m_pObjectShell, false ); } // if no view is printing currently, use the permanent SfxPrinter instance if ( !pPrinter && pFirst ) - pPrinter = pFirst->GetViewShell()->GetPrinter(sal_True); + pPrinter = pFirst->GetViewShell()->GetPrinter(true); if ( !pPrinter ) return uno::Sequence< beans::PropertyValue >(); @@ -317,12 +317,12 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > { // Get old Printer SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? - SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ) : 0; + SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ) : 0; if ( !pViewFrm ) return; pViewSh = pViewFrm->GetViewShell(); - pPrinter = pViewSh->GetPrinter(sal_True); + pPrinter = pViewSh->GetPrinter(true); if ( !pPrinter ) return; @@ -592,7 +592,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // get view for sfx printing capabilities SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? - SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ) : 0; + SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ) : 0; if ( !pViewFrm ) return; SfxViewShell* pView = pViewFrm->GetViewShell(); @@ -765,7 +765,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // It doesn'tmatter if it is a real printer used or we print to a local file // nor if we print to a temp file and move it afterwards by using the ucb. // That will be handled later. see pUCBPrintFile below! - pView->ExecPrint( aCheckedArgs, sal_True, sal_False ); + pView->ExecPrint( aCheckedArgs, true, false ); // Ok - may be execution before has finished (or started!) printing. // And may it was a printing to a file. diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 7fc23cb4ea3a..9881346341f1 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3652,7 +3652,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz if ( !m_pData->m_pObjectShell.Is() ) throw Exception(); // TODO: error handling - SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ); + SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ); if ( pViewFrm && m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !pViewFrm->GetFrame().IsInPlace() ) { Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() ); @@ -4206,9 +4206,9 @@ namespace sfx { namespace intern { SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const { SfxViewFrame* pViewFrame = NULL; - for ( pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), sal_False ); + for ( pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), false ); pViewFrame; - pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), sal_False ) + pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), false ) ) { if ( pViewFrame->GetFrame().GetFrameInterface() == i_rFrame ) @@ -4320,7 +4320,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) ); if ( nPluginMode == 1 ) { - pViewFrame->ForceOuterResize_Impl( sal_False ); + pViewFrame->ForceOuterResize_Impl( false ); pViewFrame->GetBindings().HidePopups( true ); SfxFrame& rFrame = pViewFrame->GetFrame(); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 880b81ac2c3f..39bb8d273e41 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -111,7 +111,7 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() ) { OSL_TRACE("SfxFrame: GotFocus"); - pView->MakeActive_Impl( sal_False ); + pView->MakeActive_Impl( false ); } // if focus was on an external window, the clipboard content might have been changed @@ -126,12 +126,12 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) } else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ ) { - pView->SetModalMode( sal_True ); + pView->SetModalMode( true ); return true; } else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) { - pView->SetModalMode( sal_False ); + pView->SetModalMode( false ); return true; } @@ -175,7 +175,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) void SfxFrameWindow_Impl::GetFocus() { if ( pFrame && !pFrame->IsClosing_Impl() && pFrame->GetCurrentViewFrame() && pFrame->GetFrameInterface().is() ) - pFrame->GetCurrentViewFrame()->MakeActive_Impl( sal_True ); + pFrame->GetCurrentViewFrame()->MakeActive_Impl( true ); } void SfxFrameWindow_Impl::Resize() diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index a8b8d97ed625..641d43c2d3b2 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -360,7 +360,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la SfxViewShell* pShell = m_pController->GetViewShell_Impl(); if (pShell) { - bool bCanClose = pShell->PrepareClose( sal_False ); + bool bCanClose = pShell->PrepareClose( false ); if ( !bCanClose ) { if ( bDeliverOwnership && ( !pShell->GetWindow() || !pShell->GetWindow()->IsReallyVisible() ) ) @@ -448,7 +448,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F if ( aEvent.Action == frame::FrameAction_FRAME_UI_ACTIVATED ) { if ( !m_pController->GetViewShell_Impl()->GetUIActiveIPClient_Impl() ) - m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( sal_False ); + m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( false ); } else if ( aEvent.Action == frame::FrameAction_CONTEXT_CHANGED ) { @@ -727,7 +727,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const { SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame(); if ( eSearchFlags & ( frame::FrameSearchFlag::CREATE )) - pFrame->SetChildWindow( SID_BROWSER, sal_True ); + pFrame->SetChildWindow( SID_BROWSER, true ); SfxChildWindow* pChildWin = pFrame->GetChildWindow( SID_BROWSER ); Reference < frame::XFrame > xFrame; if ( pChildWin ) @@ -1322,7 +1322,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) // force resize for OLE server to fix layout problems of writer and math // see i53651 if ( nPluginMode == 3 ) - pViewFrame->Resize( sal_True ); + pViewFrame->Resize( true ); } } else @@ -1335,7 +1335,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) pViewFrame->UpdateTitle(); if ( !rFrame.IsInPlace() ) - pViewFrame->Resize( sal_True ); + pViewFrame->Resize( true ); // if there's a JumpMark given, then, well, jump to it ::comphelper::NamedValueCollection aViewArgs( getCreationArguments() ); @@ -1398,7 +1398,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) Sequence< PropertyValue > aViewData; OSL_VERIFY( xViewData->getByIndex( nViewDataIndex ) >>= aViewData ); if ( aViewData.getLength() > 0 ) - m_pData->m_pViewShell->ReadUserDataSequence( aViewData, sal_True ); + m_pData->m_pViewShell->ReadUserDataSequence( aViewData, true ); } } catch (const Exception&) diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 1a5f1ec4e266..9e830f16793f 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -177,21 +177,21 @@ namespace } -static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) +static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) { // TODO/LATER: In future the info should replace the direct hash completely - sal_Bool bResult = ( !nPasswordHash && !aInfo.getLength() ); + bool bResult = ( !nPasswordHash && !aInfo.getLength() ); OSL_ENSURE( pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_PASSWORDTOMODIFY ), "PasswordToModify feature is active for a filter that does not support it!" ); if ( pFilter && xHandler.is() ) { - sal_Bool bCancel = sal_False; - sal_Bool bFirstTime = sal_True; + bool bCancel = false; + bool bFirstTime = true; while ( !bResult && !bCancel ) { - sal_Bool bMSType = !pFilter->IsOwnFormat(); + bool bMSType = !pFilter->IsOwnFormat(); ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( @@ -216,9 +216,9 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti } } else - bCancel = sal_True; + bCancel = true; - bFirstTime = sal_False; + bFirstTime = false; } } @@ -228,11 +228,11 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti void SfxViewFrame::SetDowning_Impl() { - pImp->bIsDowning = sal_True; + pImp->bIsDowning = true; } -sal_Bool SfxViewFrame::IsDowning_Impl() const +bool SfxViewFrame::IsDowning_Impl() const { return pImp->bIsDowning; } @@ -305,7 +305,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxFrame& rFrame = GetFrame(); if ( pParent == &rFrame && rFrame.GetChildFrameCount() ) { - sal_Bool bReloadAvailable = sal_False; + bool bReloadAvailable = false; SfxFrameIterator aIter( rFrame, false ); SfxFrame *pChild = aIter.FirstFrame(); while ( pChild ) @@ -314,7 +314,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxObjectShell *pShell = pChild->GetCurrentDocument(); if( pShell && pShell->Get_Impl()->bReloadAvailable ) { - bReloadAvailable = sal_True; + bReloadAvailable = true; pChild->GetCurrentViewFrame()->ExecuteSlot( rReq ); } pChild = pNext; @@ -382,7 +382,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } sal_uInt16 nOpenMode; - sal_Bool bNeedsReload = sal_False; + bool bNeedsReload = false; if ( !pSh->IsReadOnly() ) { // Save and reload Readonly @@ -392,7 +392,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { // the storing could let the medium be changed pMed = pSh->GetMedium(); - bNeedsReload = sal_True; + bNeedsReload = true; } else { @@ -463,10 +463,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) || pMed->IsRemote() ) ) || pVersionItem ) { - sal_Bool bOK = sal_False; + bool bOK = false; if ( !pVersionItem ) { - sal_Bool bHasStorage = pMed->HasStorage_Impl(); + bool bHasStorage = pMed->HasStorage_Impl(); // switching edit mode could be possible without reload if ( bHasStorage && pMed->GetStorage() == pSh->GetStorage() ) { @@ -487,7 +487,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) ); if ( !pMed->GetErrorCode() ) - bOK = sal_True; + bOK = true; } if( !bOK ) @@ -580,11 +580,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) return; SfxObjectShellLock xOldObj( pSh ); - pImp->bReloading = sal_True; + pImp->bReloading = true; SFX_REQUEST_ARG(rReq, pURLItem, SfxStringItem, SID_FILE_NAME, false); // Open as editable? - sal_Bool bForEdit = !pSh->IsReadOnly(); + bool bForEdit = !pSh->IsReadOnly(); // If possible ask the User bool bDo = GetViewShell()->PrepareClose(); @@ -607,7 +607,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) else aURL = pMedium->GetName(); - sal_Bool bHandsOff = + bool bHandsOff = ( pMedium->GetURLObject().GetProtocol() == INET_PROT_FILE && !xOldObj->IsDocShared() ); // Emty existing SfxMDIFrames for this Document @@ -723,7 +723,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false); SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedReferer, SfxStringItem, SID_REFERER, false); - sal_Bool bHasStorage = pMedium->HasStorage_Impl(); + bool bHasStorage = pMedium->HasStorage_Impl(); if( bHandsOff ) { if ( bHasStorage && pMedium->GetStorage() == xOldObj->GetStorage() ) @@ -830,7 +830,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) while ( !aViewFrames.empty() ) { Reference< util::XCloseable > xClose( aViewFrames.front().first, UNO_QUERY_THROW ); - xClose->close( sal_True ); + xClose->close( true ); aViewFrames.pop_front(); } } @@ -849,7 +849,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Record as not done rReq.Done(); rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), false)); - pImp->bReloading = sal_False; + pImp->bReloading = false; return; } } @@ -904,7 +904,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) { // If any ChildFrame is reloadable, the slot is enabled, // so you can perfom CTRL-Reload - sal_Bool bReloadAvailable = sal_False; + bool bReloadAvailable = false; SfxFrameIterator aFrameIter( *pFrame, true ); for( SfxFrame* pNextFrame = aFrameIter.FirstFrame(); pFrame; @@ -914,7 +914,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) SfxObjectShell *pShell = pFrame->GetCurrentDocument(); if( pShell && pShell->Get_Impl()->bReloadAvailable ) { - bReloadAvailable = sal_True; + bReloadAvailable = true; break; } pFrame = pNextFrame; @@ -936,32 +936,32 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) // Is there an Undo-Manager on the top Shell? SfxShell *pSh = GetDispatcher()->GetShell(0); ::svl::IUndoManager* pShUndoMgr = pSh->GetUndoManager(); - sal_Bool bOK = sal_False; + bool bOK = false; if ( pShUndoMgr ) { switch ( rReq.GetSlot() ) { case SID_CLEARHISTORY: pShUndoMgr->Clear(); - bOK = sal_True; + bOK = true; break; case SID_UNDO: pShUndoMgr->Undo(); GetBindings().InvalidateAll(false); - bOK = sal_True; + bOK = true; break; case SID_REDO: pShUndoMgr->Redo(); GetBindings().InvalidateAll(false); - bOK = sal_True; + bOK = true; break; case SID_REPEAT: if ( pSh->GetRepeatTarget() ) pShUndoMgr->Repeat( *pSh->GetRepeatTarget() ); - bOK = sal_True; + bOK = true; break; } } @@ -1119,7 +1119,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() if ( pImp->bObjLocked ) { xDyingObjSh->OwnerLock( false ); - pImp->bObjLocked = sal_False; + pImp->bObjLocked = false; } } @@ -1127,7 +1127,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() } -sal_Bool SfxViewFrame::Close() +bool SfxViewFrame::Close() { DBG_ASSERT( GetFrame().IsClosing_Impl() || !GetFrame().GetFrameInterface().is(), "ViewFrame closed too early!" ); @@ -1146,12 +1146,12 @@ sal_Bool SfxViewFrame::Close() GetDispatcher()->Lock(true); delete this; - return sal_True; + return true; } -void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) +void SfxViewFrame::DoActivate( bool bUI, SfxViewFrame* pOldFrame ) { SFX_APP(); @@ -1172,7 +1172,7 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) } -void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) +void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame ) { SFX_APP(); pDispatcher->DoDeactivate_Impl( bUI, pNewFrame ); @@ -1210,7 +1210,7 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) } -sal_Bool SfxViewFrame::SetBorderPixelImpl +bool SfxViewFrame::SetBorderPixelImpl ( const SfxViewShell* pVSh, const SvBorder& rBorder @@ -1249,7 +1249,7 @@ sal_Bool SfxViewFrame::SetBorderPixelImpl pVSh->GetWindow()->SetPosSizePixel( aEditArea.TopLeft(), aEditArea.GetSize() ); } - return sal_True; + return true; } @@ -1285,8 +1285,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) SfxBindings& rBind = GetBindings(); rBind.Invalidate( SID_RELOAD ); SfxDispatcher *pDispat = GetDispatcher(); - sal_Bool bWasReadOnly = pDispat->GetReadOnly_Impl(); - sal_Bool bIsReadOnly = xObjSh->IsReadOnly(); + bool bWasReadOnly = pDispat->GetReadOnly_Impl(); + bool bIsReadOnly = xObjSh->IsReadOnly(); if ( !bWasReadOnly != !bIsReadOnly ) { // Then also TITLE_CHANGED @@ -1373,7 +1373,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // via API from another thread (Java). // According to MBA this call is not necessary anymore, // because each document has its own SfxBindings. - //GetDispatcher()->GetBindings()->InvalidateAll(sal_True); + //GetDispatcher()->GetBindings()->InvalidateAll(true); } break; @@ -1392,16 +1392,16 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) { - pImp->bResizeInToOut = sal_True; - pImp->bDontOverwriteResizeInToOut = sal_False; - pImp->bObjLocked = sal_False; + pImp->bResizeInToOut = true; + pImp->bDontOverwriteResizeInToOut = false; + pImp->bObjLocked = false; pImp->pFocusWin = 0; pImp->pActiveChild = NULL; pImp->nCurViewId = 0; - pImp->bReloading = sal_False; - pImp->bIsDowning = sal_False; - pImp->bModal = sal_False; - pImp->bEnabled = sal_True; + pImp->bReloading = false; + pImp->bIsDowning = false; + pImp->bModal = false; + pImp->bEnabled = true; pImp->nDocViewNo = 0; pImp->aMargin = Size( -1, -1 ); pImp->pWindow = 0; @@ -1413,7 +1413,7 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) xObjSh = pObjSh; if ( xObjSh.Is() && xObjSh->IsPreview() ) - SetQuietMode_Impl( sal_True ); + SetQuietMode_Impl( true ); if ( pObjSh ) { @@ -1533,7 +1533,7 @@ SfxViewFrame* SfxViewFrame::Current() SfxViewFrame* SfxViewFrame::GetFirst ( const SfxObjectShell* pDoc, - sal_Bool bOnlyIfVisible + bool bOnlyIfVisible ) { SfxApplication *pSfxApp = SFX_APP(); @@ -1558,7 +1558,7 @@ SfxViewFrame* SfxViewFrame::GetNext ( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc, - sal_Bool bOnlyIfVisible + bool bOnlyIfVisible ) { SfxApplication *pSfxApp = SFX_APP(); @@ -1643,7 +1643,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) // Hack: InPlaceMode if ( pVSh ) - pImp->bResizeInToOut = sal_False; + pImp->bResizeInToOut = false; } @@ -1659,14 +1659,14 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const } -void SfxViewFrame::ForceOuterResize_Impl(sal_Bool bOn) +void SfxViewFrame::ForceOuterResize_Impl(bool bOn) { if ( !pImp->bDontOverwriteResizeInToOut ) pImp->bResizeInToOut = !bOn; } -sal_Bool SfxViewFrame::IsResizeInToOut_Impl() const +bool SfxViewFrame::IsResizeInToOut_Impl() const { return pImp->bResizeInToOut; } @@ -1681,9 +1681,9 @@ void SfxViewFrame::GetDocNumber_Impl() -void SfxViewFrame::Enable( sal_Bool bEnable ) +void SfxViewFrame::Enable( bool bEnable ) { - if ( bEnable != pImp->bEnabled ) + if ( (bEnable ? 1 : 0) != pImp->bEnabled ) { pImp->bEnabled = bEnable; @@ -1731,12 +1731,12 @@ void SfxViewFrame::Show() { // First lock the objectShell so that UpdateTitle() is valid: - // IsVisible() == sal_True (:#) + // IsVisible() == true (:#) if ( xObjSh.Is() ) { xObjSh->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN ); if ( !pImp->bObjLocked ) - LockObjectShell_Impl( sal_True ); + LockObjectShell_Impl( true ); // Adjust Doc-Shell titel nummer, get unique view-no if ( 0 == pImp->nDocViewNo ) @@ -1756,15 +1756,15 @@ void SfxViewFrame::Show() } -sal_Bool SfxViewFrame::IsVisible() const +bool SfxViewFrame::IsVisible() const { return pImp->bObjLocked; } -void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) +void SfxViewFrame::LockObjectShell_Impl( bool bLock ) { - DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" ); + DBG_ASSERT( pImp->bObjLocked != (bLock ? 1 : 0), "Wrong Locked status!" ); DBG_ASSERT( GetObjectShell(), "No Document!" ); GetObjectShell()->OwnerLock(bLock); @@ -1772,7 +1772,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) } -void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) +void SfxViewFrame::MakeActive_Impl( bool bGrabFocus ) { if ( GetViewShell() && !GetFrame().IsClosing_Impl() ) { @@ -1780,10 +1780,10 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) { if ( GetViewShell() ) { - sal_Bool bPreview = sal_False; + bool bPreview = false; if ( GetObjectShell()->IsPreview() ) { - bPreview = sal_True; + bPreview = true; } else { @@ -1825,7 +1825,7 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) -void SfxViewFrame::SetQuietMode_Impl( sal_Bool bOn ) +void SfxViewFrame::SetQuietMode_Impl( bool bOn ) { GetDispatcher()->SetQuietMode_Impl( bOn ); } @@ -1909,7 +1909,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell { // ensure the frame/window is visible Reference< XWindow > xContainerWindow( xFrame->getContainerWindow(), UNO_SET_THROW ); - xContainerWindow->setVisible( sal_True ); + xContainerWindow->setVisible( true ); } } catch( const Exception& ) @@ -2029,9 +2029,9 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c } SfxViewFrame* pViewFrame = NULL; - for ( pViewFrame = SfxViewFrame::GetFirst( pDoc, sal_False ); + for ( pViewFrame = SfxViewFrame::GetFirst( pDoc, false ); pViewFrame; - pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, sal_False ) + pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, false ) ) { if ( pViewFrame->GetViewShell()->GetController() == i_rController ) @@ -2109,7 +2109,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) -sal_Bool SfxViewFrame::SwitchToViewShell_Impl +bool SfxViewFrame::SwitchToViewShell_Impl ( sal_uInt16 nViewIdOrNo, /* > 0 Registration-Id of the View, to which the @@ -2119,7 +2119,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl == 0 First use the Default view. */ - sal_Bool bIsIndex /* sal_True + bool bIsIndex /* true 'nViewIdOrNo' is no Registration-Id instead an Index of <SfxViewFrame> in <SfxObjectShell>. */ @@ -2134,11 +2134,11 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl [Return Value] - sal_Bool sal_True + bool true requested SfxViewShell was created and a possibly existing one deleted - sal_False + false SfxViewShell requested could not be created, the existing SfxViewShell thus continue to exist */ @@ -2154,8 +2154,8 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl if ( pOldSh ) { // ask whether it can be closed - if ( !pOldSh->PrepareClose( sal_True ) ) - return sal_False; + if ( !pOldSh->PrepareClose( true ) ) + return false; // remove sub shells from Dispatcher before switching to new ViewShell PopShellAndSubShells_Impl( *pOldSh ); @@ -2194,11 +2194,11 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl // the SfxCode is not able to cope with exceptions thrown while creating views // the code will crash in the stack unwinding procedure, so we shouldn't let exceptions go through here DBG_UNHANDLED_EXCEPTION(); - return sal_False; + return false; } DBG_ASSERT( SFX_APP()->GetViewFrames_Impl().size() == SFX_APP()->GetViewShells_Impl().size(), "Inconsistent view arrays!" ); - return sal_True; + return true; } @@ -2249,7 +2249,7 @@ void SfxViewFrame::ExecView_Impl ) { const sal_uInt16 nViewId = static_cast< const SfxUInt16Item* >( pItem )->GetValue(); - sal_Bool bSuccess = SwitchToViewShell_Impl( nViewId ); + bool bSuccess = SwitchToViewShell_Impl( nViewId ); rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) ); } break; @@ -2262,7 +2262,7 @@ void SfxViewFrame::ExecView_Impl case SID_VIEWSHELL4: { const sal_uInt16 nViewNo = rReq.GetSlot() - SID_VIEWSHELL0; - sal_Bool bSuccess = SwitchToViewShell_Impl( nViewNo, sal_True ); + bool bSuccess = SwitchToViewShell_Impl( nViewNo, true ); rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) ); break; } @@ -2322,13 +2322,13 @@ void SfxViewFrame::ExecView_Impl TODO: export special helper "framework::FrameListAnalyzer" within the framework module and use it here. */ -sal_Bool impl_maxOpenDocCountReached() +bool impl_maxOpenDocCountReached() { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); boost::optional<sal_Int32> x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext)); // NIL means: count of allowed documents = infinite ! if (!x) - return sal_False; + return false; sal_Int32 nMaxDocs(x.get()); sal_Int32 nOpenDocs = 0; @@ -2476,7 +2476,7 @@ Window& SfxViewFrame::GetWindow() const return pImp->pWindow ? *pImp->pWindow : GetFrame().GetWindow(); } -sal_Bool SfxViewFrame::DoClose() +bool SfxViewFrame::DoClose() { return GetFrame().DoClose(); } @@ -2488,7 +2488,7 @@ OUString SfxViewFrame::GetActualPresentationURL_Impl() const return OUString(); } -void SfxViewFrame::SetModalMode( sal_Bool bModal ) +void SfxViewFrame::SetModalMode( bool bModal ) { pImp->bModal = bModal; if ( xObjSh.Is() ) @@ -2500,12 +2500,12 @@ void SfxViewFrame::SetModalMode( sal_Bool bModal ) } } -sal_Bool SfxViewFrame::IsInModalMode() const +bool SfxViewFrame::IsInModalMode() const { return pImp->bModal || GetFrame().GetWindow().IsInModalMode(); } -void SfxViewFrame::Resize( sal_Bool bForce ) +void SfxViewFrame::Resize( bool bForce ) { Size aSize = GetWindow().GetOutputSizePixel(); if ( bForce || aSize != pImp->aSize ) @@ -2529,7 +2529,7 @@ void SfxViewFrame::Resize( sal_Bool bForce ) #define LINE_SEP 0x0A -void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines ) +void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines ) { sal_Int32 nStartPos = 0; sal_Int32 nLine = 0; @@ -2650,7 +2650,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) pMethod->GetLineRange( nStart, nEnd ); sal_uIntPtr nlStart = nStart; sal_uIntPtr nlEnd = nEnd; - CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, sal_True ); + CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, true ); } } } @@ -2698,7 +2698,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) OUString sCode; OUStringBuffer sRoutine(10000); OUString sMacroName( aMacroName ); - sal_Bool bReplace = sal_False; + bool bReplace = false; // get module OUString sModule( aModuleName ); @@ -2715,7 +2715,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) sRoutine.append( sCode ); } - bReplace = sal_True; + bReplace = true; } // append new method @@ -2805,7 +2805,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) xRecorder = NULL; GetBindings().SetRecorder_Impl( xRecorder ); - SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_False ); + SetChildWindow( SID_RECORDING_FLOATWINDOW, false ); if ( rReq.GetSlot() != SID_RECORDMACRO ) GetBindings().Invalidate( SID_RECORDMACRO ); } @@ -2824,7 +2824,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) aProp <<= xSupplier; xSet->setPropertyValue(sProperty,aProp); GetBindings().SetRecorder_Impl( xRecorder ); - SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_True ); + SetChildWindow( SID_RECORDING_FLOATWINDOW, true ); } rReq.Done(); @@ -2856,7 +2856,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); // Evaluate parameter. SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), false); - sal_Bool bShow( sal_True ); + bool bShow( true ); if ( !pShowItem ) bShow = xLayoutManager->isElementVisible( aStatusbarResString ); else @@ -3024,7 +3024,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) else { OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); - sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString ); + bool bShow = xLayoutManager->isElementVisible( aStatusbarResString ); rSet.Put( SfxBoolItem( nWhich, bShow )); } break; @@ -3084,8 +3084,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) return; Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface(); Reference < XFrame > xBeamer( xFrame->findFrame( "_beamer", FrameSearchFlag::CHILDREN ) ); - sal_Bool bHasChild = xBeamer.is(); - sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; + bool bHasChild = xBeamer.is(); + bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; if ( pShowItem ) { if( bShow == bHasChild ) @@ -3096,7 +3096,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) if ( !bShow ) { - SetChildWindow( SID_BROWSER, sal_False ); + SetChildWindow( SID_BROWSER, false ); } else { @@ -3125,8 +3125,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) return; } - sal_Bool bHasChild = HasChildWindow(nSID); - sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; + bool bHasChild = HasChildWindow(nSID); + bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; GetDispatcher()->Update_Impl( true ); // Perform action. @@ -3233,7 +3233,7 @@ SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ ) return pWork; } -void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus ) +void SfxViewFrame::SetChildWindow(sal_uInt16 nId, bool bOn, bool bSetFocus ) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); if ( pWork ) @@ -3246,7 +3246,7 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); if ( pWork ) - pWork->ToggleChildWindow_Impl( nId, sal_True ); + pWork->ToggleChildWindow_Impl( nId, true ); } @@ -3259,21 +3259,21 @@ bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) -sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) +bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); - return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False; + return pWork && pWork->KnowsChildWindow_Impl(nId); } -void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible ) +void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, bool bVisible ) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); if ( pWork ) { GetDispatcher()->Update_Impl(true); - pWork->ShowChildWindow_Impl(nId, bVisible, sal_True ); + pWork->ShowChildWindow_Impl(nId, bVisible, true ); } } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index edade4ae15d8..de2cef6980ea 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -199,7 +199,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) case SID_ACTIVATE: { - MakeActive_Impl( sal_True ); + MakeActive_Impl( true ); rReq.SetReturnValue( SfxObjectItem( 0, this ) ); break; } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index f5eece378b2c..6a17d5b19c17 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -379,7 +379,7 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt // by a new one. The reason for this is that otherwise we would not get // the printer's SfxItemSet here to copy. Awkward, but at the moment there is no // other way here to get the item set. - SfxPrinter* pDocPrt = mpViewShell->GetPrinter(sal_True); + SfxPrinter* pDocPrt = mpViewShell->GetPrinter(true); if( pDocPrt ) { if( pDocPrt->GetName() == getPrinter()->GetName() ) @@ -571,7 +571,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) return pDocPrinter; } -void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, sal_Bool bIsAPI, sal_Bool bIsDirect ) +void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, bool bIsAPI, bool bIsDirect ) { // get the current selection; our controller should know it Reference< frame::XController > xController( GetController() ); @@ -616,7 +616,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro makeAny( OUString( pObjShell->GetTitle(0) ) ) ); // FIXME: job setup - SfxPrinter* pDocPrt = GetPrinter(sal_False); + SfxPrinter* pDocPrt = GetPrinter(false); JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup(); if( bIsDirect ) aJobSetup.SetValue( OUString( "IsQuickJob" ), @@ -761,7 +761,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) case SID_PRINTER_NAME : // only for recorded macros { // get printer and printer settings from the document - SfxPrinter *pDocPrinter = GetPrinter(sal_True); + SfxPrinter *pDocPrinter = GetPrinter(true); // look for printer in parameters SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, false ); @@ -878,7 +878,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) } } -SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ ) +SfxPrinter* SfxViewShell::GetPrinter( bool /*bCreate*/ ) { return 0; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 59a0e8a54db9..424201586c36 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -414,7 +414,7 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) { - SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True); + SfxInPlaceClientList* pClientList = GetIPClientList_Impl(true); for( SfxInPlaceClientList::iterator it = pClientList->begin(); it != pClientList->end(); ++it ) { @@ -753,7 +753,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) VisAreaChanged(aVisArea); // the plugins might need change in their state - SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(false); if ( pClients ) { for ( size_t n = 0; n < pClients->size(); n++) @@ -798,7 +798,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) bEnabled = bEnabled && !Application::GetSettings().GetMiscSettings().GetDisablePrinting(); if ( bEnabled ) { - SfxPrinter *pPrinter = GetPrinter(sal_False); + SfxPrinter *pPrinter = GetPrinter(false); if ( SID_PRINTDOCDIRECT == nSID ) { @@ -870,7 +870,7 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) -void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ ) +void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient*/ ) { if ( !bActive ) GetFrame()->GetFrame().Appear(); @@ -923,7 +923,7 @@ SfxInPlaceClient* SfxViewShell::FindIPClient Window* pObjParentWin ) const { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return 0; @@ -951,7 +951,7 @@ SfxInPlaceClient* SfxViewShell::GetIPClient() const SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const { // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize) - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return 0; @@ -967,7 +967,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return 0; @@ -1197,7 +1197,7 @@ void SfxViewShell::SetWindow DiscardClients_Impl(); // Switch View-Port - sal_Bool bHadFocus = pWindow ? pWindow->HasChildPathFocus( true ) : sal_False; + bool bHadFocus = pWindow && pWindow->HasChildPathFocus( true ); pWindow = pViewPort; if( pWindow ) @@ -1277,7 +1277,7 @@ SfxViewShell::~SfxViewShell() bool SfxViewShell::PrepareClose ( - sal_Bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode + bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode ) { SfxPrinter *pPrinter = GetPrinter(); @@ -1316,9 +1316,9 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) if ( !i_rController.is() ) return NULL; - for ( SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, sal_False ); + for ( SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, false ); pViewShell; - pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, sal_False ) + pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, false ) ) { if ( pViewShell->GetController() == i_rController ) @@ -1375,7 +1375,7 @@ OUString SfxViewShell::GetSelectionText -sal_Bool SfxViewShell::HasSelection( sal_Bool ) const +bool SfxViewShell::HasSelection( bool ) const /* [Description] @@ -1385,7 +1385,7 @@ sal_Bool SfxViewShell::HasSelection( sal_Bool ) const */ { - return sal_False; + return false; } void SfxViewShell::AddSubShell( SfxShell& rShell ) @@ -1436,7 +1436,7 @@ SfxShell* SfxViewShell::GetSubShell( sal_uInt16 nNo ) return NULL; } -void SfxViewShell::PushSubShells_Impl( sal_Bool bPush ) +void SfxViewShell::PushSubShells_Impl( bool bPush ) { SfxDispatcher *pDisp = pFrame->GetDispatcher(); if ( bPush ) @@ -1466,11 +1466,11 @@ void SfxViewShell::ReadUserData(const OUString&, bool ) { } -void SfxViewShell::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >&, sal_Bool ) +void SfxViewShell::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >&, bool ) { } -void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >&, sal_Bool ) +void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >&, bool ) { } @@ -1481,7 +1481,7 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue SfxViewShell* SfxViewShell::GetFirst ( const TypeId* pType, - sal_Bool bOnlyVisible + bool bOnlyVisible ) { // search for a SfxViewShell of the specified type @@ -1519,7 +1519,7 @@ SfxViewShell* SfxViewShell::GetNext ( const SfxViewShell& rPrev, const TypeId* pType, - sal_Bool bOnlyVisible + bool bOnlyVisible ) { SfxViewShellArr_Impl &rShells = SFX_APP()->GetViewShells_Impl(); @@ -1595,7 +1595,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, -sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) +bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) { if (!pImp->m_pAccExec.get()) { @@ -1678,7 +1678,7 @@ void SfxViewShell::GotFocus() const void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1694,7 +1694,7 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) void SfxViewShell::DisconnectAllClients() { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1713,7 +1713,7 @@ void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1732,9 +1732,9 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan if ( GetObjectShell()->IsInClose() ) return; - sal_Bool bAlwaysActive = + bool bAlwaysActive = ( ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY ) != 0 ); - sal_Bool bActiveWhenVisible = + bool bActiveWhenVisible = ( ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0 ); // this method is called when either a client is created or the "Edit/Plugins" checkbox is checked @@ -1774,7 +1774,7 @@ void SfxViewShell::DiscardClients_Impl() */ { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1844,7 +1844,7 @@ void SfxViewShell::MarginChanged() -sal_Bool SfxViewShell::IsShowView_Impl() const +bool SfxViewShell::IsShowView_Impl() const { return pImp->m_bIsShowView; } @@ -1869,7 +1869,7 @@ void SfxViewShell::JumpToMark( const OUString& rMark ) -SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const +SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( bool bCreate ) const { if ( !pIPClientList && bCreate ) ( (SfxViewShell*) this )->pIPClientList = new SfxInPlaceClientList; @@ -1947,10 +1947,10 @@ void Change( Menu* pMenu, SfxViewShell* pView ) } -sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) +bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) { rpOut = NULL; - sal_Bool bModified = sal_False; + bool bModified = false; // create container from menu aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( @@ -1971,14 +1971,14 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rM { case ui::ContextMenuInterceptorAction_CANCELLED : // interceptor does not want execution - return sal_False; + return false; case ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED : // interceptor wants his modified menu to be executed - bModified = sal_True; + bModified = true; break; case ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED : // interceptor has modified menu, but allows for calling other interceptors - bModified = sal_True; + bModified = true; continue; case ui::ContextMenuInterceptorAction_IGNORED : // interceptor is indifferent @@ -2005,7 +2005,7 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rM Change( rpOut, this ); } - return sal_True; + return true; } void SfxViewShell::TakeOwnership_Impl() @@ -2029,19 +2029,19 @@ bool SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent ) return false; } -sal_Bool SfxViewShell::HasKeyListeners_Impl() +bool SfxViewShell::HasKeyListeners_Impl() { return (pImp->m_pController.is()) - ? pImp->m_pController->HasKeyListeners_Impl() : sal_False; + && pImp->m_pController->HasKeyListeners_Impl(); } -sal_Bool SfxViewShell::HasMouseClickListeners_Impl() +bool SfxViewShell::HasMouseClickListeners_Impl() { return (pImp->m_pController.is()) - ? pImp->m_pController->HasMouseClickListeners_Impl() : sal_False; + && pImp->m_pController->HasMouseClickListeners_Impl(); } -sal_Bool SfxViewShell::Escape() +bool SfxViewShell::Escape() { return GetViewFrame()->GetBindings().Execute( SID_TERMINATE_INPLACEACTIVATION ); } @@ -2069,7 +2069,7 @@ uno::Reference< datatransfer::clipboard::XClipboardNotifier > SfxViewShell::GetC return xClipboardNotifier; } -void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, sal_Bool bAdd ) +void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, bool bAdd ) { try { diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index f231bda96351..8adadd82bb88 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -256,7 +256,7 @@ protected: sal_uInt16 MaxWidth); virtual sal_uInt16 Print(SfxProgress &rProgress, sal_Bool bIsAPI); - 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); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index d517fcb5592f..0bafd5b1e900 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -1055,9 +1055,9 @@ void SAL_CALL SmModel::render( //!! when called via API we may not have an active view //!! thus we go and look for a view that can be used. const TypeId aTypeId = TYPE( SmViewShell ); - SfxViewShell* pViewSh = SfxViewShell::GetFirst( &aTypeId, sal_False /* search non-visible views as well*/ ); + SfxViewShell* pViewSh = SfxViewShell::GetFirst( &aTypeId, false /* search non-visible views as well*/ ); while (pViewSh && pViewSh->GetObjectShell() != pDocSh) - pViewSh = SfxViewShell::GetNext( *pViewSh, &aTypeId, sal_False /* search non-visible views as well*/ ); + pViewSh = SfxViewShell::GetNext( *pViewSh, &aTypeId, false /* search non-visible views as well*/ ); SmViewShell *pView = PTR_CAST( SmViewShell, pViewSh ); SAL_WARN_IF( !pView, "starmath", "SmModel::render : no SmViewShell found" ); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index c3d5c493edbf..06863207385d 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1350,7 +1350,7 @@ sal_uInt16 SmViewShell::Print(SfxProgress & /*rProgress*/, sal_Bool /*bIsAPI*/) } -SfxPrinter* SmViewShell::GetPrinter(sal_Bool bCreate) +SfxPrinter* SmViewShell::GetPrinter(bool bCreate) { SAL_INFO( "starmath", "SmViewShell::GetPrinter" ); diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 1da16aa7f5cf..b15be742200c 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -136,12 +136,12 @@ void StartGrammarChecking( SwDoc &rDoc ) // check for a visible view bool bVisible = false; const SwDocShell *mpDocShell = rDoc.GetDocShell(); - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( mpDocShell, sal_False ); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( mpDocShell, false ); while (pFrame && !bVisible) { if (pFrame->IsVisible()) bVisible = true; - pFrame = SfxViewFrame::GetNext( *pFrame, mpDocShell, sal_False ); + pFrame = SfxViewFrame::GetNext( *pFrame, mpDocShell, false ); } //!! only documents with visible views need to be checked diff --git a/sw/source/core/uibase/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx index 60ad48006403..8d486121e456 100644 --- a/sw/source/core/uibase/app/apphdl.cxx +++ b/sw/source/core/uibase/app/apphdl.cxx @@ -296,7 +296,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs m_pMMConfig->SetSourceView( m_pView ); m_pView->SetMailMergeConfigItem(0, 0, sal_True); SfxViewFrame* pViewFrame = m_pView->GetViewFrame(); - pViewFrame->ShowChildWindow(FN_MAILMERGE_CHILDWINDOW, sal_False); + pViewFrame->ShowChildWindow(FN_MAILMERGE_CHILDWINDOW, false); OSL_ENSURE(m_pMMConfig, "no MailMergeConfigItem available"); bRestoreWizard = true; } diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx index 0a339253c74c..528035689b94 100644 --- a/sw/source/core/uibase/app/docsh2.cxx +++ b/sw/source/core/uibase/app/docsh2.cxx @@ -159,16 +159,16 @@ void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView ) if( !GetDoc()->getPrinter( false ) ) pTempView->SetPrinter( GetDoc()->getPrinter( false ), SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP ); GetDoc()->CheckDefaultPageFmt(); - SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False); + SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, false); while (pTmpFrm) { if( pTmpFrm != pTempView->GetViewFrame() ) { pTmpFrm->DoClose(); - pTmpFrm = SfxViewFrame::GetFirst(this, sal_False); + pTmpFrm = SfxViewFrame::GetFirst(this, false); } else - pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False); + pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, false); } const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions(); pTempView->GetWrtShell().CheckBrowseView( sal_True ); diff --git a/sw/source/core/uibase/app/swmodul1.cxx b/sw/source/core/uibase/app/swmodul1.cxx index a0401dd70c5b..bfdf01078a70 100644 --- a/sw/source/core/uibase/app/swmodul1.cxx +++ b/sw/source/core/uibase/app/swmodul1.cxx @@ -132,7 +132,7 @@ SwView* SwModule::GetNextView(SwView* pView) { OSL_ENSURE(PTR_CAST(SwView, pView),"return no SwView"); const TypeId aTypeId = TYPE(SwView); - SwView* pNView = (SwView*)SfxViewShell::GetNext(*pView, &aTypeId, sal_True); + SwView* pNView = (SwView*)SfxViewShell::GetNext(*pView, &aTypeId, true); return pNView; } diff --git a/sw/source/core/uibase/app/swwait.cxx b/sw/source/core/uibase/app/swwait.cxx index 1ff5b3f48387..01647c62a7bf 100644 --- a/sw/source/core/uibase/app/swwait.cxx +++ b/sw/source/core/uibase/app/swwait.cxx @@ -41,7 +41,7 @@ SwWait::~SwWait() void SwWait::EnterWaitAndLockDispatcher() { - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &mrDoc, sal_False ); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &mrDoc, false ); while ( pFrame ) { pFrame->GetWindow().EnterWait(); @@ -56,13 +56,13 @@ void SwWait::EnterWaitAndLockDispatcher() } } - pFrame = SfxViewFrame::GetNext( *pFrame, &mrDoc, sal_False ); + pFrame = SfxViewFrame::GetNext( *pFrame, &mrDoc, false ); } } void SwWait::LeaveWaitAndUnlockDispatcher() { - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &mrDoc, sal_False ); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &mrDoc, false ); while ( pFrame ) { pFrame->GetWindow().LeaveWait(); @@ -77,7 +77,7 @@ void SwWait::LeaveWaitAndUnlockDispatcher() } } - pFrame = SfxViewFrame::GetNext( *pFrame, &mrDoc, sal_False ); + pFrame = SfxViewFrame::GetNext( *pFrame, &mrDoc, false ); } } diff --git a/sw/source/core/uibase/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx index 80e8048a809d..324b8b6d0ce9 100644 --- a/sw/source/core/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx @@ -1644,13 +1644,13 @@ sal_uInt32 SwMailMergeConfigItem::GetMergedDocumentCount() const static SwView* lcl_ExistsView(SwView* pView) { const TypeId aType(TYPE(SwView)); - SfxViewShell* pViewShell = SfxViewShell::GetFirst( &aType, sal_False ); + SfxViewShell* pViewShell = SfxViewShell::GetFirst( &aType, false ); while(pViewShell) { if(pViewShell == pView) return pView; - pViewShell = SfxViewShell::GetNext( *pViewShell, &aType, sal_False ); + pViewShell = SfxViewShell::GetNext( *pViewShell, &aType, false ); } return 0; } diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx index de42c7930541..d1569bca2406 100644 --- a/sw/source/core/uibase/inc/pview.hxx +++ b/sw/source/core/uibase/inc/pview.hxx @@ -189,7 +189,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); SAL_DLLPRIVATE bool ChgPage( int eMvMode, int bUpdateScrollbar = sal_True ); - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ); SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx index ba91f8732278..fee601092a4a 100644 --- a/sw/source/core/uibase/inc/srcview.hxx +++ b/sw/source/core/uibase/inc/srcview.hxx @@ -75,7 +75,7 @@ public: void Load(SwDocShell* pDocShell); virtual sal_uInt16 SetPrinter( SfxPrinter* pNew, sal_uInt16 nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); + virtual SfxPrinter* GetPrinter( bool bCreate = false ); sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index aa04ee30931a..d3572f7ad76d 100644 --- a/sw/source/core/uibase/inc/view.hxx +++ b/sw/source/core/uibase/inc/view.hxx @@ -336,8 +336,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; } // methods for printing - SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); - SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; + SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ); + SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const; SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent, const SfxItemSet& rSet); // for readonly switching @@ -415,9 +415,9 @@ public: OUString GetSelectionTextParam( bool bCompleteWords, bool bEraseTrail ); - virtual sal_Bool HasSelection( sal_Bool bText ) const; + virtual bool HasSelection( bool bText ) const; virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; + virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; virtual void MarginChanged(); // replace word/selection with text from the thesaurus @@ -597,8 +597,8 @@ public: virtual void WriteUserData(OUString &, bool bBrowse = false); virtual void ReadUserData(const OUString &, bool bBrowse = false); - virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); - virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse ); + virtual void ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ); + virtual void WriteUserDataSequence ( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool bBrowse ); void SetCrsrAtTop( sal_Bool bFlag, sal_Bool bCenter = sal_False ) { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; } diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx index 0c07be1eb895..ce9382ec0b21 100644 --- a/sw/source/core/uibase/uiview/pview.cxx +++ b/sw/source/core/uibase/uiview/pview.cxx @@ -886,7 +886,7 @@ MOVEPAGE: // The thing with the orientation if(pPPVPD) { - SfxPrinter* pPrinter = GetPrinter( sal_True ); + SfxPrinter* pPrinter = GetPrinter( true ); if((pPrinter->GetOrientation() == ORIENTATION_LANDSCAPE) != pPPVPD->GetLandscape()) pPrinter->SetOrientation(pPPVPD->GetLandscape() ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT); @@ -1629,7 +1629,7 @@ void SwPagePreview::ScrollDocSzChg() } // All about printing -SfxPrinter* SwPagePreview::GetPrinter( sal_Bool bCreate ) +SfxPrinter* SwPagePreview::GetPrinter( bool bCreate ) { return pViewWin->GetViewShell()->getIDocumentDeviceAccess()->getPrinter( bCreate ); } diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx index 0427f928f047..fd4af00fb369 100644 --- a/sw/source/core/uibase/uiview/srcview.cxx +++ b/sw/source/core/uibase/uiview/srcview.cxx @@ -262,7 +262,7 @@ void SwSrcView::Init() aEditWin.SetReadonly(sal_True); } - SetNewWindowAllowed( sal_False ); + SetNewWindowAllowed( false ); StartListening(*pDocShell,true); } @@ -677,7 +677,7 @@ sal_uInt16 SwSrcView::SetPrinter(SfxPrinter* pNew, sal_uInt16 nDiffFlags, bool ) return 0; } -SfxPrinter* SwSrcView::GetPrinter( sal_Bool bCreate ) +SfxPrinter* SwSrcView::GetPrinter( bool bCreate ) { return GetDocShell()->GetDoc()->getPrinter( bCreate ); } diff --git a/sw/source/core/uibase/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx index c89c044bb2c3..75f11e4993ba 100644 --- a/sw/source/core/uibase/uiview/view.cxx +++ b/sw/source/core/uibase/uiview/view.cxx @@ -1242,7 +1242,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) } } -void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >& rSequence, bool bBrowse ) { if(GetDocShell()->IsPreview()||m_bIsPreviewDoubleClick) return; @@ -1460,7 +1460,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > } #define NUM_VIEW_SETTINGS 12 -void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSequence, bool bBrowse ) { const SwRect& rRect = m_pWrtShell->GetCharRect(); const Rectangle& rVis = GetVisArea(); @@ -1558,7 +1558,7 @@ ErrCode SwView::DoVerb( long nVerb ) // only return sal_True for a text selection -sal_Bool SwView::HasSelection( sal_Bool bText ) const +bool SwView::HasSelection( bool bText ) const { return bText ? GetWrtShell().SwCrsrShell::HasSelection() : GetWrtShell().HasSelection(); @@ -1726,10 +1726,10 @@ void SwView::StopShellTimer() } } -bool SwView::PrepareClose( sal_Bool bUI ) +bool SwView::PrepareClose( bool bUI ) { SfxViewFrame* pVFrame = GetViewFrame(); - pVFrame->SetChildWindow( SwInputChild::GetChildWindowId(), sal_False ); + pVFrame->SetChildWindow( SwInputChild::GetChildWindowId(), false ); if( pVFrame->GetDispatcher()->IsLocked() ) pVFrame->GetDispatcher()->Lock(false); diff --git a/sw/source/core/uibase/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx index 7ebcaf44284e..0bc1e88d39e9 100644 --- a/sw/source/core/uibase/uiview/view2.cxx +++ b/sw/source/core/uibase/uiview/view2.cxx @@ -775,7 +775,7 @@ void SwView::Execute(SfxRequest &rReq) break; case FN_SYNC_LABELS: case FN_MAILMERGE_CHILDWINDOW: - GetViewFrame()->ShowChildWindow(nSlot, sal_True); + GetViewFrame()->ShowChildWindow(nSlot, true); break; case FN_ESCAPE: { @@ -2325,7 +2325,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) //call insert fields with database field page available, only SfxViewFrame* pVFrame = GetViewFrame(); //at first hide the default field dialog if currently visible - pVFrame->SetChildWindow(FN_INSERT_FIELD, sal_False); + pVFrame->SetChildWindow(FN_INSERT_FIELD, false); //enable the status of the db field dialog - it is disabled in the status method //to prevent creation of the dialog without mail merge active EnableMailMerge(); diff --git a/sw/source/core/uibase/uiview/viewprt.cxx b/sw/source/core/uibase/uiview/viewprt.cxx index 955fb77ec7cd..dd664ac70cb6 100644 --- a/sw/source/core/uibase/uiview/viewprt.cxx +++ b/sw/source/core/uibase/uiview/viewprt.cxx @@ -68,7 +68,7 @@ using namespace ::com::sun::star; // Hand over the printer to Sfx -SfxPrinter* SwView::GetPrinter( sal_Bool bCreate ) +SfxPrinter* SwView::GetPrinter( bool bCreate ) { const IDocumentDeviceAccess* pIDDA = GetWrtShell().getIDocumentDeviceAccess(); SfxPrinter *pOld = pIDDA->getPrinter( false ); diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx index 64debea96dfb..054ce218a633 100644 --- a/sw/source/core/uibase/uno/unomailmerge.cxx +++ b/sw/source/core/uibase/uno/unomailmerge.cxx @@ -600,7 +600,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( aCurSelection = aTranslated; } - SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, sal_False); + SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, false); SwView *pView = pFrame ? PTR_CAST( SwView, pFrame->GetViewShell() ) : NULL; if (!pView) throw RuntimeException(); diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx index 9a4a51dff7a5..da000d40c140 100644 --- a/sw/source/core/uibase/uno/unotxdoc.cxx +++ b/sw/source/core/uibase/uno/unotxdoc.cxx @@ -163,7 +163,7 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions( const sal_Bool bWebDoc = NULL != dynamic_cast< const SwWebDocShell * >(pDocShell); const bool bSwSrcView = NULL != dynamic_cast< const SwSrcView * >(pView); const SwView * pSwView = dynamic_cast< const SwView * >(pView); - const bool bHasSelection = pSwView ? pSwView->HasSelection( sal_False ) : false; // check for any selection, not just text selection + const bool bHasSelection = pSwView && pSwView->HasSelection( false ); // check for any selection, not just text selection const bool bHasPostIts = sw_GetPostIts( pDocShell->GetDoc(), 0 ); // get default values to use in dialog from documents SwPrintData @@ -202,8 +202,7 @@ static SwTxtFmtColl *lcl_GetParaStyle(const OUString& rCollName, SwDoc* pDoc) static void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell ) { // check if the view frame still exists - SfxViewFrame* pFound = SfxViewFrame::GetFirst( pDocShell, - sal_False ); + SfxViewFrame* pFound = SfxViewFrame::GetFirst( pDocShell, false ); while(pFound) { if( pFound == pToClose) @@ -211,9 +210,7 @@ static void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell ) pToClose->DoClose(); break; } - pFound = SfxViewFrame::GetNext( *pFound, - pDocShell, - sal_False ); + pFound = SfxViewFrame::GetNext( *pFound, pDocShell, false ); } } @@ -2887,7 +2884,7 @@ SfxViewShell * SwXTextDocument::GuessViewShell( SwView *pSwView = 0; SwPagePreview *pSwPagePreview = 0; SwSrcView *pSwSrcView = 0; - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pDocShell, sal_False ); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pDocShell, false ); // look for the view shell with the same controller in use, // otherwise look for a suitable view, preferably a SwView, @@ -2906,7 +2903,7 @@ SfxViewShell * SwXTextDocument::GuessViewShell( } else if (pSwView || pSwSrcView) break; - pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell, sal_False ); + pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell, false ); } OSL_ENSURE( pSwView || pSwPagePreview || pSwSrcView, "failed to get view shell" ); |