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 /sw/source/ui/misc | |
| parent | e19cd844be171097dddf6319a037b7503ad2c922 (diff) | |
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
Diffstat (limited to 'sw/source/ui/misc')
| -rw-r--r-- | sw/source/ui/misc/num.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/outline.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index ae35a0012cbf..cd9c26626de3 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -398,12 +398,12 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) m_pPreviewWIN->Invalidate(); } -int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) +SfxTabPage::sfxpg SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { SwOutlineTabDialog::SetActNumLevel(nActNumLvl); if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 930c73726911..c9ef5a1d1631 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -810,7 +810,7 @@ void SwOutlineSettingsTabPage::ActivatePage(const SfxItemSet& ) LevelHdl(m_pLevelLB); } -int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) +SfxTabPage::sfxpg SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) { SwOutlineTabDialog::SetActNumLevel(nActLevel); return LEAVE_PAGE; diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 68e6d1a1d510..809b09007fa9 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -350,12 +350,12 @@ void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) HeightModify(0); } -int SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) +SfxTabPage::sfxpg SwFootNotePage::DeactivatePage( SfxItemSet* _pSet) { if(_pSet) FillItemSet(_pSet); - return sal_True; + return LEAVE_PAGE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 76ab9a1c80a9..d4908da737a6 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -239,7 +239,7 @@ void SwTextGridPage::ActivatePage( const SfxItemSet& rSet ) m_pExampleWN->Invalidate(); } -int SwTextGridPage::DeactivatePage( SfxItemSet* ) +SfxTabPage::sfxpg SwTextGridPage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; } |