From 7dc99ab5eb641809a6babd847a31434504e0ceac Mon Sep 17 00:00:00 2001
From: os <os@openoffice.org>
Date: Wed, 17 Nov 2010 07:36:16 +0100
Subject: #i115608# #i115583# msword library component registration added

---
 sw/util/msword.component | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 sw/util/msword.component

(limited to 'sw/util')

diff --git a/sw/util/msword.component b/sw/util/msword.component
new file mode 100644
index 000000000000..84ae7aaf965f
--- /dev/null
+++ b/sw/util/msword.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Writer.RtfExport">
+    <service name="com.sun.star.comp.Writer.RtfExport"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Writer.RtfImport">
+    <service name="com.sun.star.comp.Writer.RtfImport"/>
+  </implementation>
+</component>
-- 
cgit 


From 98170a58add19fa056e37ad5f033605f840c1747 Mon Sep 17 00:00:00 2001
From: os <os@openoffice.org>
Date: Wed, 17 Nov 2010 14:34:12 +0100
Subject: msword.component added

---
 sw/util/makefile.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'sw/util')

diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 6fa4bd5432e2..5d474b4325a3 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -375,7 +375,7 @@ SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
 
 .INCLUDE :  target.mk
 
-ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component
+ALLTAR : $(MISC)/sw.component $(MISC)/swd.component $(MISC)/vbaswobj.component $(MISC)/msword.component
 
 $(MISC)/sw.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
         sw.component
@@ -394,3 +394,9 @@ $(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
     $(XSLTPROC) --nonet --stringparam uri \
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt vbaswobj.component
+
+$(MISC)/msword.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        msword.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt msword.component
-- 
cgit 


From c6f4c90e0228a389aa08a3f7c39c965e8ae0fc0f Mon Sep 17 00:00:00 2001
From: os <os@openoffice.org>
Date: Thu, 18 Nov 2010 08:26:12 +0100
Subject: #i115608# msword component registration

---
 sw/util/makefile.mk | 2 +-
 sw/util/msword.map  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'sw/util')

diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 5d474b4325a3..98c616b7036d 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -398,5 +398,5 @@ $(MISC)/vbaswobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
 $(MISC)/msword.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
         msword.component
     $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt msword.component
diff --git a/sw/util/msword.map b/sw/util/msword.map
index d2a9d9b4f7e1..6a4f01ffa7f7 100644
--- a/sw/util/msword.map
+++ b/sw/util/msword.map
@@ -7,7 +7,6 @@ UDK_3_0_0 {
                                 SaveOrDelMSVBAStorage_ww8;
                                 GetSaveWarningOfMSVBAStorage_ww8;
                 component_getImplementationEnvironment;
-                component_writeInfo;
                 component_getFactory;
         local:
                 *;
-- 
cgit