strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unoawt: merged in latest changes from CWS slidecopy (rebase to m80)

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-06-03 17:54:37 +02:00
commit 028f64e749
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chart2/source/controller/dialogs/tp_ChartType.cxx
View file

@ -1133,7 +1133,7 @@ void ChartTypeTabPage::initializePage()
}
}
sal_Bool ChartTypeTabPage::commitPage( CommitPageReason /*eReason*/ )
sal_Bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//commit changes to model
if( !m_bDoLiveUpdate && m_pCurrentMainType )

2
chart2/source/controller/dialogs/tp_ChartType.hxx
View file

@ -73,7 +73,7 @@ public:
virtual ~ChartTypeTabPage();
virtual void initializePage();
virtual sal_Bool commitPage( CommitPageReason eReason );
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const;

4
chart2/source/controller/dialogs/tp_DataSource.cxx
View file

@ -382,10 +382,10 @@ void DataSourceTabPage::DeactivatePage()
void DataSourceTabPage::commitPage()
{
commitPage(eFinish);
commitPage(::svt::WizardTypes::eFinish);
}
sal_Bool DataSourceTabPage::commitPage( CommitPageReason /*eReason*/ )
sal_Bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//ranges may have been edited in the meanwhile (dirty is true in that case here)
if( isValid() )

2
chart2/source/controller/dialogs/tp_DataSource.hxx
View file

@ -89,7 +89,7 @@ public:
protected:
// OWizardPage
virtual void ActivatePage();
virtual sal_Bool commitPage( CommitPageReason eReason );
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
//TabPage
virtual void DeactivatePage();

4
chart2/source/controller/dialogs/tp_RangeChooser.cxx
View file

@ -221,10 +221,10 @@ void RangeChooserTabPage::DeactivatePage()
void RangeChooserTabPage::commitPage()
{
commitPage(eFinish);
commitPage(::svt::WizardTypes::eFinish);
}
sal_Bool RangeChooserTabPage::commitPage( CommitPageReason /*eReason*/ )
sal_Bool RangeChooserTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//ranges may have been edited in the meanwhile (dirty is true in that case here)
if( isValid() )

2
chart2/source/controller/dialogs/tp_RangeChooser.hxx
View file

@ -73,7 +73,7 @@ protected: //methods
//OWizardPage
virtual void ActivatePage();
virtual sal_Bool commitPage( CommitPageReason eReason );
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
//TabPage
virtual void DeactivatePage();

2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
View file

@ -125,7 +125,7 @@ void TitlesAndObjectsTabPage::initializePage()
m_bCommitToModel = true;
}
sal_Bool TitlesAndObjectsTabPage::commitPage( CommitPageReason /*eReason*/ )
sal_Bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
if( m_apTitleResources->IsModified() ) //titles may have changed in the meanwhile
commitToModel();

2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
View file

@ -59,7 +59,7 @@ public:
virtual ~TitlesAndObjectsTabPage();
virtual void initializePage();
virtual sal_Bool commitPage( CommitPageReason eReason );
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
virtual bool canAdvance() const;
protected: