Index: patches/src680/apply
===================================================================
--- patches/src680/apply	(revision 11459)
+++ patches/src680/apply	(working copy)
@@ -1562,7 +1562,8 @@
 
 writerfilter-source-dmapper-domainmapper-debug.diff
 
-writerfilter-source-resourcemodel-util_cxx.diff
+# util.cxx is gone
+#writerfilter-source-resourcemodel-util_cxx.diff
 
 [ OOXSTLport5 ]
 SectionOwner => hmth
Index: patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff
===================================================================
--- patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff	(revision 11459)
+++ patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff	(working copy)
@@ -2053,11 +2053,12 @@
 diff -u -r1.3.2.2 WW8Analyzer.cxx
 --- writerfilter/source/resourcemodel/WW8Analyzer.cxx	25 Jan 2008 09:15:54 -0000	1.3.2.2
 +++ writerfilter/source/resourcemodel/WW8Analyzer.cxx	30 Jan 2008 09:09:11 -0000
-@@ -33,6 +33,16 @@
+@@ -33,8 +33,17 @@
   *
   ************************************************************************/
  
-+#include <stdlib.h>
+ #include <stdlib.h>
+ #include <fstream>
 +
 +#ifdef GCC_VISIBILITY_BROKEN
 +#pragma GCC visibility push(default)
@@ -2092,30 +2093,6 @@
  
  namespace writerfilter
  {
-Index: writerfilter/source/resourcemodel/util.cxx
-===================================================================
-RCS file: /cvs/sw/writerfilter/source/resourcemodel/Attic/util.cxx,v
-retrieving revision 1.1.2.4
-diff -u -r1.1.2.4 util.cxx
---- writerfilter/source/resourcemodel/util.cxx	30 Jan 2008 08:55:01 -0000	1.1.2.4
-+++ writerfilter/source/resourcemodel/util.cxx	30 Jan 2008 09:09:11 -0000
-@@ -33,8 +33,16 @@
-  *
-  ************************************************************************/
- #include <stdlib.h>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <fstream>
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <com/sun/star/awt/Point.hpp>
- #include <com/sun/star/awt/Rectangle.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
 Index: writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx,v