summaryrefslogtreecommitdiffstats
path: root/chart2/source/controller
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-25 14:20:18 +0200
committerNoel Grandin <noel@peralex.com>2014-03-25 14:32:57 +0200
commit80ef0dfedcbba5a0c2cb8de409cc24200191fab8 (patch)
tree4799ef80c36dabd4adb50da98d5a9baeff237b8a /chart2/source/controller
parentsvtools: sal_Bool->bool (diff)
downloadcore-80ef0dfedcbba5a0c2cb8de409cc24200191fab8.tar.gz
core-80ef0dfedcbba5a0c2cb8de409cc24200191fab8.zip
svtools: sal_Bool->bool
Change-Id: I42a341b5805e0b2a7d619ba552700db35815afd5
Diffstat (limited to 'chart2/source/controller')
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard.hxx2
10 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index d0b745dd134c..6b018be7f68e 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -69,7 +69,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
m_apDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
// Do not call FreeResource(), because there are no sub-elements defined in
// the dialog resource
- ShowButtonFixedLine( sal_True );
+ ShowButtonFixedLine( true );
defaultButton( WZB_FINISH );
if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount )
@@ -155,7 +155,7 @@ svt::OWizardPage* CreationWizard::createPage(WizardState nState)
return pRet;
}
-sal_Bool CreationWizard::leaveState( WizardState /*_nState*/ )
+bool CreationWizard::leaveState( WizardState /*_nState*/ )
{
return m_bCanTravel;
}
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 0c78e59246c8..d0106482abaa 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -941,7 +941,7 @@ void ChartTypeTabPage::initializePage()
}
}
-sal_Bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//commit changes to model
if( !m_bDoLiveUpdate && m_pCurrentMainType )
@@ -951,7 +951,7 @@ sal_Bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eR
commitToModel( aParameter );
}
- return sal_True;//return false if this page should not be left
+ return true; // return false if this page should not be left
}
uno::Reference< XChartTypeTemplate > ChartTypeTabPage::getCurrentTemplate() const
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index c7962767ba79..21ea30881b5f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -58,7 +58,7 @@ public:
virtual ~ChartTypeTabPage();
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index aa150518affa..b73f7b609005 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -303,16 +303,16 @@ void DataSourceTabPage::commitPage()
commitPage(::svt::WizardTypes::eFinish);
}
-sal_Bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//ranges may have been edited in the meanwhile (dirty is true in that case here)
if( isValid() )
{
updateModelFromControl( 0 /*update all*/ );
- return sal_True;//return false if this page should not be left
+ return true; //return false if this page should not be left
}
else
- return sal_False;
+ return false;
}
bool DataSourceTabPage::isRangeFieldContentValid( Edit & rEdit )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 819f02a5a22b..6cb17bcb9de3 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -71,7 +71,7 @@ public:
protected:
// OWizardPage
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
//TabPage
virtual void DeactivatePage();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index cc2ed797ff14..63052fb3c76e 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -173,16 +173,16 @@ void RangeChooserTabPage::commitPage()
commitPage(::svt::WizardTypes::eFinish);
}
-sal_Bool RangeChooserTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool RangeChooserTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//ranges may have been edited in the meanwhile (dirty is true in that case here)
if( isValid() )
{
changeDialogModelAccordingToControls();
- return sal_True;//return false if this page should not be left
+ return true; // return false if this page should not be left
}
else
- return sal_False;
+ return false;
}
void RangeChooserTabPage::changeDialogModelAccordingToControls()
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 3c6bf3751a29..b8ca0bfa1d56 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -60,7 +60,7 @@ protected: //methods
//OWizardPage
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
//TabPage
virtual void DeactivatePage();
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index ba62a0750969..e551c54b128d 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -92,11 +92,11 @@ void TitlesAndObjectsTabPage::initializePage()
m_bCommitToModel = true;
}
-sal_Bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
if( m_xTitleResources->IsModified() ) //titles may have changed in the meanwhile
commitToModel();
- return sal_True;//return false if this page should not be left
+ return true;//return false if this page should not be left
}
void TitlesAndObjectsTabPage::commitToModel()
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 0cd35d694f4b..33bb0979b0e1 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -46,7 +46,7 @@ public:
::com::sun::star::uno::XComponentContext >& xContext );
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
virtual bool canAdvance() const;
protected:
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 2f762fd46cc5..83c2a24b2aa8 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -59,7 +59,7 @@ public:
virtual void setValidPage( TabPage * pTabPage );
protected:
- virtual sal_Bool leaveState( WizardState _nState );
+ virtual bool leaveState( WizardState _nState );
virtual WizardState determineNextState(WizardState nCurrentState) const;
virtual void enterState(WizardState nState);