From 8e4d51f4af6732b41eb13c425158ef51dbd52389 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Fri, 19 Sep 2003 07:43:03 +0000
Subject: INTEGRATION: CWS fwkq1 (1.19.44); FILE MERGED 2003/08/13 08:37:43 mba
 1.19.44.2: #110843#: get rid of factories 2003/07/15 06:35:55 mba 1.19.44.1:
 #110843#: get rid of factories

---
 sw/inc/swmodule.hxx | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'sw/inc/swmodule.hxx')

diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 1e8136816728..947e4a9c1fdd 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swmodule.hxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: vg $ $Date: 2003-05-22 08:40:59 $
+ *  last change: $Author: rt $ $Date: 2003-09-19 08:43:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 #include <svtools/lstner.hxx>
 #endif
 #ifndef SW_SWDLL_HXX
-#include <swdll.hxx>
+//#include <swdll.hxx>
 #endif
 #include "shellid.hxx"
 #ifndef _STRING_HXX
@@ -120,7 +120,7 @@ namespace com{ namespace sun{ namespace star{ namespace scanner{
     class XScannerManager;
 }}}}
 
-class SwModule: public SwModuleDummy , public SfxListener
+class SwModule: public SfxModule, public SfxListener
 {
     String              sActAuthor;
 
@@ -181,16 +181,12 @@ public:
     SFX_DECL_INTERFACE(SW_INTERFACE_MODULE);
 
     // dieser Ctor nur fuer SW-Dll
-    SwModule( SvFactory* pFact,
-                SvFactory* pWebFact,
-                    SvFactory* pGlobalFact );
-    // dieser Ctor nur fuer Web-Dll
-    SwModule( SvFactory* pWebFact );
+    SwModule( SfxObjectFactory* pFact,
+                SfxObjectFactory* pWebFact,
+                    SfxObjectFactory* pGlobalFact );
 
     ~SwModule();
 
-    virtual SfxModule* Load();
-
     // View setzen nur fuer internen Gebrauch,
     // aus techn. Gruenden public
     //
-- 
cgit