4 files changed, 8 insertions, 21 deletions
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index 679fc121be72..f771bb7a5dc2 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -106,10 +106,6 @@ String STR_FRMUI_PATTERN
 {
     Text [ en-US ] = "Background" ;
 };
-String STR_FRMUI_WRAP
-{
-    Text [ en-US ] = "Wrap" ;
-};
 InfoBox MSG_COLUMN_ERR_BOUNDWIDTH
 {
     BUTTONS = WB_OK ;
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 9194bb582ccb..a48715008a83 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -51,23 +51,16 @@ static sal_uInt16 aWrapPageRg[] = {
     0
 };
 
-SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode) :
-    SfxNoLayoutSingleTabDialog(pParent, rSet, 0),
-    pWrtShell(pSh)
+SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode)
+    : SfxSingleTabDialog(pParent, rSet, "WrapDialog", "modules/swriter/ui/wrapdialog.ui")
+    , pWrtShell(pSh)
 
 {
     // create TabPage
-    SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(this, rSet);
+    SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), rSet);
     pNewPage->SetFormatUsed(sal_False, bDrawMode);
     pNewPage->SetShell(pWrtShell);
-    SetTabPage(pNewPage);
-
-    String sTitle(SW_RES(STR_FRMUI_WRAP));
-    SetText(sTitle);
-}
-
-SwWrapDlg::~SwWrapDlg()
-{
+    setTabPage(pNewPage);
 }
 
 SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet)
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc
index cc03279e8eca..c893ac3b3923 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/ui/inc/frmui.hrc
@@ -30,7 +30,6 @@
 
 #define STR_FRMUI_BORDER        (RC_FRMDLG_BEGIN + 16)
 #define STR_FRMUI_PATTERN       (RC_FRMDLG_BEGIN + 17)
-#define STR_FRMUI_WRAP          (RC_FRMDLG_BEGIN + 18)
 
 #define BMP_BEGIN               (RC_FRMDLG_BEGIN + 18)
 #define BMP_NOWRAP              (BMP_BEGIN+5)
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx
index 7190ab9acc77..96223fbe7a4d 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/ui/inc/wrap.hxx
@@ -29,15 +29,14 @@ class Window;
 class SfxItemSet;
 class SwWrtShell;
 
-class SwWrapDlg : public SfxNoLayoutSingleTabDialog
+class SwWrapDlg : public SfxSingleTabDialog
 {
     SwWrtShell*         pWrtShell;
 
 public:
-     SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode);
-    ~SwWrapDlg();
+    SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode);
 
-    inline SwWrtShell*  GetWrtShell()   { return pWrtShell; }
+    SwWrtShell*  GetWrtShell()   { return pWrtShell; }
 };