tweak to be a pImpl rather than a full window

3 files changed, 18 insertions, 31 deletions

diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 2ff37eda90b9..ed34930b7677 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -55,37 +55,31 @@
 #endif /* ENABLE_LAYOUT */
 
 SwWordCountDialog::SwWordCountDialog(Window* pParent) :
-    Window(pParent, SW_RES(WINDOW_DLG)),
 #if defined _MSC_VER
 #pragma warning (disable : 4355)
 #endif
-    aCurrentFL( this, SW_RES(              FL_CURRENT            )),
-    aCurrentWordFT( this, SW_RES(          FT_CURRENTWORD        )),
-    aCurrentWordFI( this, SW_RES(          FI_CURRENTWORD        )),
-    aCurrentCharacterFT( this, SW_RES(     FT_CURRENTCHARACTER   )),
-    aCurrentCharacterFI( this, SW_RES(     FI_CURRENTCHARACTER   )),
-    aCurrentCharacterExcludingSpacesFT( this, SW_RES(     FT_CURRENTCHARACTEREXCLUDINGSPACES   )),
-    aCurrentCharacterExcludingSpacesFI( this, SW_RES(     FI_CURRENTCHARACTEREXCLUDINGSPACES   )),
+    aCurrentFL( pParent, SW_RES(              FL_CURRENT            )),
+    aCurrentWordFT( pParent, SW_RES(          FT_CURRENTWORD        )),
+    aCurrentWordFI( pParent, SW_RES(          FI_CURRENTWORD        )),
+    aCurrentCharacterFT( pParent, SW_RES(     FT_CURRENTCHARACTER   )),
+    aCurrentCharacterFI( pParent, SW_RES(     FI_CURRENTCHARACTER   )),
+    aCurrentCharacterExcludingSpacesFT( pParent, SW_RES(     FT_CURRENTCHARACTEREXCLUDINGSPACES   )),
+    aCurrentCharacterExcludingSpacesFI( pParent, SW_RES(     FI_CURRENTCHARACTEREXCLUDINGSPACES   )),
 
-    aDocFL( this, SW_RES(                  FL_DOC                )),
-    aDocWordFT( this, SW_RES(              FT_DOCWORD            )),
-    aDocWordFI( this, SW_RES(              FI_DOCWORD            )),
-    aDocCharacterFT( this, SW_RES(         FT_DOCCHARACTER       )),
-    aDocCharacterFI( this, SW_RES(         FI_DOCCHARACTER       )),
-    aDocCharacterExcludingSpacesFT( this, SW_RES(         FT_DOCCHARACTEREXCLUDINGSPACES       )),
-    aDocCharacterExcludingSpacesFI( this, SW_RES(         FI_DOCCHARACTEREXCLUDINGSPACES       )),
-    aBottomFL(this, SW_RES(                FL_BOTTOM             )),
-    aOK( this, SW_RES(                     PB_OK                 )),
-    aHelp( this, SW_RES(                   PB_HELP               ))
+    aDocFL( pParent, SW_RES(                  FL_DOC                )),
+    aDocWordFT( pParent, SW_RES(              FT_DOCWORD            )),
+    aDocWordFI( pParent, SW_RES(              FI_DOCWORD            )),
+    aDocCharacterFT( pParent, SW_RES(         FT_DOCCHARACTER       )),
+    aDocCharacterFI( pParent, SW_RES(         FI_DOCCHARACTER       )),
+    aDocCharacterExcludingSpacesFT( pParent, SW_RES(         FT_DOCCHARACTEREXCLUDINGSPACES       )),
+    aDocCharacterExcludingSpacesFI( pParent, SW_RES(         FI_DOCCHARACTEREXCLUDINGSPACES       )),
+    aBottomFL(pParent, SW_RES(                FL_BOTTOM             )),
+    aOK( pParent, SW_RES(                     PB_OK                 )),
+    aHelp( pParent, SW_RES(                   PB_HELP               ))
 #if defined _MSC_VER
 #pragma warning (default : 4355)
 #endif
 {
-#if ENABLE_LAYOUT
-    SetHelpId (HID_DLG_WORDCOUNT);
-#endif /* ENABLE_LAYOUT */
-    FreeResource();
-
     aOK.SetClickHdl(LINK(this,SwWordCountDialog,        OkHdl));
 }
 
@@ -129,7 +123,6 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings,
 void SwWordCountFloatDlg::Activate()
 {
     SfxModelessDialog::Activate();
-    aDlg.Activate();
 }
 
 void SwWordCountFloatDlg::UpdateCounts()
diff --git a/sw/source/ui/dialog/wordcountdialog.src b/sw/source/ui/dialog/wordcountdialog.src
index a324c45d4d2b..7d953713f324 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -40,11 +40,6 @@ ModelessDialog DLG_WORDCOUNT
     Sizeable = FALSE ;
     Hide = TRUE ;
 
-  Window WINDOW_DLG
-  {
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( 170 , 132 ) ;
-
     FixedLine  FL_CURRENT
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -145,5 +140,4 @@ ModelessDialog DLG_WORDCOUNT
         Pos = MAP_APPFONT ( 114 , 112 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-  };
 };
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index d4c996cba40e..14b8be8e8255 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -38,7 +38,7 @@ struct SwDocStat;
 
 class SwWrtShell;
 
-class SwWordCountDialog : public Window
+class SwWordCountDialog
 {
     FixedLine       aCurrentFL;
     FixedText       aCurrentWordFT;