summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-23 14:21:11 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-23 16:02:10 +0000
commitebf5e613a5bea74d6e9801224ab5c29a64b9b11c (patch)
tree41ede1d6cab776af257daa00984d7622bba464f3 /cui
parent976ccb9374cf06af3f5699b567da753167bdf029 (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 'cui')
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/dialogs/SpellDialog.cxx2
-rw-r--r--cui/source/options/cuisrchdlg.cxx2
-rw-r--r--cui/source/options/dbregister.cxx2
-rw-r--r--cui/source/tabpages/connect.cxx2
-rw-r--r--cui/source/tabpages/dstribut.cxx2
-rw-r--r--cui/source/tabpages/macroass.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx2
-rw-r--r--cui/source/tabpages/numfmt.cxx2
9 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index fa2fbc93f6ee..80d1337311af 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -873,7 +873,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, const Reference< frame::X
const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex )
: SvxMacroAssignSingleTabDialog(pParent, rSet)
{
- setTabPage(new SvxMacroTabPage(get_content_area(), _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
+ SetTabPage(new SvxMacroTabPage(get_content_area(), _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
}
//===============================================
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 85c04d3db2ad..e11ed6b0906d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -506,7 +506,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
new SfxSingleTabDialog(this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui");
SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), aSet );
( (SvxLinguTabPage*)pPage )->HideGroups( GROUP_MODULES );
- pDlg->setTabPage( pPage );
+ pDlg->SetTabPage( pPage );
if(RET_OK == pDlg->Execute())
{
InitUserDicts();
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 08ff0bf97e66..9050f49eed3f 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -56,7 +56,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent,
// SfxSingleTabDialog destructor
pPage = (SvxJSearchOptionsPage *)
SvxJSearchOptionsPage::Create(get_content_area(), rOptionsSet );
- setTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
+ SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
pPage->EnableSaveOptions(false);
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index e7a59a33f72f..cc30952802c9 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -79,7 +79,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const S
, SfxSingleTabDialog(pParent, getRegistrationItems())
{
SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), getRegistrationItems());
- setTabPage(page);
+ SetTabPage(page);
SetText(page->get<VclFrame>("frame1")->get_label());
}
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 9ceb12c310ce..602e9232f552 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -60,7 +60,7 @@ SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rIn
_pPage->SetView( pSdrView );
_pPage->Construct();
- setTabPage( _pPage );
+ SetTabPage( _pPage );
SetText(CUI_RESSTR( RID_SVXSTR_CONNECTOR ));
}
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 20dfb4580025..b35dcd40575c 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -46,7 +46,7 @@ SvxDistributeDialog::SvxDistributeDialog(Window* pParent,
, mpPage(NULL)
{
mpPage = new SvxDistributePage(get_content_area(), rInAttrs, eHor, eVer);
- setTabPage(mpPage);
+ SetTabPage(mpPage);
}
/*************************************************************************
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 6c99eabccc4a..b55e6c7fff27 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -474,7 +474,7 @@ SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent,
{
SfxMacroTabPage* pPage = CreateSfxMacroTabPage(get_content_area(), rSet);
pPage->SetFrame( rxDocumentFrame );
- setTabPage( pPage );
+ SetTabPage( pPage );
pPage->LaunchFillGroup();
}
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 245b1f63c997..1a704fd068a1 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -69,7 +69,7 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs,
_pPage->SetView( pSdrView );
_pPage->Construct();
- setTabPage(_pPage );
+ SetTabPage(_pPage );
SetText(CUI_RESSTR(RID_SVXSTR_DIMENSION_LINE));
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 8fdc964e7aa0..c0247fe84c21 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1108,7 +1108,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
}
else
{
- SfxSingleTabDialogBase* pParent = dynamic_cast< SfxSingleTabDialogBase* >( GetParentDialog() );
+ SfxSingleTabDialog* pParent = dynamic_cast< SfxSingleTabDialog* >( GetParentDialog() );
OKButton* pOKButton = pParent ? pParent->GetOKButton() : NULL;
if ( pOKButton )
pOKButton->Click();