summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-09-08 17:22:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-09-08 20:44:26 +0100
commit6e016d0dc74c986073ae1428a16464a59c331d2d (patch)
tree7a5c7b50a6ac35ab4487d0deceb9f1145be4d20c /sw/source/ui
parent10cfd814696409b1fa64a1de8da0e9f359e8a85c (diff)
SwAddrDlg can now be converted to SfxSingleTabDialog
Change-Id: I7fb53193d52d6c04c34fce23aa1610ce1035493c
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx15
-rw-r--r--sw/source/ui/inc/addrdlg.hxx9
2 files changed, 6 insertions, 18 deletions
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 0a9ebdc22c25..daf4a9514975 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -21,24 +21,17 @@
#include <svx/svxdlg.hxx>
#include <sfx2/sfx.hrc>
-SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet ) :
-
- SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
-
+SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet)
+ : SfxSingleTabDialog(pParent, rSet)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL );
if ( fnCreatePage )
{
- SfxTabPage* pPage2 = (*fnCreatePage)( this, rSet );
- SetTabPage(pPage2);
+ SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), rSet);
+ setTabPage(pPage2);
}
}
-SwAddrDlg::~SwAddrDlg()
-{
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/ui/inc/addrdlg.hxx
index a39bd49153a0..509a979c970a 100644
--- a/sw/source/ui/inc/addrdlg.hxx
+++ b/sw/source/ui/inc/addrdlg.hxx
@@ -21,17 +21,12 @@
#include <sfx2/basedlgs.hxx>
-class SwAddrDlg : public SfxNoLayoutSingleTabDialog
+class SwAddrDlg : public SfxSingleTabDialog
{
public:
-
- SwAddrDlg( Window* pParent, const SfxItemSet& rSet );
- ~SwAddrDlg();
+ SwAddrDlg(Window* pParent, const SfxItemSet& rSet);
};
#endif
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */