diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 16:43:07 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:02 +0200 |
| commit | 8a26a4053db946da7c8d8cdbf2444faf3c459291 (patch) | |
| tree | d1ace4e2666c741caad62ef79d05bcd1d60db8a0 /sfx2 | |
| parent | e19cd844be171097dddf6319a037b7503ad2c922 (diff) | |
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/dialog/printopt.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index b10cd7c9fc52..5627c40bfc9a 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2167,9 +2167,9 @@ void SfxCustomPropertiesPage::Reset( const SfxItemSet* rItemSet ) } } -int SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +SfxTabPage::sfxpg SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { - int nRet = LEAVE_PAGE; + sfxpg nRet = LEAVE_PAGE; if ( !m_pPropertiesCtrl->AreAllLinesValid() ) nRet = KEEP_PAGE; return nRet; @@ -2666,7 +2666,7 @@ void SfxCmisPropertiesPage::Reset( const SfxItemSet* rItemSet ) m_pPropertiesCtrl.setScrollRange(); } -int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) +SfxTabPage::sfxpg SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) { return LEAVE_PAGE; } diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index fc1d7dbb9246..6ad49be51c67 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -607,7 +607,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) -int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) +SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Description] @@ -624,7 +624,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) */ { - int nRet = SfxTabPage::LEAVE_PAGE; + sfxpg nRet = SfxTabPage::LEAVE_PAGE; if ( m_pNameRw->IsModified() ) { @@ -677,7 +677,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) return SfxTabPage::KEEP_PAGE; } bModified = true; - nRet |= (int)SfxTabPage::REFRESH_SET; + nRet = sfxpg(nRet | SfxTabPage::REFRESH_SET); } } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index fbd63402f0d8..3a3ce1b75720 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -159,7 +159,7 @@ void SfxCommonPrintOptionsTabPage::Reset( const SfxItemSet* /*rSet*/ ) ImplUpdateControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions ); } -int SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) +SfxTabPage::sfxpg SfxCommonPrintOptionsTabPage::DeactivatePage( SfxItemSet* pItemSet ) { if( pItemSet ) FillItemSet( pItemSet ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 55c0556231aa..9434ab9184ed 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -200,7 +200,7 @@ void SfxTabPage::ActivatePage( const SfxItemSet& ) { } -int SfxTabPage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg SfxTabPage::DeactivatePage( SfxItemSet* ) /* [Description] |