summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-01-24 14:11:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-01-24 14:29:46 +0000
commit20371d26374b40fe28ac006d9392104b692fce32 (patch)
tree865979524ce4173b3912c04d312d67481deb18f0 /sw
parentbd272cd3daf873fcc69c2cc794ffda821be7fedf (diff)
add a layout aware SfxSingleTabDialog
Change-Id: Ia4726eac4448dd22380d81d49c5e3b19aa097f73
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx11
-rw-r--r--sw/source/ui/inc/tblnumfm.hxx4
2 files changed, 4 insertions, 11 deletions
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 0b09521070b5..1552f606f06c 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -30,7 +30,7 @@
#include <sfx2/tabdlg.hxx>
SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
- : SfxNoLayoutSingleTabDialog( pParent, rSet, 0 )
+ : SfxSingleTabDialog(pParent, rSet)
{
// Create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
@@ -39,17 +39,12 @@ SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet)
if ( fnCreatePage )
{
- SfxTabPage* pNewPage = (*fnCreatePage)( this, rSet );
+ SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet );
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put ( SvxNumberInfoItem( (const SvxNumberInfoItem&)pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO )));
pNewPage->PageCreated(aSet);
- SetTabPage(pNewPage);
+ setTabPage(pNewPage);
}
}
-SwNumFmtDlg::~SwNumFmtDlg()
-{
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/ui/inc/tblnumfm.hxx
index b2de8e1c05f3..8cf3a287033c 100644
--- a/sw/source/ui/inc/tblnumfm.hxx
+++ b/sw/source/ui/inc/tblnumfm.hxx
@@ -24,12 +24,10 @@
class Window;
class SfxItemSet;
-class SwNumFmtDlg : public SfxNoLayoutSingleTabDialog
+class SwNumFmtDlg : public SfxSingleTabDialog
{
public:
-
SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet);
- ~SwNumFmtDlg();
};
#endif