GNOME.org
 

ooo-build r11454 - in trunk: . patches/ooxml patches/src680

Author: strba
Date: Wed Jan 30 09:56:18 2008
New Revision: 11454
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11454&view=rev

Log:
miscellaneous fixes for writerfilter module

Added:
   trunk/patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff
   trunk/patches/ooxml/writerfilter-source-resourcemodel-util_cxx.diff
Modified:
   trunk/ChangeLog
   trunk/patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff
   trunk/patches/src680/apply

Modified: trunk/patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff
==============================================================================
--- trunk/patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff	(original)
+++ trunk/patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff	Wed Jan 30 09:56:18 2008
@@ -1,10 +1,11 @@
+? writerfilter/unxlngx6.pro
 Index: writerfilter/inc/dmapper/DomainMapper.hxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/inc/dmapper/DomainMapper.hxx,v
 retrieving revision 1.20.2.1
 diff -u -r1.20.2.1 DomainMapper.hxx
 --- writerfilter/inc/dmapper/DomainMapper.hxx	28 Jan 2008 14:46:36 -0000	1.20.2.1
-+++ writerfilter/inc/dmapper/DomainMapper.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/dmapper/DomainMapper.hxx	30 Jan 2008 09:09:08 -0000
 @@ -43,7 +43,13 @@
  #include <com/sun/star/text/FontEmphasis.hpp>
  #include <com/sun/star/style/TabAlign.hpp>
@@ -25,7 +26,7 @@
 retrieving revision 1.7
 diff -u -r1.7 WW8Document.hxx
 --- writerfilter/inc/doctok/WW8Document.hxx	10 Jan 2008 11:31:36 -0000	1.7
-+++ writerfilter/inc/doctok/WW8Document.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/doctok/WW8Document.hxx	30 Jan 2008 09:09:08 -0000
 @@ -36,7 +36,14 @@
  #ifndef INCLUDED_WW8_DOCUMENT_HXX
  #define INCLUDED_WW8_DOCUMENT_HXX
@@ -47,7 +48,7 @@
 retrieving revision 1.2
 diff -u -r1.2 OutputWithDepth.hxx
 --- writerfilter/inc/resourcemodel/OutputWithDepth.hxx	10 Jan 2008 11:32:44 -0000	1.2
-+++ writerfilter/inc/resourcemodel/OutputWithDepth.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/resourcemodel/OutputWithDepth.hxx	30 Jan 2008 09:09:08 -0000
 @@ -36,8 +36,14 @@
  #ifndef INCLUDED_OUTPUT_WITH_DEPTH
  #define INCLUDED_OUTPUT_WITH_DEPTH
@@ -69,7 +70,7 @@
 retrieving revision 1.4
 diff -u -r1.4 QNameToString.hxx
 --- writerfilter/inc/resourcemodel/QNameToString.hxx	10 Jan 2008 11:32:56 -0000	1.4
-+++ writerfilter/inc/resourcemodel/QNameToString.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/resourcemodel/QNameToString.hxx	30 Jan 2008 09:09:08 -0000
 @@ -35,10 +35,17 @@
  #ifndef INCLUDED_QNAME_TO_STRING_HXX
  #define INCLUDED_QNAME_TO_STRING_HXX
@@ -94,7 +95,7 @@
 retrieving revision 1.2.2.1
 diff -u -r1.2.2.1 SubSequence.hxx
 --- writerfilter/inc/resourcemodel/SubSequence.hxx	25 Jan 2008 09:04:05 -0000	1.2.2.1
-+++ writerfilter/inc/resourcemodel/SubSequence.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/resourcemodel/SubSequence.hxx	30 Jan 2008 09:09:08 -0000
 @@ -40,8 +40,15 @@
  #include <com/sun/star/uno/Sequence.hxx>
  #endif
@@ -117,7 +118,7 @@
 retrieving revision 1.2
 diff -u -r1.2 WW8ResourceModel.hxx
 --- writerfilter/inc/resourcemodel/WW8ResourceModel.hxx	10 Jan 2008 11:33:32 -0000	1.2
-+++ writerfilter/inc/resourcemodel/WW8ResourceModel.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/resourcemodel/WW8ResourceModel.hxx	30 Jan 2008 09:09:09 -0000
 @@ -36,9 +36,15 @@
  #ifndef INCLUDED_WW8_EVENT_HANDLER_HXX
  #define INCLUDED_WW8_EVENT_HANDLER_HXX
@@ -141,7 +142,7 @@
 retrieving revision 1.2
 diff -u -r1.2 exceptions.hxx
 --- writerfilter/inc/resourcemodel/exceptions.hxx	10 Jan 2008 11:33:42 -0000	1.2
-+++ writerfilter/inc/resourcemodel/exceptions.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/resourcemodel/exceptions.hxx	30 Jan 2008 09:09:09 -0000
 @@ -36,7 +36,14 @@
  #ifndef _DOCTOK_EXCEPTIONS_HXX
  #define _DOCTOK_EXCEPTIONS_HXX
