summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-17 15:55:27 +0200
committerNoel Grandin <noel@peralex.com>2014-02-18 10:08:03 +0200
commit2e71918d4971719f9f06f132a682824d7ec16238 (patch)
tree88f48f98867ac755cd48336e3a2181cd5a86d0ea
parentda2b9b0fa4140d576340a3df6fbdde94e02e2777 (diff)
sal_Bool->bool
Change-Id: I628c1506573c7d5ec182048a20ed996c9ae879c4
-rw-r--r--formula/source/ui/dlg/formula.cxx2
-rw-r--r--include/formula/IFunctionDescription.hxx6
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx6
-rw-r--r--reportdesign/source/ui/inc/Formula.hxx6
-rw-r--r--sc/source/ui/formdlg/formula.cxx6
-rw-r--r--sc/source/ui/inc/formula.hxx6
6 files changed, 16 insertions, 16 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 32a52ed52675..cb4eedcc7b8c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -803,7 +803,7 @@ void FormulaDlg_Impl::FillListboxes()
}
FuncSelHdl(NULL);
- m_pHelper->setDispatcherLock( sal_True );// Activate Modal-Mode
+ m_pHelper->setDispatcherLock( true );// Activate Modal-Mode
aNewTitle = aTitle1;
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index c27a7f5c5e74..985da7f7dcea 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -154,9 +154,9 @@ namespace formula
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const = 0;
virtual ::com::sun::star::table::CellAddress getReferencePosition() const = 0;
- virtual void setDispatcherLock( sal_Bool bLock ) = 0;
- virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked) = 0;
- virtual void doClose(sal_Bool _bOk) = 0;
+ virtual void setDispatcherLock( bool bLock ) = 0;
+ virtual void dispatch(bool _bOK, bool _bMartixChecked) = 0;
+ virtual void doClose(bool _bOk) = 0;
virtual void insertEntryToLRUList(const IFunctionDescription* pDesc) = 0;
virtual void showReference(const OUString& _sFormula) = 0;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 4488f7c0a29f..f01783e8341a 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -104,7 +104,7 @@ bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResul
rStrResult = rStrExp;
return false;
}
-void FormulaDialog::doClose(sal_Bool _bOk)
+void FormulaDialog::doClose(bool _bOk)
{
EndDialog(_bOk ? RET_OK : RET_CANCEL);
}
@@ -114,10 +114,10 @@ void FormulaDialog::insertEntryToLRUList(const IFunctionDescription* /*_pDesc
void FormulaDialog::showReference(const OUString& /*_sFormula*/)
{
}
-void FormulaDialog::dispatch(sal_Bool /*_bOK*/,sal_Bool /*_bMartixChecked*/)
+void FormulaDialog::dispatch(bool /*_bOK*/, bool /*_bMatrixChecked*/)
{
}
-void FormulaDialog::setDispatcherLock( sal_Bool /*bLock*/ )
+void FormulaDialog::setDispatcherLock( bool /*bLock*/ )
{
}
void FormulaDialog::setReferenceInput(const FormEditData* /*_pData*/)
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index beb446133f93..ae3a93965c10 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -64,11 +64,11 @@ public:
virtual void notifyChange();
virtual void fill();
virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult);
- virtual void doClose(sal_Bool _bOk);
+ virtual void doClose(bool _bOk);
virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc);
virtual void showReference(const OUString& _sFormula);
- virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
- virtual void setDispatcherLock( sal_Bool bLock );
+ virtual void dispatch(bool _bOK, bool _bMatrixChecked);
+ virtual void setDispatcherLock( bool bLock );
virtual void setReferenceInput(const formula::FormEditData* _pData);
virtual void deleteFormData();
virtual void clear();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 5ff4aa24f5af..2b0f9135bf1a 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -484,7 +484,7 @@ void ScFormulaDlg::SaveLRUEntry(const ScFuncDesc* pFuncDescP)
}
}
-void ScFormulaDlg::doClose(sal_Bool /*_bOk*/)
+void ScFormulaDlg::doClose(bool /*_bOk*/)
{
m_aHelper.DoClose( ScFormulaDlgWrapper::GetChildWindowId() );
}
@@ -526,7 +526,7 @@ void ScFormulaDlg::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pB
{
m_aHelper.ReleaseFocus(pEdit,pButton);
}
-void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked)
+void ScFormulaDlg::dispatch(bool _bOK, bool _bMartixChecked)
{
SfxBoolItem aRetItem( SID_DLG_RETOK, _bOK );
SfxBoolItem aMatItem( SID_DLG_MATRIX, _bMartixChecked );
@@ -545,7 +545,7 @@ void ScFormulaDlg::dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked)
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
&aRetItem, &aStrItem, &aMatItem, 0L );
}
-void ScFormulaDlg::setDispatcherLock( sal_Bool bLock )
+void ScFormulaDlg::setDispatcherLock( bool bLock )
{
m_aHelper.SetDispatcherLock( bLock );
}
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index dac577268acd..c4472cd2ee70 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -62,11 +62,11 @@ public:
virtual void notifyChange();
virtual void fill();
virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult);
- virtual void doClose(sal_Bool _bOk);
+ virtual void doClose(bool _bOk);
virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc);
virtual void showReference(const OUString& _sFormula);
- virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
- virtual void setDispatcherLock( sal_Bool bLock );
+ virtual void dispatch(bool _bOK, bool _bMartixChecked);
+ virtual void setDispatcherLock( bool bLock );
virtual void setReferenceInput(const formula::FormEditData* _pData);
virtual void deleteFormData();
virtual void clear();