summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/swabstdlg.hxx12
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx17
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx12
3 files changed, 35 insertions, 6 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c5cbab22a5de..06d893670ab3 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swabstdlg.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: hr $ $Date: 2004-05-12 15:09:22 $
+ * last change: $Author: os $ $Date: 2004-05-13 12:31:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -132,6 +132,7 @@ class SwTableFUNC;
class SwChildWinWrapper;
struct SfxChildWinInfo;
class SwTOXMark;
+struct SwDocStat;
#include <cnttab.hxx> //add for struct CurTOXType
@@ -252,6 +253,12 @@ public:
virtual void SetSection(const SwSection& rSect) = 0;
};
+class AbstractSwWordCountDialog : public VclAbstractDialog
+{
+public:
+ void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc);
+};
+
class AbstractSwInsertAbstractDlg : public VclAbstractDialog //CHINA001 add for SwInsertAbstractDlg
{
public:
@@ -371,6 +378,7 @@ public:
static SwAbstractDialogFactory* Create();
//CHINA001 virtual AbstractSwSaveLabelDlg* CreateSwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec, const ResId& rResId ) = 0;
+ virtual AbstractSwWordCountDialog* CreateSwWordCountDialog( Window* pWindow ) = 0;
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg ( Window* pParent, const ResId& rResId ) = 0; //CHINA001 add for SwInsertAbstractDlg
virtual AbstractSfxSingleTabDialog* CreateSfxSingleTabDialog ( Window* pParent, SfxItemSet& rSet,const ResId& rResId ) = 0; //CHINA001 add for SwAddrDlg SwDropCapsDlg, SwBackgroundDlg,SwNumFmtDlg,
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 9302b0fac90d..0bd26d758c37 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swdlgfact.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: hr $ $Date: 2004-05-12 15:10:18 $
+ * last change: $Author: os $ $Date: 2004-05-13 12:30:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,6 +81,7 @@
#include <regionsw.hrc> //CHINA001
#include <fmtui.hrc> //CHINA001
+#include <wordcountdialog.hxx>
#include "abstract.hxx" // add for SwInsertAbstractDlg
#include "addrdlg.hxx" // add for SwAddrDlg
#include "ascfldlg.hxx" // add for SwAsciiFilterDlg
@@ -138,6 +139,7 @@
#include <optpage.hxx> //add for OptPage
#include <swuiidxmrk.hxx> //add for SwIndexMarkDlg, SwAuthMarkDlg, SwIndexMarkModalDlg, SwAuthMarkModalDlg
+IMPL_ABSTDLG_BASE(AbstractSwWordCountDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl);//CHINA001 add for SwInsertAbstractDlg
IMPL_ABSTDLG_BASE(AbstractSfxSingleTabDialog_Impl); //CHINA001 add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwBorderDlg SwWrapDlg, SwFldEditDlg
IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl); //CHINA001 add for SwAsciiFilterDlg
@@ -201,6 +203,11 @@ String AbstractTabDialog_Impl::GetText() const
//add for AbstractTabDialog_Impl end
+void AbstractSwWordCountDialog_Impl::SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc)
+{
+ pDlg->SetValues(rCurrent, rDoc);
+}
+
//add for SwInsertAbstractDlg begin
BYTE AbstractSwInsertAbstractDlg_Impl::GetLevel() const
{
@@ -617,6 +624,12 @@ Window* AbstractAuthMarkFloatDlg_Impl::GetWindow()
//-------------- SwAbstractDialogFactory implementation--------------
+AbstractSwWordCountDialog* CreateSwWordCountDialog(Window* pParent)
+{
+ SwWordCountDialog* pDlg = new SwWordCountDialog( pParent );
+ return new AbstractSwWordCountDialog_Impl( pDlg );
+}
+
//add for SwInsertAbstractDlg begin
AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg( Window* pParent,
const ResId& rResId )
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 99753660c02e..503c6d119c34 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swdlgfact.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: hr $ $Date: 2004-05-12 15:10:05 $
+ * last change: $Author: os $ $Date: 2004-05-13 12:29:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,6 +81,7 @@ class SwFldDlg;
class SwRenameXNamedDlg;
class SwModalRedlineAcceptDlg;
class SwTOXMark;
+class SwWordCountDialog;
#include "itabenum.hxx"
@@ -117,6 +118,12 @@ USHORT Class::Execute() \
//CHINA001 virtual sal_Bool GetLabel(SwLabItem& rItem);
//CHINA001 }
+class AbstractSwWordCountDialog_Impl : public AbstractSwWordCountDialog
+{
+ DECL_ABSTDLG_BASE(AbstractSwWordCountDialog_Impl,SwWordCountDialog);
+ void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc);
+};
+
//add for SwInsertAbstractDlg begin
class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
{
@@ -446,6 +453,7 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory
public:
//CHINA001 AbstractSwSaveLabelDlg* CreateSwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec, const ResId& rResId );
+ virtual AbstractSwWordCountDialog* CreateSwWordCountDialog(Window* pParent);
virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg( Window* pParent,const ResId& rResId ); //CHINA001 add for SwInsertAbstractDlg
virtual AbstractSfxSingleTabDialog* CreateSfxSingleTabDialog ( Window* pParent, SfxItemSet& rSet,const ResId& rResId );//CHINA001 add for SwAddrDlg SwDropCapsDlg, SwBackgroundDlg,SwNumFmtDlg,
virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,