@@ -163,7 +164,7 @@
 retrieving revision 1.1
 diff -u -r1.1 RTFScanner.hxx
 --- writerfilter/inc/rtftok/RTFScanner.hxx	24 Oct 2006 09:27:12 -0000	1.1
-+++ writerfilter/inc/rtftok/RTFScanner.hxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/inc/rtftok/RTFScanner.hxx	30 Jan 2008 09:09:09 -0000
 @@ -6,7 +6,15 @@
  #define INCLUDED_RTFSCANNER_HXX
  
@@ -186,7 +187,7 @@
 retrieving revision 1.1
 diff -u -r1.1 ExternalViewLogger.cxx
 --- writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx	24 Oct 2006 09:36:56 -0000	1.1
-+++ writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx	30 Jan 2008 09:09:09 -0000
 @@ -1,7 +1,15 @@
  /*  Copyright 2005 Sun Microsystems, Inc. */
  
@@ -209,7 +210,7 @@
 retrieving revision 1.1
 diff -u -r1.1 FileLoggerImpl.cxx
 --- writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx	24 Oct 2006 09:36:57 -0000	1.1
-+++ writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx	29 Jan 2008 14:23:19 -0000
++++ writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx	30 Jan 2008 09:09:09 -0000
 @@ -1,7 +1,14 @@
  /*  Copyright 2005 Sun Microsystems, Inc. */
  
@@ -231,7 +232,7 @@
 retrieving revision 1.1
 diff -u -r1.1 testQName.cxx
 --- writerfilter/qa/cppunittests/qname/testQName.cxx	24 Oct 2006 09:37:55 -0000	1.1
-+++ writerfilter/qa/cppunittests/qname/testQName.cxx	29 Jan 2008 14:23:20 -0000
++++ writerfilter/qa/cppunittests/qname/testQName.cxx	30 Jan 2008 09:09:10 -0000
 @@ -6,9 +6,15 @@
  #include <rtl/string.hxx>
  #include <rtl/random.h>
@@ -255,7 +256,7 @@
 retrieving revision 1.22.2.7
 diff -u -r1.22.2.7 DomainMapper_Impl.cxx
 --- writerfilter/source/dmapper/DomainMapper_Impl.cxx	28 Jan 2008 14:45:10 -0000	1.22.2.7
-+++ writerfilter/source/dmapper/DomainMapper_Impl.cxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx	30 Jan 2008 09:09:10 -0000
 @@ -74,8 +74,13 @@
  #include <rtl/string.h>
  #include <resourcemodel/QNameToString.hxx>
@@ -274,10 +275,10 @@
 Index: writerfilter/source/dmapper/DomainMapper_Impl.hxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.hxx,v
-retrieving revision 1.21.2.2
-diff -u -r1.21.2.2 DomainMapper_Impl.hxx
---- writerfilter/source/dmapper/DomainMapper_Impl.hxx	28 Jan 2008 14:45:10 -0000	1.21.2.2
-+++ writerfilter/source/dmapper/DomainMapper_Impl.hxx	29 Jan 2008 14:23:21 -0000
+retrieving revision 1.21.2.3
+diff -u -r1.21.2.3 DomainMapper_Impl.hxx
+--- writerfilter/source/dmapper/DomainMapper_Impl.hxx	29 Jan 2008 15:27:07 -0000	1.21.2.3
++++ writerfilter/source/dmapper/DomainMapper_Impl.hxx	30 Jan 2008 09:09:10 -0000
 @@ -44,8 +44,15 @@
  #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
  #include <com/sun/star/container/XNameContainer.hpp>
@@ -307,15 +308,15 @@
 +#pragma GCC visibility pop
 +#endif
  
