CWS-TOOLING: integrate CWS libmsword

2008-12-18 12:33:19 +0100 kendy  r265681 : Export less symbols.
2008-12-17 19:26:56 +0100 kendy  r265655 : Move libmsword to the -writer package.
2008-12-15 17:46:16 +0100 kendy  r265516 : Enable exceptions for iodetect.cxx.
2008-12-15 15:17:53 +0100 kendy  r265504 : Deliver the msword.dll.
2008-12-09 19:38:17 +0100 kendy  r265138 : Remove accidentally added method.
2008-12-09 19:33:57 +0100 kendy  r265137 : Fix linking on Win32.
2008-12-09 18:37:16 +0100 kendy  r265135 : Move SwFltControlStack::Delete() to ww1/fltshell.cxx to fix linking.
2008-12-09 18:01:56 +0100 kendy  r265127 : Visibility fixes.
2008-12-09 15:51:52 +0100 kendy  r265109 : Fix ambiguous usage of class Color.
2008-12-09 14:54:27 +0100 kendy  r265091 : Add #include "precompiled_sw.hxx" to fix --enable-pch build.
2008-12-09 14:44:59 +0100 kendy  r265088 : Add #include "precompiled_sw.hxx" to fix --enable-pch build.
2008-12-08 19:14:49 +0100 kendy  r265015 : #i96313# Get rid of inc/iodetect.cxx, it's a really bad idea to share
code by #ifdefing parts of it, and #including a .cxx file ;-)
This change moves it to iodetect.cxx, which is compiled to a .o/.obj
that is used where needed.
2008-11-20 17:45:08 +0100 kendy  r264083 : #i96313# Make the destruction of Readers consistent.
2008-11-20 17:18:11 +0100 kendy  r264070 : #i96313# Added missing SW_DLLPUBLIC for (Import|Export)(DOC|RTF).
2008-11-18 19:21:07 +0100 kendy  r263797 : #i96313# Remove accidentally added file.
2008-11-18 17:14:31 +0100 kendy  r263790 : #i96313# Split doc and rtf filters into a separate library
From: Radek Doulik <rodo@novell.com>
fix SwFieldBookmark class visibility (suggested by kendy)
2008-11-18 17:14:01 +0100 kendy  r263789 : #i96313# Split doc and rtf filters into a separate library
From: Fridrich Strba <fstrba@novell.com>
add visibility markup to allow linking
2008-11-18 17:13:29 +0100 kendy  r263788 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
Visibility markup for libmsword.
This is the most trivial approach, every class that had a symbol that needed
to be visible was marked with SW_DLLPUBLIC; the correct (but more time
consuming) way would be to mark just the exact methods that were needed.
To be done later if generally shows that the separate libmsword makes sense;
and also now we have the upper limit of symbols that needed to be added, and
we can only make it better [decrease the number] ;-)
2008-11-18 17:12:58 +0100 kendy  r263787 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
Added the missing msword.map.
2008-11-18 17:12:25 +0100 kendy  r263786 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
scp2 change for libmsword.
2008-11-18 17:11:55 +0100 kendy  r263785 : #i96313# Split doc and rtf filters into a separate library
From: Jan Holesovsky <kendy@suse.cz>
Convert the binary .doc and .rtf filters into a separate library.
It is called 'libmsword' and loaded on demand when either of the formats
(.doc, .rtf) is loaded or saved.

2 files changed, 41 insertions, 1 deletions

diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 27c39e58b0..9020688366 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -160,7 +160,8 @@ SHL2STDLIBS= \
 
 SHL2OBJS=   $(SLO)$/swdetect.obj \
         $(SLO)$/swdet2.obj \
-        $(SLO)$/detreg.obj
+        $(SLO)$/detreg.obj \
+        $(SLO)$/iodetect.obj
 
 .IF "$(product)"==""
 SHL2OBJS+=  \
@@ -310,4 +311,33 @@ SHL3OBJS += $(SLO)$/pchname.obj \
 .ENDIF # "$(ENABLE_PCH)" != ""
 .ENDIF # "$(GUI)$(COM)" == "WNTMSC"
 
+SHL4TARGET=msword$(DLLPOSTFIX)
+SHL4VERSIONMAP=msword.map
+SHL4LIBS=$(SLB)$/rtf.lib $(SLB)$/ww8.lib
+SHL4DEPN=$(SHL1TARGETN)
+SHL4DEF=$(MISC)$/$(SHL4TARGET).def
+DEF4NAME=$(SHL4TARGET)
+
+SHL4STDLIBS= \
+    $(ISWLIB) \
+    $(SVXLIB) \
+    $(SFXLIB) \
+    $(GOODIESLIB) \
+    $(BASEGFXLIB) \
+    $(SVTOOLLIB) \
+    $(TKLIB) \
+    $(VCLLIB) \
+    $(SVLLIB)	\
+    $(SOTLIB) \
+    $(UNOTOOLSLIB) \
+    $(TOOLSLIB) \
+    $(I18NISOLANGLIB) \
+    $(COMPHELPERLIB) \
+    $(UCBHELPERLIB) \
+    $(CPPULIB) \
+    $(CPPUHELPERLIB) \
+    $(SALLIB) \
+    $(ICUUCLIB) \
+    $(I18NUTILLIB)
+
 .INCLUDE :  target.mk
diff --git a/sw/util/msword.map b/sw/util/msword.map
new file mode 100644
index 0000000000..53c3eaf213
--- /dev/null
+++ b/sw/util/msword.map
@@ -0,0 +1,10 @@
+MSWORD_1_0 {
+        global:
+                ImportRTF;
+                ExportRTF;
+                ImportDOC;
+                ExportDOC;
+
+        local:
+                *;
+};