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 /sc | |
parent | 16752a8a773cf8096e28628237238a562016c4e5 (diff) |
sfx2: sal_Bool->bool
Change-Id: I73acb3a150b01114d32274a6842f6db9654b3e63
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh8.cxx | 6 |
7 files changed, 20 insertions, 20 deletions
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; } |