- namespace com{ namespace sun{ namespace star{
-         namespace lang{
+ #include <string.h>
+ 
 Index: writerfilter/source/dmapper/PropertyIds.cxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/source/dmapper/PropertyIds.cxx,v
 retrieving revision 1.27.2.2
 diff -u -r1.27.2.2 PropertyIds.cxx
 --- writerfilter/source/dmapper/PropertyIds.cxx	24 Jan 2008 14:47:39 -0000	1.27.2.2
-+++ writerfilter/source/dmapper/PropertyIds.cxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/dmapper/PropertyIds.cxx	30 Jan 2008 09:09:10 -0000
 @@ -36,7 +36,14 @@
  #include <PropertyIds.hxx>
  #endif
@@ -337,7 +338,7 @@
 retrieving revision 1.14.2.1
 diff -u -r1.14.2.1 PropertyMap.hxx
 --- writerfilter/source/dmapper/PropertyMap.hxx	22 Jan 2008 11:38:17 -0000	1.14.2.1
-+++ writerfilter/source/dmapper/PropertyMap.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/dmapper/PropertyMap.hxx	30 Jan 2008 09:09:10 -0000
 @@ -53,9 +53,17 @@
  #ifndef INCLUDED_DMAPPER_PROPERTYIDS_HXX
  #include <PropertyIds.hxx>
@@ -362,7 +363,7 @@
 retrieving revision 1.30.2.2
 diff -u -r1.30.2.2 StyleSheetTable.cxx
 --- writerfilter/source/dmapper/StyleSheetTable.cxx	24 Jan 2008 14:47:39 -0000	1.30.2.2
-+++ writerfilter/source/dmapper/StyleSheetTable.cxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/dmapper/StyleSheetTable.cxx	30 Jan 2008 09:09:11 -0000
 @@ -38,7 +38,15 @@
  #include <BorderHandler.hxx>
  #include <doctok/resourceids.hxx>
@@ -401,7 +402,7 @@
 retrieving revision 1.2
 diff -u -r1.2 ThemeTable.hxx
 --- writerfilter/source/dmapper/ThemeTable.hxx	10 Jan 2008 11:42:40 -0000	1.2
-+++ writerfilter/source/dmapper/ThemeTable.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/dmapper/ThemeTable.hxx	30 Jan 2008 09:09:11 -0000
 @@ -41,7 +41,14 @@
  #endif
  #include <resourcemodel/WW8ResourceModel.hxx>
@@ -423,7 +424,7 @@
 retrieving revision 1.7
 diff -u -r1.7 Dff.hxx
 --- writerfilter/source/doctok/Dff.hxx	10 Jan 2008 11:43:20 -0000	1.7
-+++ writerfilter/source/doctok/Dff.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/Dff.hxx	30 Jan 2008 09:09:11 -0000
 @@ -46,7 +46,14 @@
  #ifndef INCLUDED_DFF_HXX
  #define INCLUDED_DFF_HXX
@@ -445,7 +446,7 @@
 retrieving revision 1.4
 diff -u -r1.4 PLCF.hxx
 --- writerfilter/source/doctok/PLCF.hxx	10 Jan 2008 11:43:44 -0000	1.4
-+++ writerfilter/source/doctok/PLCF.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/PLCF.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,7 +36,14 @@
  #ifndef INCLUDED_PLCF_HXX
  #define INCLUDED_PLCF_HXX
@@ -467,7 +468,7 @@
 retrieving revision 1.3
 diff -u -r1.3 WW8BinTable.hxx
 --- writerfilter/source/doctok/WW8BinTable.hxx	10 Jan 2008 11:44:36 -0000	1.3
-+++ writerfilter/source/doctok/WW8BinTable.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8BinTable.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,8 +36,14 @@
  #ifndef INCLUDED_WW8_BIN_TABLE_HXX
  #define INCLUDED_WW8_BIN_TABLE_HXX
@@ -489,7 +490,7 @@
 retrieving revision 1.3
 diff -u -r1.3 WW8BinTableImpl.hxx
 --- writerfilter/source/doctok/WW8BinTableImpl.hxx	10 Jan 2008 11:44:59 -0000	1.3
-+++ writerfilter/source/doctok/WW8BinTableImpl.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8BinTableImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,7 +36,14 @@
  #ifndef INCLUDED_WW8_BIN_TABLE_IMPL_HXX
  #define INCLUDED_WW8_BIN_TABLE_IMPL_HXX
@@ -525,7 +526,7 @@
 retrieving revision 1.4.2.1
 diff -u -r1.4.2.1 WW8CpAndFc.cxx
 --- writerfilter/source/doctok/WW8CpAndFc.cxx	25 Jan 2008 09:07:36 -0000	1.4.2.1
-+++ writerfilter/source/doctok/WW8CpAndFc.cxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8CpAndFc.cxx	30 Jan 2008 09:09:11 -0000
 @@ -35,10 +35,16 @@
  
  #include <WW8CpAndFc.hxx>
@@ -549,7 +550,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8CpAndFc.hxx
 --- writerfilter/source/doctok/WW8CpAndFc.hxx	10 Jan 2008 11:45:52 -0000	1.4
-+++ writerfilter/source/doctok/WW8CpAndFc.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8CpAndFc.hxx	30 Jan 2008 09:09:11 -0000
 @@ -42,9 +42,16 @@
  #ifndef INCLUDED_DOCUMENT_HXX
  #include <doctok/WW8Document.hxx>
@@ -573,7 +574,7 @@
 retrieving revision 1.8
 diff -u -r1.8 WW8DocumentImpl.hxx
 --- writerfilter/source/doctok/WW8DocumentImpl.hxx	10 Jan 2008 11:46:14 -0000	1.8
-+++ writerfilter/source/doctok/WW8DocumentImpl.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8DocumentImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,7 +36,14 @@
  #ifndef INCLUDED_WW8_DOCUMENT_IMPL_HXX
  #define INCLUDED_WW8_DOCUMENT_IMPL_HXX
@@ -595,7 +596,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8FKPImpl.hxx
 --- writerfilter/source/doctok/WW8FKPImpl.hxx	10 Jan 2008 11:46:57 -0000	1.4
-+++ writerfilter/source/doctok/WW8FKPImpl.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8FKPImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,8 +36,15 @@
  #ifndef INCLUDED_WW8_FKP_IMPL_HXX
  #define INCLUDED_WW8_FKP_IMPL_HXX
@@ -618,7 +619,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8OutputWithDepth.cxx
 --- writerfilter/source/doctok/WW8OutputWithDepth.cxx	10 Jan 2008 11:47:47 -0000	1.4
-+++ writerfilter/source/doctok/WW8OutputWithDepth.cxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8OutputWithDepth.cxx	30 Jan 2008 09:09:11 -0000
 @@ -33,7 +33,14 @@
   *
   ************************************************************************/
@@ -640,7 +641,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8OutputWithDepth.hxx
 --- writerfilter/source/doctok/WW8OutputWithDepth.hxx	10 Jan 2008 11:47:58 -0000	1.4
-+++ writerfilter/source/doctok/WW8OutputWithDepth.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8OutputWithDepth.hxx	30 Jan 2008 09:09:11 -0000
 @@ -40,7 +40,13 @@
  #include <resourcemodel/OutputWithDepth.hxx>
  #endif
@@ -661,7 +662,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8PieceTable.hxx
 --- writerfilter/source/doctok/WW8PieceTable.hxx	10 Jan 2008 11:48:23 -0000	1.4
-+++ writerfilter/source/doctok/WW8PieceTable.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8PieceTable.hxx	30 Jan 2008 09:09:11 -0000
 @@ -44,8 +44,14 @@
  #include <doctok/WW8Document.hxx>
  #endif
@@ -683,7 +684,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8PieceTableImpl.cxx
 --- writerfilter/source/doctok/WW8PieceTableImpl.cxx	10 Jan 2008 11:48:34 -0000	1.4
-+++ writerfilter/source/doctok/WW8PieceTableImpl.cxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8PieceTableImpl.cxx	30 Jan 2008 09:09:11 -0000
 @@ -33,8 +33,14 @@
   *
   ************************************************************************/
@@ -705,7 +706,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8PieceTableImpl.hxx
 --- writerfilter/source/doctok/WW8PieceTableImpl.hxx	10 Jan 2008 11:48:46 -0000	1.4
-+++ writerfilter/source/doctok/WW8PieceTableImpl.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8PieceTableImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,7 +36,14 @@
  #ifndef INCLUDED_WW8_PIECE_TABLE_IMPL_HXX
  #define INCLUDED_WW8_PIECE_TABLE_IMPL_HXX
@@ -727,7 +728,7 @@
 retrieving revision 1.5
 diff -u -r1.5 WW8PropertySetImpl.hxx
 --- writerfilter/source/doctok/WW8PropertySetImpl.hxx	10 Jan 2008 11:49:09 -0000	1.5
-+++ writerfilter/source/doctok/WW8PropertySetImpl.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8PropertySetImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -52,7 +52,13 @@
  #include <WW8OutputWithDepth.hxx>
  #endif
@@ -748,7 +749,7 @@
 retrieving revision 1.11
 diff -u -r1.11 WW8ResourceModelImpl.hxx
 --- writerfilter/source/doctok/WW8ResourceModelImpl.hxx	10 Jan 2008 11:49:32 -0000	1.11
-+++ writerfilter/source/doctok/WW8ResourceModelImpl.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8ResourceModelImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -52,7 +52,13 @@
  #include <resourcemodel/OutputWithDepth.hxx>
  #endif
@@ -769,7 +770,7 @@
 retrieving revision 1.4
 diff -u -r1.4 WW8StructBase.hxx
 --- writerfilter/source/doctok/WW8StructBase.hxx	10 Jan 2008 11:50:22 -0000	1.4
-+++ writerfilter/source/doctok/WW8StructBase.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8StructBase.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,7 +36,13 @@
  #ifndef INCLUDED_WW8_STRUCT_BASE_HXX
  #define INCLUDED_WW8_STRUCT_BASE_HXX
@@ -790,7 +791,7 @@
 retrieving revision 1.3
 diff -u -r1.3 WW8Sttbf.hxx
 --- writerfilter/source/doctok/WW8Sttbf.hxx	10 Jan 2008 11:50:46 -0000	1.3
-+++ writerfilter/source/doctok/WW8Sttbf.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/WW8Sttbf.hxx	30 Jan 2008 09:09:11 -0000
 @@ -40,8 +40,14 @@
  #include <WW8StructBase.hxx>
  #endif
@@ -812,7 +813,7 @@
 retrieving revision 1.8
 diff -u -r1.8 resources.xsl
 --- writerfilter/source/doctok/resources.xsl	10 Jan 2008 11:53:57 -0000	1.8
-+++ writerfilter/source/doctok/resources.xsl	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/resources.xsl	30 Jan 2008 09:09:11 -0000
 @@ -84,8 +84,14 @@
  #ifndef INCLUDED_RESOURCES_HXX
  #define INCLUDED_RESOURCES_HXX
@@ -834,7 +835,7 @@
 retrieving revision 1.3
 diff -u -r1.3 util.hxx
 --- writerfilter/source/doctok/util.hxx	10 Jan 2008 11:54:48 -0000	1.3
-+++ writerfilter/source/doctok/util.hxx	29 Jan 2008 14:23:21 -0000
++++ writerfilter/source/doctok/util.hxx	30 Jan 2008 09:09:11 -0000
 @@ -36,8 +36,14 @@
  #ifndef INCLUDED_UTIL_HXX
  #define INCLUDED_UTIL_HXX
@@ -853,10 +854,10 @@
 Index: writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx,v
-retrieving revision 1.4.2.2
-diff -u -r1.4.2.2 OOXMLFastContextHandler.cxx
---- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx	25 Jan 2008 09:11:46 -0000	1.4.2.2
-+++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx	29 Jan 2008 14:23:22 -0000
+retrieving revision 1.4.2.3
+diff -u -r1.4.2.3 OOXMLFastContextHandler.cxx
+--- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx	29 Jan 2008 16:51:56 -0000	1.4.2.3
++++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx	30 Jan 2008 09:09:11 -0000
 @@ -33,8 +33,15 @@
   *
   ************************************************************************/
@@ -876,10 +877,10 @@
 Index: writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx,v
-retrieving revision 1.2.2.1
-diff -u -r1.2.2.1 OOXMLFastContextHandler.hxx
---- writerfilter/source/ooxml/OOXMLFastContextHandler.hxx	22 Jan 2008 09:52:41 -0000	1.2.2.1
-+++ writerfilter/source/ooxml/OOXMLFastContextHandler.hxx	29 Jan 2008 14:23:22 -0000
+retrieving revision 1.2.2.2
+diff -u -r1.2.2.2 OOXMLFastContextHandler.hxx
+--- writerfilter/source/ooxml/OOXMLFastContextHandler.hxx	29 Jan 2008 16:52:12 -0000	1.2.2.2
++++ writerfilter/source/ooxml/OOXMLFastContextHandler.hxx	30 Jan 2008 09:09:11 -0000
 @@ -40,7 +40,14 @@
  #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
  #endif
@@ -901,7 +902,7 @@
 retrieving revision 1.2
 diff -u -r1.2 OOXMLFastDocumentHandler.cxx
 --- writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx	10 Jan 2008 11:57:55 -0000	1.2
-+++ writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx	30 Jan 2008 09:09:11 -0000
 @@ -33,8 +33,15 @@
   *
   ************************************************************************/
@@ -921,10 +922,10 @@
 Index: writerfilter/source/ooxml/OOXMLFastHelper.hxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLFastHelper.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 OOXMLFastHelper.hxx
---- writerfilter/source/ooxml/OOXMLFastHelper.hxx	10 Jan 2008 11:58:16 -0000	1.2
-+++ writerfilter/source/ooxml/OOXMLFastHelper.hxx	29 Jan 2008 14:23:22 -0000
+retrieving revision 1.2.2.1
+diff -u -r1.2.2.1 OOXMLFastHelper.hxx
+--- writerfilter/source/ooxml/OOXMLFastHelper.hxx	29 Jan 2008 16:52:55 -0000	1.2.2.1
++++ writerfilter/source/ooxml/OOXMLFastHelper.hxx	30 Jan 2008 09:09:11 -0000
 @@ -35,7 +35,14 @@
  #ifndef INCLUDED_FAST_HELPER_HXX
  #define INCLUDED_FAST_HELPER_HXX
@@ -946,7 +947,7 @@
 retrieving revision 1.2.2.1
 diff -u -r1.2.2.1 OOXMLParserState.cxx
 --- writerfilter/source/ooxml/OOXMLParserState.cxx	22 Jan 2008 09:53:22 -0000	1.2.2.1
-+++ writerfilter/source/ooxml/OOXMLParserState.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/OOXMLParserState.cxx	30 Jan 2008 09:09:11 -0000
 @@ -34,7 +34,15 @@
   ************************************************************************/
  
@@ -969,7 +970,7 @@
 retrieving revision 1.21.2.1
 diff -u -r1.21.2.1 OOXMLPropertySetImpl.cxx
 --- writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx	25 Jan 2008 09:14:58 -0000	1.21.2.1
-+++ writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx	30 Jan 2008 09:09:11 -0000
 @@ -34,7 +34,15 @@
   ************************************************************************/
  
@@ -992,7 +993,7 @@
 retrieving revision 1.20
 diff -u -r1.20 OOXMLPropertySetImpl.hxx
 --- writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx	10 Jan 2008 11:59:27 -0000	1.20
-+++ writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx	30 Jan 2008 09:09:11 -0000
 @@ -35,7 +35,14 @@
  #ifndef INCLUDED_OOXML_PROPERTY_SET_IMPL_HXX
  #define INCLUDED_OOXML_PROPERTY_SET_IMPL_HXX
@@ -1014,7 +1015,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources.xsl
 --- writerfilter/source/ooxml/fastresources.xsl	10 Jan 2008 12:02:52 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_RESOURCES_HXX
  #define INCLUDED_OOXML_RESOURCES_HXX
@@ -1037,7 +1038,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_.xsl
 --- writerfilter/source/ooxml/fastresources_.xsl	10 Jan 2008 12:03:05 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_WML_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_WML_HXX
@@ -1060,7 +1061,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-baseStylesheet.xsl
 --- writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl	10 Jan 2008 12:03:15 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_BASESTYLESHEET_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_BASESTYLESHEET_HXX
@@ -1083,7 +1084,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-baseTypes.xsl
 --- writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl	10 Jan 2008 12:03:25 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_BASETYPES_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_BASETYPES_HXX
@@ -1106,7 +1107,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-chartDrawing.xsl
 --- writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl	10 Jan 2008 12:03:35 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_CHARTDRAWING_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_CHARTDRAWING_HXX
@@ -1129,7 +1130,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-documentProperties.xsl
 --- writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl	10 Jan 2008 12:03:45 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_DOCUMENTPROPERTIES_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_DOCUMENTPROPERTIES_HXX
@@ -1152,7 +1153,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-graphicalObject.xsl
 --- writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl	10 Jan 2008 12:03:55 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_GRAPHICALOBJECT_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_GRAPHICALOBJECT_HXX
@@ -1175,7 +1176,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shape3DCamera.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl	10 Jan 2008 12:04:06 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DCAMERA_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DCAMERA_HXX
@@ -1198,7 +1199,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shape3DLighting.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl	10 Jan 2008 12:04:19 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DLIGHTING_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DLIGHTING_HXX
@@ -1221,7 +1222,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shape3DScene.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl	10 Jan 2008 12:04:28 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSCENE_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSCENE_HXX
@@ -1244,7 +1245,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shape3DStyles.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl	10 Jan 2008 12:04:37 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSTYLES_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSTYLES_HXX
@@ -1267,7 +1268,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shapeEffects.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl	10 Jan 2008 12:04:50 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEEFFECTS_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEEFFECTS_HXX
@@ -1290,7 +1291,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shapeGeometry.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl	10 Jan 2008 12:05:00 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEGEOMETRY_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEGEOMETRY_HXX
@@ -1313,7 +1314,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shapeLineProperties.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl	10 Jan 2008 12:05:11 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPELINEPROPERTIES_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPELINEPROPERTIES_HXX
@@ -1336,7 +1337,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-shapeProperties.xsl
 --- writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl	10 Jan 2008 12:05:24 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEPROPERTIES_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEPROPERTIES_HXX
@@ -1359,7 +1360,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-styleDefaults.xsl
 --- writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl	10 Jan 2008 12:05:33 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_STYLEDEFAULTS_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_STYLEDEFAULTS_HXX
@@ -1382,7 +1383,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-stylesheet.xsl
 --- writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl	10 Jan 2008 12:05:42 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_STYLESHEET_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_STYLESHEET_HXX
@@ -1405,7 +1406,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-textCharacter.xsl
 --- writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl	10 Jan 2008 12:05:54 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_TEXTCHARACTER_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_TEXTCHARACTER_HXX
@@ -1428,7 +1429,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_dml-wordprocessingDrawing.xsl
 --- writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl	10 Jan 2008 12:06:04 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_DML_WORDPROCESSINGDRAWING_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_DML_WORDPROCESSINGDRAWING_HXX
@@ -1451,7 +1452,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_shared-math.xsl
 --- writerfilter/source/ooxml/fastresources_shared-math.xsl	10 Jan 2008 12:06:17 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_shared-math.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_shared-math.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_SHARED_MATH_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_SHARED_MATH_HXX
@@ -1474,7 +1475,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_shared-relationshipReference.xsl
 --- writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl	10 Jan 2008 12:06:27 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_SHARED_RELATIONSHIPREFERENCE_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_SHARED_RELATIONSHIPREFERENCE_HXX
@@ -1497,7 +1498,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_sml-customXmlMappings.xsl
 --- writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl	10 Jan 2008 12:06:37 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_SML_CUSTOMXMLMAPPINGS_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_SML_CUSTOMXMLMAPPINGS_HXX
@@ -1520,7 +1521,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresources_wml.xsl
 --- writerfilter/source/ooxml/fastresources_wml.xsl	10 Jan 2008 12:06:53 -0000	1.2
-+++ writerfilter/source/ooxml/fastresources_wml.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresources_wml.xsl	30 Jan 2008 09:09:11 -0000
 @@ -77,9 +77,15 @@
  #ifndef INCLUDED_OOXML_FASTRESOURCES_WML_HXX
  #define INCLUDED_OOXML_FASTRESOURCES_WML_HXX
@@ -1543,7 +1544,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl.xsl	10 Jan 2008 12:07:03 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1565,7 +1566,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-baseStylesheet.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl	10 Jan 2008 12:07:17 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1587,7 +1588,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-baseTypes.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl	10 Jan 2008 12:07:26 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1609,7 +1610,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-chartDrawing.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl	10 Jan 2008 12:07:36 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1631,7 +1632,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-documentProperties.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl	10 Jan 2008 12:07:46 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1653,7 +1654,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-graphicalObject.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl	10 Jan 2008 12:07:55 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1675,7 +1676,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shape3DCamera.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl	10 Jan 2008 12:08:03 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1697,7 +1698,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shape3DLighting.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl	10 Jan 2008 12:08:15 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1719,7 +1720,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shape3DScene.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl	10 Jan 2008 12:08:25 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1741,7 +1742,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shape3DStyles.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl	10 Jan 2008 12:08:35 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1763,7 +1764,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shapeEffects.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl	10 Jan 2008 12:08:45 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1785,7 +1786,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shapeGeometry.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl	10 Jan 2008 12:08:55 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1807,7 +1808,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shapeLineProperties.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl	10 Jan 2008 12:09:04 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1829,7 +1830,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-shapeProperties.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl	10 Jan 2008 12:09:14 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1851,7 +1852,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-styleDefaults.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl	10 Jan 2008 12:09:22 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1873,7 +1874,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-stylesheet.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl	10 Jan 2008 12:09:32 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1895,7 +1896,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-textCharacter.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl	10 Jan 2008 12:09:42 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1917,7 +1918,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_dml-wordprocessingDrawing.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl	10 Jan 2008 12:09:52 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl	30 Jan 2008 09:09:11 -0000
 @@ -76,7 +76,14 @@
        <xsl:call-template name="licenseheader"/>
        <xsl:text>
@@ -1939,7 +1940,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_shared-math.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl	10 Jan 2008 12:10:07 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1961,7 +1962,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_shared-relationshipReference.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl	10 Jan 2008 12:10:22 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -1983,7 +1984,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_sml-customXmlMappings.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl	10 Jan 2008 12:10:32 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -2005,7 +2006,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fastresourcesimpl_wml.xsl
 --- writerfilter/source/ooxml/fastresourcesimpl_wml.xsl	10 Jan 2008 12:10:45 -0000	1.2
-+++ writerfilter/source/ooxml/fastresourcesimpl_wml.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fastresourcesimpl_wml.xsl	30 Jan 2008 09:09:11 -0000
 @@ -75,7 +75,14 @@
      <out xml:space="preserve">
        <xsl:call-template name="licenseheader"/>
@@ -2027,7 +2028,7 @@
 retrieving revision 1.2
 diff -u -r1.2 fasttokens.xsl
 --- writerfilter/source/ooxml/fasttokens.xsl	10 Jan 2008 12:10:56 -0000	1.2
-+++ writerfilter/source/ooxml/fasttokens.xsl	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/ooxml/fasttokens.xsl	30 Jan 2008 09:09:11 -0000
 @@ -78,10 +78,16 @@
  #ifndef INCLUDED_OOXML_FAST_TOKENS_HXX
  #define INCLUDED_OOXML_FAST_TOKENS_HXX
@@ -2051,7 +2052,7 @@
 retrieving revision 1.3.2.2
 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	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/resourcemodel/WW8Analyzer.cxx	30 Jan 2008 09:09:11 -0000
 @@ -33,6 +33,16 @@
   *
   ************************************************************************/
@@ -2075,7 +2076,7 @@
 retrieving revision 1.2
 diff -u -r1.2 WW8Analyzer.hxx
 --- writerfilter/source/resourcemodel/WW8Analyzer.hxx	10 Jan 2008 12:15:57 -0000	1.2
-+++ writerfilter/source/resourcemodel/WW8Analyzer.hxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/source/resourcemodel/WW8Analyzer.hxx	30 Jan 2008 09:09:11 -0000
 @@ -38,8 +38,14 @@
  
  #include <resourcemodel/WW8ResourceModel.hxx>
@@ -2091,13 +2092,37 @@
  
  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
 retrieving revision 1.11
 diff -u -r1.11 DocTokAnalyzeService.cxx
 --- writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx	10 Jan 2008 12:18:37 -0000	1.11
-+++ writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx	30 Jan 2008 09:09:11 -0000
 @@ -50,7 +50,15 @@
  #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
  #include <osl/process.h>
@@ -2120,7 +2145,7 @@
 retrieving revision 1.8
 diff -u -r1.8 DocTokTestService.cxx
 --- writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx	10 Jan 2008 12:18:48 -0000	1.8
-+++ writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx	30 Jan 2008 09:09:11 -0000
 @@ -50,7 +50,15 @@
  #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
  #include <osl/process.h>
@@ -2143,7 +2168,7 @@
 retrieving revision 1.2
 diff -u -r1.2 OOXMLAnalyzeService.cxx
 --- writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx	10 Jan 2008 12:18:59 -0000	1.2
-+++ writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx	30 Jan 2008 09:09:11 -0000
 @@ -54,7 +54,15 @@
  #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
  #include <osl/process.h>
@@ -2166,7 +2191,7 @@
 retrieving revision 1.5
 diff -u -r1.5 OOXMLTestService.cxx
 --- writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx	10 Jan 2008 12:19:23 -0000	1.5
-+++ writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx	29 Jan 2008 14:23:22 -0000
++++ writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx	30 Jan 2008 09:09:11 -0000
 @@ -66,7 +66,15 @@
  #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
  #include <osl/process.h>
@@ -2186,11 +2211,11 @@
 Index: writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx,v
-retrieving revision 1.7.8.1
-diff -u -r1.7.8.1 ScannerTestService.cxx
---- writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx	25 Jan 2008 09:17:39 -0000	1.7.8.1
-+++ writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx	29 Jan 2008 14:23:22 -0000
-@@ -52,7 +52,15 @@
+retrieving revision 1.7.8.2
+diff -u -r1.7.8.2 ScannerTestService.cxx
+--- writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx	29 Jan 2008 15:27:08 -0000	1.7.8.2
++++ writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx	30 Jan 2008 09:09:11 -0000
+@@ -53,7 +53,15 @@
  #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
  #include <osl/process.h>
  #include <rtl/string.hxx>
@@ -2209,11 +2234,11 @@
 Index: writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
 ===================================================================
 RCS file: /cvs/sw/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx,v
-retrieving revision 1.6.18.1
-diff -u -r1.6.18.1 XMLScanner.cxx
---- writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx	25 Jan 2008 09:18:08 -0000	1.6.18.1
-+++ writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx	29 Jan 2008 14:23:22 -0000
-@@ -52,9 +52,25 @@
+retrieving revision 1.6.18.2
+diff -u -r1.6.18.2 XMLScanner.cxx
+--- writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx	29 Jan 2008 15:27:08 -0000	1.6.18.2
++++ writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx	30 Jan 2008 09:09:11 -0000
+@@ -53,9 +53,25 @@
  #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
  #include <osl/process.h>
  #include <rtl/string.hxx>
@@ -2239,7 +2264,7 @@
  #include <cppuhelper/implbase2.hxx>
  #include <com/sun/star/embed/XTransactedObject.hpp>
  #include <com/sun/star/embed/XStorage.hpp>
-@@ -66,7 +82,14 @@
+@@ -67,7 +83,14 @@
  #include <comphelper/seqstream.hxx>
  
  #include <ctype.h>

Added: trunk/patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff	Wed Jan 30 09:56:18 2008
@@ -0,0 +1,12 @@
+--- writerfilter/source/dmapper/DomainMapper.cxx	29 Jan 2008 15:27:07 -0000	1.64.2.6
++++ writerfilter/source/dmapper/DomainMapper.cxx	30 Jan 2008 09:25:18 -0000
+@@ -124,6 +124,9 @@
+ #ifdef DEBUG_DOMAINMAPPER
+ #include <resourcemodel/QNameToString.hxx>
+ #endif
++#if OSL_DEBUG_LEVEL > 0
++#include <resourcemodel/QNameToString.hxx>
++#endif
+ 
+ using namespace ::com::sun::star;
+ using namespace ::rtl;

Added: trunk/patches/ooxml/writerfilter-source-resourcemodel-util_cxx.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/writerfilter-source-resourcemodel-util_cxx.diff	Wed Jan 30 09:56:18 2008
@@ -0,0 +1,29 @@
+--- writerfilter/source/resourcemodel/util.cxx	2008-01-23 14:48:37+0000	1.1.2.3
++++ writerfilter/source/resourcemodel/util.cxx	2008-01-30 08:55:01+0000	1.1.2.4
+@@ -175,7 +175,7 @@
+                         sal_Int32 nValue = 0;
+                         aAny >>= nValue;
+                         
+-                        snprintf(buffer, sizeof(buffer), "%ld", nValue);
++                        snprintf(buffer, sizeof(buffer), "%" SAL_PRIdINT32, nValue);
+                         sResult += buffer;
+                     } 
+                     else if (sPropType == 
+@@ -260,7 +260,7 @@
+                         awt::Point aPoint;
+                         aAny >>= aPoint;
+ 
+-                        snprintf(buffer, sizeof(buffer), "(%ld, %ld)", aPoint.X,
++                        snprintf(buffer, sizeof(buffer), "(%" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ")", aPoint.X,
+                                  aPoint.Y);
+ 
+                         sResult += buffer;
+@@ -273,7 +273,7 @@
+                         awt::Rectangle aRect;
+                         aAny >>= aRect;
+ 
+-                        snprintf(buffer, sizeof(buffer), "(%ld, %ld, %ld, %ld)",
++                        snprintf(buffer, sizeof(buffer), "(%" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ", %" SAL_PRIdINT32 ")",
+                                  aRect.X, aRect.Y, aRect.Width, aRect.Height);
+                         sResult += buffer;                        
+                     }

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 30 09:56:18 2008
@@ -1560,6 +1560,10 @@
 
 gperf-3-is-needed.diff
 
+writerfilter-source-dmapper-domainmapper-debug.diff
+
+writerfilter-source-resourcemodel-util_cxx.diff
+
 [ OOXSTLport5 ]
 SectionOwner => hmth
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]