[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/svg-import-filter.diff |   30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 4ee330b27f757a11e929d647f0c0cc2c08dbd276
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 15:49:40 2009 +0300

    Adapt svg-import-filter.diff to dev300-m57

diff --git a/patches/dev300/svg-import-filter.diff b/patches/dev300/svg-import-filter.diff
index 701045e..98625d4 100644
--- a/patches/dev300/svg-import-filter.diff
+++ b/patches/dev300/svg-import-filter.diff
@@ -718,8 +718,6 @@ index 0000000..09a6660
 +} // namespace svgi
 +
 +#endif
-diff --git filter/source/svg/makefile.mk filter/source/svg/makefile.mk
-index 5d8e187..29c065e 100644
 --- filter/source/svg/makefile.mk
 +++ filter/source/svg/makefile.mk
 @@ -30,25 +30,35 @@
@@ -769,23 +767,23 @@ index 5d8e187..29c065e 100644
  SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
  
  SHL1STDLIBS=\
-+	$(BASEGFXLIB)		\
- 	$(SVXLIB)			\
- 	$(XMLOFFLIB)		\
--	$(GOODIESLIB)		\
-+	$(SVTOOLLIB)	    \
-+	$(BASEGFXLIB)		\
- 	$(VCLLIB)			\
- 	$(UNOTOOLSLIB)		\
- 	$(TOOLSLIB)			\
- 	$(COMPHELPERLIB)	\
- 	$(CPPUHELPERLIB)	\
- 	$(CPPULIB)			\
--	$(SALLIB) 
++    $(BASEGFXLIB)		\
+     $(SVXCORELIB)			\
+     $(XMLOFFLIB)		\
+-    $(GOODIESLIB)		\
++    $(SVTOOLLIB)	    \
++    $(BASEGFXLIB)		\
+     $(VCLLIB)			\
+     $(UNOTOOLSLIB)		\
+     $(TOOLSLIB)			\
+     $(COMPHELPERLIB)	\
+     $(CPPUHELPERLIB)	\
+     $(CPPULIB)			\
+-    $(SALLIB) 
 -
 -.IF "$(SOLAR_JAVA)"!=""
 -SHL1STDLIBS+=\
--	$(JVMACCESSLIB)
+-    $(JVMACCESSLIB)
 -.ENDIF
 -
 +	$(SALLIB)			\