diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-01-23 14:21:11 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-23 16:02:10 +0000 |
commit | ebf5e613a5bea74d6e9801224ab5c29a64b9b11c (patch) | |
tree | 41ede1d6cab776af257daa00984d7622bba464f3 /sw/source | |
parent | 976ccb9374cf06af3f5699b567da753167bdf029 (diff) |
SfxNoLayoutSingleTabDialog not needed anymore
all single tab dialogs are .ui enabled now.
So now we can remove SfxNoLayoutSingleTabDialog and merge SfxSingleTabDialog
and ~SfxNoLayoutSingleTabDialogBase together
Change-Id: If0acc792d85b7d399572257d7e9b0e12993ba3fe
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/tblnumfm.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/mailconfigpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dialog/addrdlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldedt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/pattern.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 038bb02afa11..edb31713ab00 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -526,7 +526,7 @@ SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) { SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), rSet); pNewPage->SetFormat(false); - setTabPage(pNewPage); + SetTabPage(pNewPage); } SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index a77c08a13177..3d21e60fc9ea 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -44,7 +44,7 @@ SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet) SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put ( SvxNumberInfoItem( (const SvxNumberInfoItem&)pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ))); pNewPage->PageCreated(aSet); - setTabPage(pNewPage); + SetTabPage(pNewPage); } } diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index ea6408ca13af..705c6890bfdb 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -357,7 +357,7 @@ SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { // create TabPage - setTabPage(SwMailConfigPage::Create(get_content_area(), rSet)); + SetTabPage(SwMailConfigPage::Create(get_content_area(), rSet)); } SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 93003853677a..57b03f38d892 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -317,7 +317,7 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) "modules/swriter/ui/captiondialog.ui") { // create TabPage - setTabPage(SwCaptionOptPage::Create(get_content_area(), rSet)); + SetTabPage(SwCaptionOptPage::Create(get_content_area(), rSet)); } SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle ) @@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl) { OUString sFldTypeName = m_pCategoryBox->GetText(); - SfxSingleTabDialogBase *pDlg = dynamic_cast<SfxSingleTabDialogBase*>(GetParentDialog()); + SfxSingleTabDialog *pDlg = dynamic_cast<SfxSingleTabDialog*>(GetParentDialog()); PushButton *pBtn = pDlg ? pDlg->GetOKButton() : NULL; if (pBtn) pBtn->Enable(!sFldTypeName.isEmpty()); diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index daf4a9514975..5b6a81a5879d 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -30,7 +30,7 @@ SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet) if ( fnCreatePage ) { SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), rSet); - setTabPage(pPage2); + SetTabPage(pPage2); } } diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 2315ce00f65c..71491a805d7d 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -186,7 +186,7 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) static_cast<SwFldPage*>(pTabPage)->SetWrtShell(pSh); - setTabPage(pTabPage); + SetTabPage(pTabPage); return pTabPage; } diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index f329ba42d41e..6aea64ef33bf 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -33,7 +33,7 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); if ( fnCreatePage ) { - setTabPage((*fnCreatePage)(get_content_area(), rSet)); + SetTabPage((*fnCreatePage)(get_content_area(), rSet)); } } diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index c32f02b598f2..98f0799eb360 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -60,7 +60,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), rSet); pNewPage->SetFormatUsed(sal_False, bDrawMode); pNewPage->SetShell(pWrtShell); - setTabPage(pNewPage); + SetTabPage(pNewPage); } SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) |