diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-13 15:28:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-14 14:15:20 +0200 |
commit | c6d99137824101199c8bc1300ef927529539aace (patch) | |
tree | 7580ca4da5dee73fb8bccb34c878b4444a23f3e6 /sc | |
parent | 8cdcfc7b490135540b0487ca8761321a75a509d9 (diff) |
sal_Bool->bool
Change-Id: I2357e07427778fdd7e53aaf964f5879a14937ddd
Diffstat (limited to 'sc')
35 files changed, 70 insertions, 69 deletions
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 940de732ce14..2891094bf054 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -437,20 +437,20 @@ void ScCondFormatDlg::SetActive() RefInputDone(); } -void ScCondFormatDlg::RefInputDone( sal_Bool bForced ) +void ScCondFormatDlg::RefInputDone( bool bForced ) { ScAnyRefModalDlg::RefInputDone(bForced); } -sal_Bool ScCondFormatDlg::IsTableLocked() const +bool ScCondFormatDlg::IsTableLocked() const { if (mpLastEdit && mpLastEdit != mpEdRange) - return sal_False; + return false; - return sal_True; + return true; } -sal_Bool ScCondFormatDlg::IsRefInputMode() const +bool ScCondFormatDlg::IsRefInputMode() const { return mpEdRange->IsEnabled(); } diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 20e5e2b38955..6deb0f14c7c9 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -382,7 +382,7 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) //------------------------------------------------------------------------ -sal_Bool ScDbNameDlg::IsRefInputMode() const +bool ScDbNameDlg::IsRefInputMode() const { return bRefInputMode; } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index c713e2a16d51..c9db0d3baf71 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -684,7 +684,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem() //---------------------------------------------------------------------------- -sal_Bool ScFilterDlg::IsRefInputMode() const +bool ScFilterDlg::IsRefInputMode() const { return bRefInputMode; } diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 1e4973befd23..dc616fb21d74 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -1392,7 +1392,7 @@ void ScPivotLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDoc ) } } -sal_Bool ScPivotLayoutDlg::IsRefInputMode() const +bool ScPivotLayoutDlg::IsRefInputMode() const { return mbRefInputMode; } diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index c92b71a4ed1d..fc71e9e5d9b2 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -279,7 +279,7 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, //---------------------------------------------------------------------------- -sal_Bool ScSpecialFilterDlg::IsRefInputMode() const +bool ScSpecialFilterDlg::IsRefInputMode() const { return bRefInputMode; } diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 9912c25b8372..0df5f0cd495e 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -381,7 +381,8 @@ void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* p m_aHelper.RefInputStart( aPair.second, aPair.first); RefInputStartAfter( aPair.second, aPair.first ); } -void ScFormulaDlg::RefInputDone( sal_Bool bForced ) + +void ScFormulaDlg::RefInputDone( bool bForced ) { m_aHelper.RefInputDone( bForced ); RefInputDoneAfter( bForced ); @@ -447,21 +448,21 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) } } -sal_Bool ScFormulaDlg::IsRefInputMode() const +bool ScFormulaDlg::IsRefInputMode() const { const IFunctionDescription* pDesc = getCurrentFunctionDescription(); - sal_Bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL); + bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL); return bRef; } -sal_Bool ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const +bool ScFormulaDlg::IsDocAllowed(SfxObjectShell* pDocSh) const { // not allowed: different from this doc, and no name // pDocSh is always a ScDocShell if ( pDocSh && ((ScDocShell*)pDocSh)->GetDocument() != pDoc && !pDocSh->HasName() ) return false; - return sal_True; // everything else is allowed + return true; // everything else is allowed } void ScFormulaDlg::SetActive() @@ -512,7 +513,7 @@ void ScFormulaDlg::AddRefEntry( ) { } -sal_Bool ScFormulaDlg::IsTableLocked( ) const +bool ScFormulaDlg::IsTableLocked( ) const { // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden return false; diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx index d9a765b224af..12ff8a956bae 100644 --- a/sc/source/ui/inc/IAnyRefDialog.hxx +++ b/sc/source/ui/inc/IAnyRefDialog.hxx @@ -37,11 +37,11 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0; virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) = 0; - virtual void RefInputDone( sal_Bool bForced = false ) = 0; - virtual sal_Bool IsTableLocked() const = 0; - virtual sal_Bool IsRefInputMode() const = 0; + virtual void RefInputDone( bool bForced = false ) = 0; + virtual bool IsTableLocked() const = 0; + virtual bool IsRefInputMode() const = 0; - virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0; + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const = 0; virtual void AddRefEntry() = 0; virtual void SetActive() = 0; virtual void ViewShellChanged() = 0; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 873a4c3958cf..65045fd380fe 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -135,7 +135,7 @@ protected: void SetDispatcherLock( bool bLock ); virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - virtual void RefInputDone( sal_Bool bForced = false ); + virtual void RefInputDone( bool bForced = false ); void ShowSimpleReference(const OUString& rStr); void ShowFormulaReference(const OUString& rStr); @@ -151,9 +151,9 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0; virtual void AddRefEntry(); - virtual sal_Bool IsRefInputMode() const; - virtual sal_Bool IsTableLocked() const; - virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const; + virtual bool IsRefInputMode() const; + virtual bool IsTableLocked() const; + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const; virtual void ShowReference(const OUString& rStr); virtual void HideReference( sal_Bool bDoneRefMode = sal_True ); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 22c8a214d54f..23a612058f5c 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -41,7 +41,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); virtual void AddRefEntry(); - virtual sal_Bool IsTableLocked() const; + virtual bool IsTableLocked() const; virtual void SetActive(); virtual void Deactivate(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 8b646054d7ec..5b8effe5e640 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -107,7 +107,7 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); protected: - virtual void RefInputDone( sal_Bool bForced = false ); + virtual void RefInputDone( bool bForced = false ); public: @@ -118,9 +118,9 @@ public: SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const; virtual void SetReference(const ScRange&, ScDocument*); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); - virtual sal_Bool IsTableLocked() const; + virtual bool IsTableLocked() const; void InvalidateRefData(); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 4120f317d188..9d4d6c5827d8 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -45,7 +45,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const { return sal_True; } + virtual bool IsRefInputMode() const { return true; } virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index dd1077ba45e2..71f50e397e3c 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -42,7 +42,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 7ea6ad6d3501..f89719f9b7f6 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -44,7 +44,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 0f2d71a74dda..eb1a6d2eb05a 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -61,7 +61,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); @@ -169,7 +169,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 9209224287b2..c8473a0b5e37 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -92,11 +92,11 @@ public: virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - virtual void RefInputDone( sal_Bool bForced = false ); - virtual sal_Bool IsTableLocked() const; - virtual sal_Bool IsRefInputMode() const; + virtual void RefInputDone( bool bForced = false ); + virtual bool IsTableLocked() const; + virtual bool IsRefInputMode() const; - virtual sal_Bool IsDocAllowed( SfxObjectShell* pDocSh ) const; + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const; virtual void AddRefEntry(); virtual void SetActive(); virtual void ViewShellChanged(); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 6370ebaa0074..25a940e9bfc7 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -78,7 +78,7 @@ private: protected: - virtual void RefInputDone( sal_Bool bForced = false ); + virtual void RefInputDone( bool bForced = false ); public: ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -89,7 +89,7 @@ public: virtual void SetActive(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); virtual sal_Bool Close(); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; }; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 185a3c237f3c..18164a7582fa 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -70,7 +70,7 @@ private: DECL_LINK( AssignGetFocusHdl, void * ); protected: - virtual void RefInputDone( sal_Bool bForced = sal_False ); + virtual void RefInputDone( bool bForced = false ); public: ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -80,7 +80,7 @@ public: virtual ~ScNameDefDlg() {}; virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index b6ed1968fb7d..2ef08a1b01b4 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -119,7 +119,7 @@ private: DECL_LINK( ScopeChangedHdl, void* ); protected: - virtual void RefInputDone( sal_Bool bForced = sal_False ); + virtual void RefInputDone( bool bForced = false ); public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -128,7 +128,7 @@ public: virtual ~ScNameDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index f4af6effb496..a9441457c0b2 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -101,7 +101,7 @@ public: ~ScOptSolverDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 7f3f4c0a419c..a56bc7bb483b 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -140,7 +140,7 @@ public: protected: virtual void Deactivate(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index c61d1d25b39f..5fd17517e333 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -68,7 +68,7 @@ private: protected: - virtual void RefInputDone( sal_Bool bForced = false ); + virtual void RefInputDone( bool bForced = false ); public: ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -77,7 +77,7 @@ public: virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index bc48636793da..e4efd8ecf717 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -50,7 +50,7 @@ public: ~ScSolverDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 6c4f141c3f28..5144553a7ca2 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -51,7 +51,7 @@ public: ~ScTabOpDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual sal_Bool IsRefInputMode() const { return sal_True; } + virtual bool IsRefInputMode() const { return true; } virtual void SetActive(); virtual sal_Bool Close(); diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 79c63ff3d511..5c3094cb2dc9 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -153,7 +153,7 @@ public: (m_pHandler->*m_pRefInputStartPostHdl)( pEdit, pButton ); } - virtual void RefInputDone( sal_Bool bForced = false ) + virtual void RefInputDone( bool bForced = false ) { if( !CanInputDone( bForced ) ) return; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index e71b9df20fd0..556637168da9 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -58,7 +58,7 @@ public: ScXMLSourceDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc); - virtual sal_Bool IsRefInputMode() const; + virtual bool IsRefInputMode() const; virtual void SetReference(const ScRange& rRange, ScDocument* pDoc); virtual void Deactivate(); virtual void SetActive(); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 86eb2dae763f..49d5cb9e544c 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -890,7 +890,7 @@ void ScRefHandler::SwitchToDocument() //---------------------------------------------------------------------------- -sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 +bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { // default: allow only same document (overridden in function dialog) OUString aCmpName; @@ -903,7 +903,7 @@ sal_Bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh ma //---------------------------------------------------------------------------- -sal_Bool ScRefHandler::IsRefInputMode() const +bool ScRefHandler::IsRefInputMode() const { return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen } @@ -937,7 +937,7 @@ void ScRefHandler::AddRefEntry() //---------------------------------------------------------------------------- -sal_Bool ScRefHandler::IsTableLocked() const +bool ScRefHandler::IsTableLocked() const { // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden @@ -1024,7 +1024,7 @@ void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB m_aHelper.ReleaseFocus( pEdit,pButton ); } //---------------------------------------------------------------------------- -void ScRefHandler::RefInputDone( sal_Bool bForced ) +void ScRefHandler::RefInputDone( bool bForced ) { m_aHelper.RefInputDone( bForced ); } diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 93f367634e51..8488b6e60da3 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -661,7 +661,7 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, sal_Bool bCo #* #************************************************************************/ -sal_Bool ScColRowNameRangesDlg::IsRefInputMode() const +bool ScColRowNameRangesDlg::IsRefInputMode() const { return (pEdActive != NULL); } diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index f18a9db080ca..f57e5deff296 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -155,7 +155,7 @@ sal_Bool ScHighlightChgDlg::Close() return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() ); } -void ScHighlightChgDlg::RefInputDone( sal_Bool bForced) +void ScHighlightChgDlg::RefInputDone( bool bForced) { ScAnyRefDlg::RefInputDone(bForced); if(bForced || !m_pRbAssign->IsVisible()) @@ -171,7 +171,7 @@ void ScHighlightChgDlg::SetActive() { } -sal_Bool ScHighlightChgDlg::IsRefInputMode() const +bool ScHighlightChgDlg::IsRefInputMode() const { return m_pEdAssign->IsVisible(); } diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 8a0bd4d2dac4..9eac4abf6901 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -528,7 +528,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) //---------------------------------------------------------------------------- -sal_Bool ScOptSolverDlg::IsRefInputMode() const +bool ScOptSolverDlg::IsRefInputMode() const { return mpEdActive != NULL; } diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 0fec6bb7f913..c156e9c053d0 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -145,9 +145,9 @@ void ScSimpleRefDlg::SetActive() RefInputDone(); } //------------------------------------------------------------------------ -sal_Bool ScSimpleRefDlg::IsRefInputMode() const +bool ScSimpleRefDlg::IsRefInputMode() const { - return sal_True; + return true; } OUString ScSimpleRefDlg::GetRefString() const @@ -187,7 +187,7 @@ void ScSimpleRefDlg::StartRefInput() bCloseFlag=sal_True; } -void ScSimpleRefDlg::RefInputDone( sal_Bool bForced) +void ScSimpleRefDlg::RefInputDone( bool bForced) { ScAnyRefDlg::RefInputDone(bForced); if ( (bForced || bCloseOnButtonUp) && bCloseFlag ) diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index e418f9905830..1ad2c2c49f86 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -185,7 +185,7 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) //---------------------------------------------------------------------------- -sal_Bool ScSolverDlg::IsRefInputMode() const +bool ScSolverDlg::IsRefInputMode() const { return pEdActive != NULL; } diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 62e13fd1855a..10a0dfd210ef 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -270,12 +270,12 @@ void ScNameDefDlg::GetNewData(OUString& rName, OUString& rScope) rScope = maScope; } -sal_Bool ScNameDefDlg::IsRefInputMode() const +bool ScNameDefDlg::IsRefInputMode() const { return m_pEdRange->IsEnabled(); } -void ScNameDefDlg::RefInputDone( sal_Bool bForced) +void ScNameDefDlg::RefInputDone( bool bForced) { ScAnyRefDlg::RefInputDone(bForced); IsNameValid(); diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 7b0ea1d3c703..a6c1edfaa0ef 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -155,12 +155,12 @@ void ScNameDlg::Init() } -sal_Bool ScNameDlg::IsRefInputMode() const +bool ScNameDlg::IsRefInputMode() const { return m_pEdAssign->IsEnabled(); } -void ScNameDlg::RefInputDone( sal_Bool bForced) +void ScNameDlg::RefInputDone( bool bForced) { ScAnyRefDlg::RefInputDone(bForced); EdModifyHdl(m_pEdAssign); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 3085f8dde323..a96286eace6a 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -171,12 +171,12 @@ sal_Bool ScPrintAreasDlg::Close() //---------------------------------------------------------------------------- -sal_Bool ScPrintAreasDlg::IsTableLocked() const +bool ScPrintAreasDlg::IsTableLocked() const { // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, // bei der Eingabe die Tabelle umzuschalten - return sal_True; + return true; } diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 5cd3cbd36999..3e20b56f68ec 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -118,7 +118,7 @@ ScXMLSourceDlg::ScXMLSourceDlg( mpBtnSelectSource->GrabFocus(); // Initial focus is on the select source button. } -sal_Bool ScXMLSourceDlg::IsRefInputMode() const +bool ScXMLSourceDlg::IsRefInputMode() const { return mpActiveEdit != NULL && mpActiveEdit->IsEnabled(); } |