[ooo-build-commit] .: patches/dev300

[Jan Holesovsky]

 patches/dev300/wpgimporter.diff             |   31 +++++-----------------------
 patches/dev300/wpsimport-writerperfect.diff |   25 ++--------------------
 2 files changed, 9 insertions(+), 47 deletions(-)

New commits:
commit b2ebe06a7bc1814f52d9467331ab6616e512b4aa
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri May 21 10:15:15 2010 +0200

    Fix the build of writerperfect.
    
    * patches/dev300/wpgimporter.diff:
    * patches/dev300/wpsimport-writerperfect.diff:

diff --git a/patches/dev300/wpgimporter.diff b/patches/dev300/wpgimporter.diff
index 1e72808..0b87790 100644
--- a/patches/dev300/wpgimporter.diff
+++ b/patches/dev300/wpgimporter.diff
@@ -20,7 +20,6 @@ Subject: [PATCH 052/768] wpgimporter.diff
  writerperfect/source/wpgimp/makefile.mk            |   35 ++
  .../source/wpgimp/wpgimport_genericfilter.cxx      |  101 ++++
  writerperfect/util/makefile.mk                     |   35 ++
- writerperfect/util/wpgimport.map                   |    8 +
  17 files changed, 1287 insertions(+), 6 deletions(-)
  create mode 100644 filter/source/config/fragments/filters/WordPerfectGraphics.xcu
  create mode 100644 filter/source/config/fragments/types/draw_WordPerfect_Graphics.xcu
@@ -30,7 +29,6 @@ Subject: [PATCH 052/768] wpgimporter.diff
  create mode 100644 writerperfect/source/wpgimp/WPGImportFilter.hxx
  create mode 100644 writerperfect/source/wpgimp/makefile.mk
  create mode 100644 writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
- create mode 100644 writerperfect/util/wpgimport.map
 
 diff --git configure.in configure.in
 index e65a3db..976206c 100644
@@ -174,8 +172,8 @@ index df9d2dd..e6ddce0 100644
 --- writerperfect/prj/build.lst
 +++ writerperfect/prj/build.lst
 @@ -1,7 +1,8 @@
--wp      writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff NULL
-+wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff NULL
+-wp      writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL
++wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL
  wp	writerperfect			usr1	-	all	wp_mkout NULL
  wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
  wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
@@ -1439,8 +1437,8 @@ index 7b5ef01..6cb13cf 100644
  .ENDIF
  
 @@ -79,4 +86,32 @@ SHL2LIBS = $(LIB2TARGET)
- SHL2VERSIONMAP=msworks.map
- DEF2NAME=$(SHL2TARGET)
+ SHL2VERSIONMAP = $(SOLARENV)/src/component.map
+ DEF2NAME = $(SHL2TARGET)
  
 +LIB3TARGET= $(SLB)$/wpgimport.lib
 +LIB3FILES= \
@@ -1467,24 +1465,7 @@ index 7b5ef01..6cb13cf 100644
 +SHL3TARGET = wpgimport$(DLLPOSTFIX)
 +SHL3IMPLIB = i$(SHL3TARGET)
 +SHL3LIBS = $(LIB3TARGET)
-+SHL3VERSIONMAP=wpgimport.map
-+DEF3NAME=$(SHL3TARGET)
++SHL3VERSIONMAP = $(SOLARENV)/src/component.map
++DEF3NAME = $(SHL3TARGET)
 +
  .INCLUDE :  target.mk
-diff --git writerperfect/util/wpgimport.map writerperfect/util/wpgimport.map
-new file mode 100644
-index 0000000..7152f7e
---- /dev/null
-+++ writerperfect/util/wpgimport.map
-@@ -0,0 +1,8 @@
-+WPFT_1_0 {
-+    global:
-+        component_getImplementationEnvironment;
-+        component_writeInfo;
-+        component_getFactory;
-+    local:
-+        *;
-+};
--- 
-1.7.0.1
-
diff --git a/patches/dev300/wpsimport-writerperfect.diff b/patches/dev300/wpsimport-writerperfect.diff
index 09f378c..c4bface 100644
--- a/patches/dev300/wpsimport-writerperfect.diff
+++ b/patches/dev300/wpsimport-writerperfect.diff
@@ -24,7 +24,6 @@ Subject: [PATCH 048/768] wpsimport-writerperfect.diff
  writerperfect/source/wpsimp/makefile.mk            |   29 ++
  .../source/wpsimp/msworks_genericfilter.cxx        |  101 +++++++
  writerperfect/util/makefile.mk                     |   47 +++-
- writerperfect/util/msworks.map                     |    8 +
  21 files changed, 747 insertions(+), 33 deletions(-)
  create mode 100644 writerperfect/source/wpsimp/MSWorksCollector.cxx
  create mode 100644 writerperfect/source/wpsimp/MSWorksCollector.hxx
@@ -32,7 +31,6 @@ Subject: [PATCH 048/768] wpsimport-writerperfect.diff
  create mode 100644 writerperfect/source/wpsimp/MSWorksImportFilter.hxx
  create mode 100644 writerperfect/source/wpsimp/makefile.mk
  create mode 100644 writerperfect/source/wpsimp/msworks_genericfilter.cxx
- create mode 100644 writerperfect/util/msworks.map
 
 diff --git writerperfect/prj/build.lst writerperfect/prj/build.lst
 index 3bb3867..df9d2dd 100644
@@ -40,7 +38,7 @@ index 3bb3867..df9d2dd 100644
 +++ writerperfect/prj/build.lst
 @@ -1,6 +1,7 @@
 -wp      writerperfect : LIBWPD:libwpd sot comphelper xmloff NULL
-+wp      writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff NULL
++wp      writerperfect : LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL
  wp	writerperfect			usr1	-	all	wp_mkout NULL
  wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
  wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
@@ -1061,24 +1059,7 @@ index dca29e0..7b5ef01 100644
 +SHL2TARGET = msworks$(DLLPOSTFIX)
 +SHL2IMPLIB = i$(SHL2TARGET)
 +SHL2LIBS = $(LIB2TARGET)
-+SHL2VERSIONMAP=msworks.map
-+DEF2NAME=$(SHL2TARGET)
++SHL2VERSIONMAP = $(SOLARENV)/src/component.map
++DEF2NAME = $(SHL2TARGET)
 +
  .INCLUDE :  target.mk
-diff --git writerperfect/util/msworks.map writerperfect/util/msworks.map
-new file mode 100644
-index 0000000..7152f7e
---- /dev/null
-+++ writerperfect/util/msworks.map
-@@ -0,0 +1,8 @@
-+WPFT_1_0 {
-+    global:
-+        component_getImplementationEnvironment;
-+        component_writeInfo;
-+        component_getFactory;
-+    local:
-+        *;
-+};
--- 
-1.7.0.1
-