From c3c6a5f68050a2abb49f37e6231fc77c1c4df543 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 8 Sep 2013 17:14:41 +0100 Subject: SwBackgroundDlg can now be converted to SfxSingleTabDialog Change-Id: I6e15b914e022674e27a14023144fe7a3add0ed43 --- sw/source/ui/frmdlg/pattern.cxx | 24 +++--------------------- sw/source/ui/inc/pattern.hxx | 7 +++---- 2 files changed, 6 insertions(+), 25 deletions(-) (limited to 'sw/source/ui') diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 4b5b2ff0bdcf..f329ba42d41e 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -23,16 +23,8 @@ #include "pattern.hxx" #include "frmui.hrc" - -/**************************************************************************** -Ctor -****************************************************************************/ - - - -SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) : - - SfxNoLayoutSingleTabDialog(pParent, rSet, 0) +SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) + : SfxSingleTabDialog(pParent, rSet) { SetText(SW_RESSTR(STR_FRMUI_PATTERN)); @@ -41,19 +33,9 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) : ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); if ( fnCreatePage ) { - SetTabPage((*fnCreatePage)( this, rSet )); + setTabPage((*fnCreatePage)(get_content_area(), rSet)); } } -/**************************************************************************** -Dtor -****************************************************************************/ - - - -SwBackgroundDlg::~SwBackgroundDlg() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/ui/inc/pattern.hxx index 66f9a5c00571..fc06b0be0151 100644 --- a/sw/source/ui/inc/pattern.hxx +++ b/sw/source/ui/inc/pattern.hxx @@ -21,15 +21,14 @@ #define _PATTERN_HXX #include + class Window; class SfxItemSet; -class SwBackgroundDlg : public SfxNoLayoutSingleTabDialog +class SwBackgroundDlg : public SfxSingleTabDialog { public: - - SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet); - ~SwBackgroundDlg(); + SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet); }; #endif -- cgit