ooo-build r11445 - in trunk: . patches/ooxml patches/src680
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11445 - in trunk: . patches/ooxml patches/src680
- Date: Tue, 29 Jan 2008 17:11:59 +0000 (GMT)
Author: strba
Date: Tue Jan 29 17:11:58 2008
New Revision: 11445
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11445&view=rev
Log:
extract recent snapshot of cws xmlfilter03 along with updated writerfilter and oox tarballs
Added:
trunk/patches/ooxml/cws-xmlfilter03-offapi.diff
trunk/patches/ooxml/cws-xmlfilter03-sw.diff
Removed:
trunk/patches/ooxml/buildfix-writerfilter-ooxml-deps.diff
trunk/patches/ooxml/cws-gcc430two-ooxml.diff
trunk/patches/ooxml/writerfilter-source-dmapper-domainmapper_cxx.diff
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/patches/ooxml/buildfix-x86-64-visibility-workaround-writerfilter.diff
trunk/patches/src680/apply
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Jan 29 17:11:58 2008
@@ -1094,10 +1094,10 @@
fi
AC_SUBST(MIRROR)
-OOX_MODULE_TARBALL="oox.2008-01-15.tar.bz2"
+OOX_MODULE_TARBALL="oox.2008-01-29.tar.bz2"
AC_SUBST(OOX_MODULE_TARBALL)
-WRITERFILTER_MODULE_TARBALL="writerfilter.2008-01-15.tar.bz2"
+WRITERFILTER_MODULE_TARBALL="writerfilter.2008-01-29.tar.bz2"
AC_SUBST(WRITERFILTER_MODULE_TARBALL)
AC_CONFIG_FILES([download], [chmod +x download])
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 Tue Jan 29 17:11:58 2008
@@ -1,5 +1,10 @@
---- writerfilter/inc/dmapper/DomainMapper.hxx 14 Nov 2007 12:50:13 -0000 1.19.12.4
-+++ writerfilter/inc/dmapper/DomainMapper.hxx 15 Jan 2008 14:43:43 -0000
+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
@@ -43,7 +43,13 @@
#include <com/sun/star/text/FontEmphasis.hpp>
#include <com/sun/star/style/TabAlign.hpp>
@@ -14,8 +19,13 @@
namespace com{ namespace sun {namespace star{
namespace uno{
---- writerfilter/inc/doctok/WW8Document.hxx 3 Dec 2007 09:29:49 -0000 1.6.12.3
-+++ writerfilter/inc/doctok/WW8Document.hxx 15 Jan 2008 14:43:43 -0000
+Index: writerfilter/inc/doctok/WW8Document.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/doctok/WW8Document.hxx,v
+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
@@ -36,7 +36,14 @@
#ifndef INCLUDED_WW8_DOCUMENT_HXX
#define INCLUDED_WW8_DOCUMENT_HXX
@@ -31,155 +41,13 @@
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
#endif // _SAL_TYPES_H_
---- writerfilter/inc/odiapi/core/Node.hxx 1 Nov 2006 09:14:27 -0000 1.2
-+++ writerfilter/inc/odiapi/core/Node.hxx 15 Jan 2008 14:43:44 -0000
-@@ -46,9 +46,15 @@
- #include <odiapi/props/Properties.hxx>
- #endif
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <memory>
- #include <string>
- #include <boost/shared_ptr.hpp>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- namespace odiapi { namespace core {
-
---- writerfilter/inc/odiapi/props/Iterator.hxx 1 Nov 2006 09:14:27 -0000 1.2
-+++ writerfilter/inc/odiapi/props/Iterator.hxx 15 Jan 2008 14:43:44 -0000
-@@ -38,7 +38,13 @@
- #ifndef INCLUDED_ITERATOR_HXX
- #define INCLUDED_ITERATOR_HXX
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <boost/shared_ptr.hpp>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- namespace odiapi { namespace props {
-
---- writerfilter/inc/odiapi/props/Logger.hxx 1 Nov 2006 09:14:27 -0000 1.2
-+++ writerfilter/inc/odiapi/props/Logger.hxx 15 Jan 2008 14:43:44 -0000
-@@ -38,7 +38,13 @@
- #ifndef INCLUDED_LOGGER_HXX
- #define INCLUDED_LOGGER_HXX
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- namespace util {
-
---- writerfilter/inc/odiapi/props/Properties.hxx 1 Nov 2006 09:14:27 -0000 1.2
-+++ writerfilter/inc/odiapi/props/Properties.hxx 15 Jan 2008 14:43:44 -0000
-@@ -46,8 +46,14 @@
-
- #include "Iterator.hxx"
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <boost/shared_ptr.hpp>
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- namespace util { class Logger; }
-
---- writerfilter/inc/odiapi/qname/QName.hxx 1 Nov 2006 09:14:27 -0000 1.2
-+++ writerfilter/inc/odiapi/qname/QName.hxx 15 Jan 2008 14:43:50 -0000
-@@ -39,7 +39,14 @@
-
- #include <sal/types.h>
- #include <WriterFilterDllApi.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <memory>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
-
- namespace writerfilter
---- writerfilter/inc/odiapi/sl/od_sl.hxx 18 May 2007 15:44:42 -0000 1.3
-+++ writerfilter/inc/odiapi/sl/od_sl.hxx 15 Jan 2008 14:43:50 -0000
-@@ -36,12 +36,26 @@
- #ifndef INCLUDED_OD_SL_CXX
- #define INCLUDED_OD_SL_CXX
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <memory>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <odiapi/qname/QName.hxx>
- #include <odiapi/xxml/XXmlReader.hxx>
- #include <odiapi/props/Properties.hxx>
- #include <WriterFilterDllApi.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <map>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- class WRITERFILTER_DLLPUBLIC ODSLHandler : public writerfilter::xxml::ContentHandler
- {
---- writerfilter/inc/odiapi/xxml/ContentHandler.hxx 1 Nov 2006 09:14:28 -0000 1.2
-+++ writerfilter/inc/odiapi/xxml/ContentHandler.hxx 15 Jan 2008 14:43:50 -0000
-@@ -40,7 +40,14 @@
- #include <odiapi/qname/QName.hxx>
- #include <WriterFilterDllApi.hxx>
- #include <rtl/ustring.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
-
- namespace writerfilter { namespace xxml {
---- writerfilter/inc/odiapi/xxml/XXmlReader.hxx 1 Nov 2006 09:14:29 -0000 1.2
-+++ writerfilter/inc/odiapi/xxml/XXmlReader.hxx 15 Jan 2008 14:43:50 -0000
-@@ -38,7 +38,14 @@
- #define INCLUDED_XXMLREADER_HXX
-
- #include <odiapi/xxml/ContentHandler.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <memory>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- #include <com/sun/star/io/XInputStream.hpp>
- #include <com/sun/star/embed/XStorage.hpp>
---- writerfilter/inc/resourcemodel/OutputWithDepth.hxx 14 Nov 2007 12:51:05 -0000 1.1.2.1
-+++ writerfilter/inc/resourcemodel/OutputWithDepth.hxx 15 Jan 2008 14:43:50 -0000
+Index: writerfilter/inc/resourcemodel/OutputWithDepth.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/resourcemodel/OutputWithDepth.hxx,v
+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
@@ -36,8 +36,14 @@
#ifndef INCLUDED_OUTPUT_WITH_DEPTH
#define INCLUDED_OUTPUT_WITH_DEPTH
@@ -195,8 +63,13 @@
namespace writerfilter
{
---- writerfilter/inc/resourcemodel/QNameToString.hxx 12 Dec 2007 07:53:42 -0000 1.3.12.5
-+++ writerfilter/inc/resourcemodel/QNameToString.hxx 15 Jan 2008 14:43:50 -0000
+Index: writerfilter/inc/resourcemodel/QNameToString.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/resourcemodel/QNameToString.hxx,v
+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
@@ -35,10 +35,17 @@
#ifndef INCLUDED_QNAME_TO_STRING_HXX
#define INCLUDED_QNAME_TO_STRING_HXX
@@ -215,8 +88,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
---- writerfilter/inc/resourcemodel/SubSequence.hxx 3 Dec 2007 09:30:28 -0000 1.1.2.1
-+++ writerfilter/inc/resourcemodel/SubSequence.hxx 15 Jan 2008 14:43:50 -0000
+Index: writerfilter/inc/resourcemodel/SubSequence.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/resourcemodel/SubSequence.hxx,v
+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
@@ -40,8 +40,15 @@
#include <com/sun/star/uno/Sequence.hxx>
#endif
@@ -233,8 +111,13 @@
#include <ctype.h>
#include "exceptions.hxx"
#include <WriterFilterDllApi.hxx>
---- writerfilter/inc/resourcemodel/WW8ResourceModel.hxx 12 Dec 2007 08:04:17 -0000 1.1.2.7
-+++ writerfilter/inc/resourcemodel/WW8ResourceModel.hxx 15 Jan 2008 14:43:51 -0000
+Index: writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx,v
+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
@@ -36,9 +36,15 @@
#ifndef INCLUDED_WW8_EVENT_HANDLER_HXX
#define INCLUDED_WW8_EVENT_HANDLER_HXX
@@ -252,8 +135,13 @@
#ifndef _SAL_TYPES_H_
#include <sal/types.h>
---- writerfilter/inc/resourcemodel/exceptions.hxx 3 Dec 2007 09:30:39 -0000 1.1.2.1
-+++ writerfilter/inc/resourcemodel/exceptions.hxx 15 Jan 2008 14:43:51 -0000
+Index: writerfilter/inc/resourcemodel/exceptions.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/resourcemodel/exceptions.hxx,v
+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
@@ -36,7 +36,14 @@
#ifndef _DOCTOK_EXCEPTIONS_HXX
#define _DOCTOK_EXCEPTIONS_HXX
@@ -269,8 +157,13 @@
#include <WriterFilterDllApi.hxx>
namespace writerfilter {
+Index: writerfilter/inc/rtftok/RTFScanner.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/inc/rtftok/RTFScanner.hxx,v
+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 15 Jan 2008 14:43:51 -0000
++++ writerfilter/inc/rtftok/RTFScanner.hxx 29 Jan 2008 14:23:19 -0000
@@ -6,7 +6,15 @@
#define INCLUDED_RTFSCANNER_HXX
@@ -287,8 +180,13 @@
#include <rtftok/RTFInputSource.hxx>
#include <rtftok/RTFScannerHandler.hxx>
+Index: writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx,v
+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 15 Jan 2008 14:43:51 -0000
++++ writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx 29 Jan 2008 14:23:19 -0000
@@ -1,7 +1,15 @@
/* Copyright 2005 Sun Microsystems, Inc. */
@@ -305,8 +203,13 @@
#include <boost/assert.hpp>
#include <stdio.h>
+Index: writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx,v
+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 15 Jan 2008 14:43:51 -0000
++++ writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx 29 Jan 2008 14:23:19 -0000
@@ -1,7 +1,14 @@
/* Copyright 2005 Sun Microsystems, Inc. */
@@ -322,8 +225,13 @@
using namespace std;
+Index: writerfilter/qa/cppunittests/qname/testQName.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/qa/cppunittests/qname/testQName.cxx,v
+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 15 Jan 2008 14:44:04 -0000
++++ writerfilter/qa/cppunittests/qname/testQName.cxx 29 Jan 2008 14:23:20 -0000
@@ -6,9 +6,15 @@
#include <rtl/string.hxx>
#include <rtl/random.h>
@@ -341,9 +249,14 @@
using namespace writerfilter;
---- writerfilter/source/dmapper/DomainMapper_Impl.cxx 12 Dec 2007 08:00:29 -0000 1.19.12.10
-+++ writerfilter/source/dmapper/DomainMapper_Impl.cxx 15 Jan 2008 14:44:08 -0000
-@@ -64,8 +64,13 @@
+Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v
+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
+@@ -74,8 +74,13 @@
#include <rtl/string.h>
#include <resourcemodel/QNameToString.hxx>
@@ -358,8 +271,13 @@
using namespace ::com::sun::star;
using namespace ::rtl;
---- writerfilter/source/dmapper/DomainMapper_Impl.hxx 22 Nov 2007 14:53:43 -0000 1.18.12.4
-+++ writerfilter/source/dmapper/DomainMapper_Impl.hxx 15 Jan 2008 14:44:08 -0000
+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
@@ -44,8 +44,15 @@
#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
@@ -391,8 +309,13 @@
namespace com{ namespace sun{ namespace star{
namespace lang{
---- writerfilter/source/dmapper/PropertyIds.cxx 12 Dec 2007 08:05:16 -0000 1.26.12.7
-+++ writerfilter/source/dmapper/PropertyIds.cxx 15 Jan 2008 14:44:09 -0000
+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
@@ -36,7 +36,14 @@
#include <PropertyIds.hxx>
#endif
@@ -408,8 +331,13 @@
namespace writerfilter {
namespace dmapper{
---- writerfilter/source/dmapper/PropertyMap.hxx 26 Nov 2007 14:11:52 -0000 1.13.12.2
-+++ writerfilter/source/dmapper/PropertyMap.hxx 15 Jan 2008 14:44:10 -0000
+Index: writerfilter/source/dmapper/PropertyMap.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/dmapper/PropertyMap.hxx,v
+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
@@ -53,9 +53,17 @@
#ifndef INCLUDED_DMAPPER_PROPERTYIDS_HXX
#include <PropertyIds.hxx>
@@ -428,8 +356,13 @@
namespace com{namespace sun{namespace star{
namespace beans{
struct PropertyValue;
---- writerfilter/source/dmapper/StyleSheetTable.cxx 29 Nov 2007 16:36:31 -0000 1.27.12.12
-+++ writerfilter/source/dmapper/StyleSheetTable.cxx 15 Jan 2008 14:44:11 -0000
+Index: writerfilter/source/dmapper/StyleSheetTable.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/dmapper/StyleSheetTable.cxx,v
+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
@@ -38,7 +38,15 @@
#include <BorderHandler.hxx>
#include <doctok/resourceids.hxx>
@@ -462,8 +395,13 @@
#include <stdio.h>
#include <rtl/ustrbuf.hxx>
---- writerfilter/source/dmapper/ThemeTable.hxx 14 Nov 2007 12:57:07 -0000 1.1.6.4
-+++ writerfilter/source/dmapper/ThemeTable.hxx 15 Jan 2008 14:44:11 -0000
+Index: writerfilter/source/dmapper/ThemeTable.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/dmapper/ThemeTable.hxx,v
+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
@@ -41,7 +41,14 @@
#endif
#include <resourcemodel/WW8ResourceModel.hxx>
@@ -479,8 +417,13 @@
namespace writerfilter {
namespace dmapper
---- writerfilter/source/doctok/Dff.hxx 14 Nov 2007 12:57:45 -0000 1.6.12.1
-+++ writerfilter/source/doctok/Dff.hxx 15 Jan 2008 14:44:11 -0000
+Index: writerfilter/source/doctok/Dff.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/Dff.hxx,v
+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
@@ -46,7 +46,14 @@
#ifndef INCLUDED_DFF_HXX
#define INCLUDED_DFF_HXX
@@ -496,8 +439,13 @@
#include <WW8StructBase.hxx>
#include <WW8ResourceModelImpl.hxx>
---- writerfilter/source/doctok/PLCF.hxx 14 Nov 2007 12:57:45 -0000 1.3.12.1
-+++ writerfilter/source/doctok/PLCF.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/PLCF.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/PLCF.hxx,v
+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
@@ -36,7 +36,14 @@
#ifndef INCLUDED_PLCF_HXX
#define INCLUDED_PLCF_HXX
@@ -513,8 +461,13 @@
#ifndef INCLUDED_WW8_STRUCT_BASE_HXX
#include <WW8StructBase.hxx>
#endif
---- writerfilter/source/doctok/WW8BinTable.hxx 14 Nov 2007 12:57:46 -0000 1.2.12.1
-+++ writerfilter/source/doctok/WW8BinTable.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8BinTable.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8BinTable.hxx,v
+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
@@ -36,8 +36,14 @@
#ifndef INCLUDED_WW8_BIN_TABLE_HXX
#define INCLUDED_WW8_BIN_TABLE_HXX
@@ -530,8 +483,13 @@
#ifndef INCLUDED_WW8_FKP_HXX
#include <WW8FKP.hxx>
---- writerfilter/source/doctok/WW8BinTableImpl.hxx 14 Nov 2007 12:57:46 -0000 1.2.12.1
-+++ writerfilter/source/doctok/WW8BinTableImpl.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8BinTableImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8BinTableImpl.hxx,v
+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
@@ -36,7 +36,14 @@
#ifndef INCLUDED_WW8_BIN_TABLE_IMPL_HXX
#define INCLUDED_WW8_BIN_TABLE_IMPL_HXX
@@ -561,8 +519,13 @@
namespace writerfilter {
namespace doctok
---- writerfilter/source/doctok/WW8CpAndFc.cxx 14 Nov 2007 12:57:46 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8CpAndFc.cxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8CpAndFc.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8CpAndFc.cxx,v
+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
@@ -35,10 +35,16 @@
#include <WW8CpAndFc.hxx>
@@ -580,8 +543,13 @@
namespace writerfilter {
namespace doctok
---- writerfilter/source/doctok/WW8CpAndFc.hxx 14 Nov 2007 12:57:46 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8CpAndFc.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8CpAndFc.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8CpAndFc.hxx,v
+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
@@ -42,9 +42,16 @@
#ifndef INCLUDED_DOCUMENT_HXX
#include <doctok/WW8Document.hxx>
@@ -599,8 +567,13 @@
namespace writerfilter {
namespace doctok
---- writerfilter/source/doctok/WW8DocumentImpl.hxx 14 Nov 2007 12:57:46 -0000 1.7.12.2
-+++ writerfilter/source/doctok/WW8DocumentImpl.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8DocumentImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8DocumentImpl.hxx,v
+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
@@ -36,7 +36,14 @@
#ifndef INCLUDED_WW8_DOCUMENT_IMPL_HXX
#define INCLUDED_WW8_DOCUMENT_IMPL_HXX
@@ -616,8 +589,13 @@
#ifndef INCLUDED_WW8_PIECE_TABLE_HXX
#include <WW8PieceTable.hxx>
#endif
---- writerfilter/source/doctok/WW8FKPImpl.hxx 14 Nov 2007 12:57:46 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8FKPImpl.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8FKPImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8FKPImpl.hxx,v
+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
@@ -36,8 +36,15 @@
#ifndef INCLUDED_WW8_FKP_IMPL_HXX
#define INCLUDED_WW8_FKP_IMPL_HXX
@@ -634,8 +612,13 @@
#ifndef INCLUDED_WW8_FKP_HXX
#include <WW8FKP.hxx>
#endif
---- writerfilter/source/doctok/WW8OutputWithDepth.cxx 14 Nov 2007 12:57:46 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8OutputWithDepth.cxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8OutputWithDepth.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8OutputWithDepth.cxx,v
+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
@@ -33,7 +33,14 @@
*
************************************************************************/
@@ -651,8 +634,13 @@
#include "WW8OutputWithDepth.hxx"
namespace writerfilter {
---- writerfilter/source/doctok/WW8OutputWithDepth.hxx 14 Nov 2007 12:57:46 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8OutputWithDepth.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8OutputWithDepth.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8OutputWithDepth.hxx,v
+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
@@ -40,7 +40,13 @@
#include <resourcemodel/OutputWithDepth.hxx>
#endif
@@ -667,8 +655,13 @@
using namespace ::std;
---- writerfilter/source/doctok/WW8PieceTable.hxx 14 Nov 2007 12:57:47 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8PieceTable.hxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8PieceTable.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8PieceTable.hxx,v
+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
@@ -44,8 +44,14 @@
#include <doctok/WW8Document.hxx>
#endif
@@ -684,8 +677,13 @@
namespace writerfilter {
namespace doctok {
---- writerfilter/source/doctok/WW8PieceTableImpl.cxx 3 Dec 2007 09:34:58 -0000 1.3.12.2
-+++ writerfilter/source/doctok/WW8PieceTableImpl.cxx 15 Jan 2008 14:44:12 -0000
+Index: writerfilter/source/doctok/WW8PieceTableImpl.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8PieceTableImpl.cxx,v
+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
@@ -33,8 +33,14 @@
*
************************************************************************/
@@ -701,8 +699,13 @@
#ifndef INCLUDED_DOCTOK_EXCEPTIONS
#include <resourcemodel/exceptions.hxx>
---- writerfilter/source/doctok/WW8PieceTableImpl.hxx 14 Nov 2007 12:57:47 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8PieceTableImpl.hxx 15 Jan 2008 14:44:13 -0000
+Index: writerfilter/source/doctok/WW8PieceTableImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8PieceTableImpl.hxx,v
+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
@@ -36,7 +36,14 @@
#ifndef INCLUDED_WW8_PIECE_TABLE_IMPL_HXX
#define INCLUDED_WW8_PIECE_TABLE_IMPL_HXX
@@ -718,8 +721,13 @@
#ifndef INCLUDED_WW8_CP_AND_FC_HXX
#include <WW8CpAndFc.hxx>
#endif
---- writerfilter/source/doctok/WW8PropertySetImpl.hxx 14 Nov 2007 12:57:47 -0000 1.4.12.2
-+++ writerfilter/source/doctok/WW8PropertySetImpl.hxx 15 Jan 2008 14:44:13 -0000
+Index: writerfilter/source/doctok/WW8PropertySetImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8PropertySetImpl.hxx,v
+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
@@ -52,7 +52,13 @@
#include <WW8OutputWithDepth.hxx>
#endif
@@ -734,8 +742,13 @@
namespace writerfilter {
namespace doctok
---- writerfilter/source/doctok/WW8ResourceModelImpl.hxx 3 Dec 2007 09:35:54 -0000 1.10.12.4
-+++ writerfilter/source/doctok/WW8ResourceModelImpl.hxx 15 Jan 2008 14:44:14 -0000
+Index: writerfilter/source/doctok/WW8ResourceModelImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8ResourceModelImpl.hxx,v
+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
@@ -52,7 +52,13 @@
#include <resourcemodel/OutputWithDepth.hxx>
#endif
@@ -750,8 +763,13 @@
namespace writerfilter {
namespace doctok
---- writerfilter/source/doctok/WW8StructBase.hxx 14 Nov 2007 12:57:47 -0000 1.3.12.1
-+++ writerfilter/source/doctok/WW8StructBase.hxx 15 Jan 2008 14:44:14 -0000
+Index: writerfilter/source/doctok/WW8StructBase.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8StructBase.hxx,v
+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
@@ -36,7 +36,13 @@
#ifndef INCLUDED_WW8_STRUCT_BASE_HXX
#define INCLUDED_WW8_STRUCT_BASE_HXX
@@ -766,8 +784,13 @@
#ifndef INCLUDED_WW8_DOCUMENT_HXX
#include <doctok/WW8Document.hxx>
---- writerfilter/source/doctok/WW8Sttbf.hxx 14 Nov 2007 12:57:47 -0000 1.2.12.1
-+++ writerfilter/source/doctok/WW8Sttbf.hxx 15 Jan 2008 14:44:14 -0000
+Index: writerfilter/source/doctok/WW8Sttbf.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/WW8Sttbf.hxx,v
+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
@@ -40,8 +40,14 @@
#include <WW8StructBase.hxx>
#endif
@@ -783,8 +806,13 @@
namespace writerfilter {
namespace doctok
---- writerfilter/source/doctok/resources.xsl 14 Nov 2007 12:57:49 -0000 1.7.12.2
-+++ writerfilter/source/doctok/resources.xsl 15 Jan 2008 14:44:15 -0000
+Index: writerfilter/source/doctok/resources.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/resources.xsl,v
+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
@@ -84,8 +84,14 @@
#ifndef INCLUDED_RESOURCES_HXX
#define INCLUDED_RESOURCES_HXX
@@ -800,8 +828,13 @@
#ifndef INCLUDED_OUTPUT_WITH_DEPTH_HXX
#include <resourcemodel/OutputWithDepth.hxx>
---- writerfilter/source/doctok/util.hxx 14 Nov 2007 12:57:49 -0000 1.2.12.1
-+++ writerfilter/source/doctok/util.hxx 15 Jan 2008 14:44:15 -0000
+Index: writerfilter/source/doctok/util.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/doctok/util.hxx,v
+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
@@ -36,8 +36,14 @@
#ifndef INCLUDED_UTIL_HXX
#define INCLUDED_UTIL_HXX
@@ -817,124 +850,13 @@
namespace writerfilter {
namespace doctok {
---- writerfilter/source/odiapi/core/NodeImpl.hxx 1 Nov 2006 09:14:35 -0000 1.2
-+++ writerfilter/source/odiapi/core/NodeImpl.hxx 15 Jan 2008 14:44:15 -0000
-@@ -40,8 +40,14 @@
-
- #include <odiapi/core/Node.hxx>
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
- #include <boost/shared_ptr.hpp>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- namespace odiapi { namespace core {
-
---- writerfilter/source/odiapi/props/PropertiesImpl.cxx 26 Apr 2007 21:34:43 -0000 1.3
-+++ writerfilter/source/odiapi/props/PropertiesImpl.cxx 15 Jan 2008 14:44:16 -0000
-@@ -37,13 +37,29 @@
-
- #include "PropertiesImpl.hxx"
- #include <odiapi/props/Logger.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <boost/assert.hpp>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdexcept>
- #include <utility>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <memory>
- #include <algorithm>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <errno.h>
-
- using namespace boost;
---- writerfilter/source/odiapi/props/PropertiesImpl.hxx 1 Nov 2006 09:14:35 -0000 1.2
-+++ writerfilter/source/odiapi/props/PropertiesImpl.hxx 15 Jan 2008 14:44:16 -0000
-@@ -42,9 +42,15 @@
- #include <odiapi/props/Properties.hxx>
- #endif
-
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <set>
- #include <map>
- #include <list>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
-
- namespace odiapi { namespace props {
-
---- writerfilter/source/odiapi/qname/QName.cxx 1 Nov 2006 09:14:35 -0000 1.2
-+++ writerfilter/source/odiapi/qname/QName.cxx 15 Jan 2008 14:44:29 -0000
-@@ -37,12 +37,28 @@
-
- #include <odiapi/qname/QName.hxx>
- #include <rtl/string.h>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <hash_set>
- #include <hash_map>
- #include <stack>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <assert.h>
- #include <stdexcept>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <string>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <stdio.h>
-
- namespace writerfilter
---- writerfilter/source/odiapi/sl/od_sl.cxx 18 May 2007 15:44:43 -0000 1.3
-+++ writerfilter/source/odiapi/sl/od_sl.cxx 15 Jan 2008 14:44:29 -0000
-@@ -35,8 +35,15 @@
-
-
- #include <odiapi/sl/od_sl.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <stack>
- #include <map>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-
- #include <stdio.h>
-
---- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 12 Dec 2007 07:54:43 -0000 1.1.6.19
-+++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 15 Jan 2008 14:44:30 -0000
+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
@@ -33,8 +33,15 @@
*
************************************************************************/
@@ -951,8 +873,13 @@
#include <rtl/uuid.h>
#include <com/sun/star/drawing/XShapes.hpp>
#include <resourcemodel/QNameToString.hxx>
---- writerfilter/source/ooxml/OOXMLFastContextHandler.hxx 27 Nov 2007 10:52:05 -0000 1.1.6.11
-+++ writerfilter/source/ooxml/OOXMLFastContextHandler.hxx 15 Jan 2008 14:44:30 -0000
+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
@@ -40,7 +40,14 @@
#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
#endif
@@ -968,8 +895,13 @@
#include "sal/config.h"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "cppuhelper/implbase1.hxx"
---- writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx 21 Nov 2007 11:49:51 -0000 1.1.6.5
-+++ writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx 15 Jan 2008 14:44:30 -0000
+Index: writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx,v
+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
@@ -33,8 +33,15 @@
*
************************************************************************/
@@ -986,8 +918,13 @@
#include "OOXMLFastDocumentHandler.hxx"
#include "OOXMLFastContextHandler.hxx"
#include "OOXMLFastTokens.hxx"
---- writerfilter/source/ooxml/OOXMLFastHelper.hxx 3 Dec 2007 09:39:06 -0000 1.1.4.6
-+++ writerfilter/source/ooxml/OOXMLFastHelper.hxx 15 Jan 2008 14:44:31 -0000
+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
@@ -35,7 +35,14 @@
#ifndef INCLUDED_FAST_HELPER_HXX
#define INCLUDED_FAST_HELPER_HXX
@@ -1003,8 +940,13 @@
#include <resourcemodel/QNameToString.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/OOXMLParserState.cxx 14 Nov 2007 12:58:59 -0000 1.1.6.3
-+++ writerfilter/source/ooxml/OOXMLParserState.cxx 15 Jan 2008 14:44:31 -0000
+Index: writerfilter/source/ooxml/OOXMLParserState.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLParserState.cxx,v
+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
@@ -34,7 +34,15 @@
************************************************************************/
@@ -1021,8 +963,13 @@
#include "OOXMLParserState.hxx"
namespace writerfilter {
---- writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx 7 Dec 2007 09:38:27 -0000 1.18.12.8
-+++ writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx 15 Jan 2008 14:44:31 -0000
+Index: writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx,v
+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
@@ -34,7 +34,15 @@
************************************************************************/
@@ -1039,8 +986,13 @@
#include <resourcemodel/QNameToString.hxx>
#ifndef _COM_SUN_STAR_DRAWING_XSHAPE_HPP_
---- writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx 15 Nov 2007 14:26:29 -0000 1.17.12.3
-+++ writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx,v
+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
@@ -35,7 +35,14 @@
#ifndef INCLUDED_OOXML_PROPERTY_SET_IMPL_HXX
#define INCLUDED_OOXML_PROPERTY_SET_IMPL_HXX
@@ -1056,8 +1008,13 @@
#include "OOXMLPropertySet.hxx"
#include "OOXMLBinaryObjectReference.hxx"
---- writerfilter/source/ooxml/fastresources.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.5
-+++ writerfilter/source/ooxml/fastresources.xsl 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/fastresources.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_RESOURCES_HXX
#define INCLUDED_OOXML_RESOURCES_HXX
@@ -1074,8 +1031,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include <doctok/resourceids.hxx>
---- writerfilter/source/ooxml/fastresources_.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_.xsl 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/fastresources_.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_WML_HXX
#define INCLUDED_OOXML_FASTRESOURCES_WML_HXX
@@ -1092,8 +1054,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-baseStylesheet.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_BASESTYLESHEET_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_BASESTYLESHEET_HXX
@@ -1110,8 +1077,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-baseTypes.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_BASETYPES_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_BASETYPES_HXX
@@ -1128,8 +1100,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-chartDrawing.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_CHARTDRAWING_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_CHARTDRAWING_HXX
@@ -1146,8 +1123,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl 15 Jan 2008 14:44:33 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-documentProperties.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_DOCUMENTPROPERTIES_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_DOCUMENTPROPERTIES_HXX
@@ -1164,8 +1146,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-graphicalObject.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_GRAPHICALOBJECT_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_GRAPHICALOBJECT_HXX
@@ -1182,8 +1169,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shape3DCamera.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DCAMERA_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DCAMERA_HXX
@@ -1200,8 +1192,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shape3DLighting.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DLIGHTING_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DLIGHTING_HXX
@@ -1218,8 +1215,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shape3DScene.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSCENE_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSCENE_HXX
@@ -1236,8 +1238,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shape3DStyles.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSTYLES_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPE3DSTYLES_HXX
@@ -1254,8 +1261,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shapeEffects.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEEFFECTS_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEEFFECTS_HXX
@@ -1272,8 +1284,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shapeGeometry.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEGEOMETRY_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEGEOMETRY_HXX
@@ -1290,8 +1307,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl 15 Jan 2008 14:44:34 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shapeLineProperties.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPELINEPROPERTIES_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPELINEPROPERTIES_HXX
@@ -1308,8 +1330,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-shapeProperties.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEPROPERTIES_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_SHAPEPROPERTIES_HXX
@@ -1326,8 +1353,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-styleDefaults.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_STYLEDEFAULTS_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_STYLEDEFAULTS_HXX
@@ -1344,8 +1376,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-stylesheet.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_STYLESHEET_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_STYLESHEET_HXX
@@ -1362,8 +1399,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-textCharacter.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_TEXTCHARACTER_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_TEXTCHARACTER_HXX
@@ -1380,8 +1422,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_dml-wordprocessingDrawing.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_DML_WORDPROCESSINGDRAWING_HXX
#define INCLUDED_OOXML_FASTRESOURCES_DML_WORDPROCESSINGDRAWING_HXX
@@ -1398,8 +1445,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_shared-math.xsl 14 Nov 2007 12:58:59 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_shared-math.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_shared-math.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_shared-math.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_SHARED_MATH_HXX
#define INCLUDED_OOXML_FASTRESOURCES_SHARED_MATH_HXX
@@ -1416,8 +1468,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_shared-relationshipReference.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_SHARED_RELATIONSHIPREFERENCE_HXX
#define INCLUDED_OOXML_FASTRESOURCES_SHARED_RELATIONSHIPREFERENCE_HXX
@@ -1434,8 +1491,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_sml-customXmlMappings.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_SML_CUSTOMXMLMAPPINGS_HXX
#define INCLUDED_OOXML_FASTRESOURCES_SML_CUSTOMXMLMAPPINGS_HXX
@@ -1452,8 +1514,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresources_wml.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresources_wml.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresources_wml.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresources_wml.xsl,v
+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
@@ -77,9 +77,15 @@
#ifndef INCLUDED_OOXML_FASTRESOURCES_WML_HXX
#define INCLUDED_OOXML_FASTRESOURCES_WML_HXX
@@ -1470,8 +1537,13 @@
#include <resourcemodel/WW8ResourceModel.hxx>
#include "OOXMLFastContextHandler.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.6
-+++ writerfilter/source/ooxml/fastresourcesimpl.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1487,8 +1559,13 @@
#include <doctok/sprmids.hxx>
#include "OOXMLFastHelper.hxx"
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-baseStylesheet.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1504,8 +1581,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-baseTypes.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1521,8 +1603,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-chartDrawing.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1538,9 +1625,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
-diff -u -r1.1.4.4 fastresourcesimpl_dml-documentProperties.xsl
---- writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl 15 Jan 2008 14:44:35 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-documentProperties.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1556,8 +1647,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-graphicalObject.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1573,9 +1669,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
-diff -u -r1.1.4.4 fastresourcesimpl_dml-shape3DCamera.xsl
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DCamera.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1591,8 +1691,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DLighting.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1608,8 +1713,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DScene.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1625,8 +1735,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shape3DStyles.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1642,8 +1757,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shapeEffects.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1659,8 +1779,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shapeGeometry.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1676,8 +1801,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shapeLineProperties.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1693,8 +1823,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-shapeProperties.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1710,8 +1845,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-styleDefaults.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1727,8 +1867,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-stylesheet.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1744,8 +1889,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-textCharacter.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1761,8 +1911,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_dml-wordprocessingDrawing.xsl,v
+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
@@ -76,7 +76,14 @@
<xsl:call-template name="licenseheader"/>
<xsl:text>
@@ -1778,8 +1933,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_shared-math.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1795,8 +1955,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl 15 Jan 2008 14:44:36 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_shared-relationshipReference.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1812,8 +1977,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.4
-+++ writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl 15 Jan 2008 14:44:37 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_sml-customXmlMappings.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1829,8 +1999,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include "OOXMLfastresources.hxx"
---- writerfilter/source/ooxml/fastresourcesimpl_wml.xsl 14 Nov 2007 12:59:00 -0000 1.1.4.5
-+++ writerfilter/source/ooxml/fastresourcesimpl_wml.xsl 15 Jan 2008 14:44:37 -0000
+Index: writerfilter/source/ooxml/fastresourcesimpl_wml.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fastresourcesimpl_wml.xsl,v
+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
@@ -75,7 +75,14 @@
<out xml:space="preserve">
<xsl:call-template name="licenseheader"/>
@@ -1846,8 +2021,13 @@
#include <doctok/resourceids.hxx>
#include <ooxml/resourceids.hxx>
#include <doctok/sprmids.hxx>
---- writerfilter/source/ooxml/fasttokens.xsl 21 Nov 2007 11:42:09 -0000 1.1.6.5
-+++ writerfilter/source/ooxml/fasttokens.xsl 15 Jan 2008 14:44:37 -0000
+Index: writerfilter/source/ooxml/fasttokens.xsl
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/ooxml/fasttokens.xsl,v
+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
@@ -78,10 +78,16 @@
#ifndef INCLUDED_OOXML_FAST_TOKENS_HXX
#define INCLUDED_OOXML_FAST_TOKENS_HXX
@@ -1865,17 +2045,23 @@
#include <resourcemodel/WW8ResourceModel.hxx>
---- writerfilter/source/resourcemodel/WW8Analyzer.cxx 12 Dec 2007 07:53:29 -0000 1.1.2.6
-+++ writerfilter/source/resourcemodel/WW8Analyzer.cxx 15 Jan 2008 14:44:37 -0000
-@@ -34,7 +34,15 @@
+Index: writerfilter/source/resourcemodel/WW8Analyzer.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/resourcemodel/WW8Analyzer.cxx,v
+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
+@@ -33,6 +33,16 @@
+ *
************************************************************************/
- #include <stdlib.h>
++#include <stdlib.h>
+
+#ifdef GCC_VISIBILITY_BROKEN
+#pragma GCC visibility push(default)
+#endif
- #include <fstream>
++#include <fstream>
+#ifdef GCC_VISIBILITY_BROKEN
+#pragma GCC visibility pop
+#endif
@@ -1883,8 +2069,13 @@
#include <WW8Analyzer.hxx>
#include <doctok/resourceids.hxx>
#include <resourcemodel/QNameToString.hxx>
---- writerfilter/source/resourcemodel/WW8Analyzer.hxx 14 Nov 2007 13:00:50 -0000 1.1.2.2
-+++ writerfilter/source/resourcemodel/WW8Analyzer.hxx 15 Jan 2008 14:44:37 -0000
+Index: writerfilter/source/resourcemodel/WW8Analyzer.hxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/source/resourcemodel/WW8Analyzer.hxx,v
+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
@@ -38,8 +38,14 @@
#include <resourcemodel/WW8ResourceModel.hxx>
@@ -1900,8 +2091,13 @@
namespace writerfilter
{
---- writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx 3 Dec 2007 09:41:42 -0000 1.10.12.4
-+++ writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx 15 Jan 2008 14:44:37 -0000
+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
@@ -50,7 +50,15 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <osl/process.h>
@@ -1918,8 +2114,13 @@
#include <assert.h>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx 3 Dec 2007 09:41:41 -0000 1.7.12.3
-+++ writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx 15 Jan 2008 14:44:37 -0000
+Index: writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx,v
+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
@@ -50,7 +50,15 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <osl/process.h>
@@ -1936,26 +2137,13 @@
#include <assert.h>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/odsl/ODSLParser.cxx 19 Jun 2007 05:34:19 -0000 1.6
-+++ writerfilter/unocomponent/debugservices/odsl/ODSLParser.cxx 15 Jan 2008 14:44:38 -0000
-@@ -61,7 +61,15 @@
- #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
- #include <osl/process.h>
- #include <rtl/string.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <set>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <assert.h>
- #include <cppuhelper/implbase2.hxx>
- #include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx 14 Nov 2007 13:01:09 -0000 1.1.2.5
-+++ writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx 15 Jan 2008 14:44:38 -0000
+Index: writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx,v
+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
@@ -54,7 +54,15 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <osl/process.h>
@@ -1972,8 +2160,13 @@
#include <assert.h>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx 29 Nov 2007 15:50:13 -0000 1.4.12.2
-+++ writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx 15 Jan 2008 14:44:38 -0000
+Index: writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
+===================================================================
+RCS file: /cvs/sw/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx,v
+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
@@ -66,7 +66,15 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <osl/process.h>
@@ -1990,26 +2183,13 @@
#include <assert.h>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/bootstrap.hxx>
---- writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx 19 Jun 2007 05:39:12 -0000 1.5
-+++ writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx 15 Jan 2008 14:44:38 -0000
-@@ -52,7 +52,15 @@
- #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
- #include <osl/process.h>
- #include <rtl/string.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <hash_set>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <assert.h>
- #include <cppuhelper/implbase2.hxx>
- #include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx 29 Oct 2007 14:04:50 -0000 1.7
-+++ writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx 15 Jan 2008 14:44:39 -0000
+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 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <osl/process.h>
@@ -2026,8 +2206,13 @@
#include <assert.h>
#include <cppuhelper/implbase2.hxx>
#include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx 19 Jun 2007 05:39:13 -0000 1.6
-+++ writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx 15 Jan 2008 14:44:40 -0000
+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 @@
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <osl/process.h>
@@ -2069,39 +2254,3 @@
using namespace ::com::sun::star;
using namespace ::std;
---- writerfilter/unocomponent/debugservices/xxml/FileXXmlReader.cxx 19 Jun 2007 05:39:13 -0000 1.5
-+++ writerfilter/unocomponent/debugservices/xxml/FileXXmlReader.cxx 15 Jan 2008 14:44:40 -0000
-@@ -59,7 +59,15 @@
- #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
- #include <osl/process.h>
- #include <rtl/string.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <hash_set>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <assert.h>
- #include <cppuhelper/implbase2.hxx>
- #include <com/sun/star/embed/XTransactedObject.hpp>
---- writerfilter/unocomponent/debugservices/xxml/StorageXXmlReader.cxx 19 Jun 2007 05:39:13 -0000 1.5
-+++ writerfilter/unocomponent/debugservices/xxml/StorageXXmlReader.cxx 15 Jan 2008 14:44:40 -0000
-@@ -59,7 +59,15 @@
- #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
- #include <osl/process.h>
- #include <rtl/string.hxx>
-+
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility push(default)
-+#endif
- #include <hash_set>
-+#ifdef GCC_VISIBILITY_BROKEN
-+#pragma GCC visibility pop
-+#endif
-+
- #include <assert.h>
- #include <cppuhelper/implbase2.hxx>
- #include <com/sun/star/embed/XTransactedObject.hpp>
Added: trunk/patches/ooxml/cws-xmlfilter03-offapi.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/cws-xmlfilter03-offapi.diff Tue Jan 29 17:11:58 2008
@@ -0,0 +1,20 @@
+--- offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl 10 Jan 2008 12:45:52 -0000 1.2
++++ offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl 23 Jan 2008 12:10:39 -0000 1.2.4.1
+@@ -45,6 +45,7 @@
+ #include <com/sun/star/drawing/XShape.idl>
+ #include <com/sun/star/drawing/XShapes.idl>
+ #include <com/sun/star/frame/XModel.idl>
++#include <com/sun/star/io/XInputStream.idl>
+
+ //=============================================================================
+
+@@ -62,7 +63,8 @@ interface XFastShapeContextHandler: com:
+ [attribute, readonly] com::sun::star::drawing::XShape Shape;
+ [attribute] com::sun::star::drawing::XShapes Shapes;
+ [attribute] com::sun::star::frame::XModel Model;
+-
++ [attribute] com::sun::star::io::XInputStream InputStream;
++ [attribute] string RelationFragmentPath;
+ };
+
+ //=============================================================================
Added: trunk/patches/ooxml/cws-xmlfilter03-sw.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/cws-xmlfilter03-sw.diff Tue Jan 29 17:11:58 2008
@@ -0,0 +1,93 @@
+--- sw/source/core/doc/doctxm.cxx 27 Sep 2007 08:37:21 -0000 1.47
++++ sw/source/core/doc/doctxm.cxx 22 Jan 2008 14:21:14 -0000 1.47.160.1
+@@ -1867,10 +1867,14 @@ void SwTOXBaseSection::GenerateText( USH
+ }
+ else
+ nRightMargin = aNdRect.Width();
++ //#i24363# tab stops relative to indent
++ if( pDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) )
++ {
+ //left margin of paragraph style
+ const SvxLRSpaceItem& rLRSpace = pTOXNd->GetTxtColl()->GetLRSpace();
+ nRightMargin -= rLRSpace.GetLeft();
+ nRightMargin -= rLRSpace.GetTxtFirstLineOfst();
++ }
+
+ aTStops.Insert( SvxTabStop( nRightMargin, SVX_TAB_ADJUST_RIGHT,
+ cDfltDecimalChar,
+--- sw/source/core/unocore/unotbl.cxx 10 Jan 2008 12:31:03 -0000 1.113
++++ sw/source/core/unocore/unotbl.cxx 22 Jan 2008 13:08:49 -0000 1.113.2.1
+@@ -769,6 +769,9 @@ void lcl_SetTblSeparators(const uno::Any
+
+ pTable->GetTabCols( aOldCols, pBox, sal_False, bRow );
+ sal_uInt16 nOldCount = aOldCols.Count();
++ //there's no use in setting tab cols if there's only one column
++ if( !nOldCount )
++ return;
+
+ const uno::Sequence< text::TableColumnSeparator>* pSepSeq =
+ (uno::Sequence< text::TableColumnSeparator>*) rVal.getValue();
+--- sw/source/core/unocore/unotext.cxx 10 Jan 2008 12:31:16 -0000 1.35
++++ sw/source/core/unocore/unotext.cxx 22 Jan 2008 13:10:53 -0000 1.35.2.1
+@@ -1674,6 +1674,26 @@ uno::Reference< text::XTextContent > SwX
+ if(SwXTextRange::XTextRangeToSwPaM(aStartPam, xStart) &&
+ SwXTextRange::XTextRangeToSwPaM(*pEndPam, xEnd) )
+ {
++ uno::Reference<lang::XUnoTunnel> xStartRangeTunnel( xStart, uno::UNO_QUERY);
++ SwXTextRange* pStartRange = reinterpret_cast< SwXTextRange * >(
++ sal::static_int_cast< sal_IntPtr >( xStartRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
++ uno::Reference<lang::XUnoTunnel> xEndRangeTunnel( xEnd, uno::UNO_QUERY);
++ SwXTextRange* pEndRange = reinterpret_cast< SwXTextRange * >(
++ sal::static_int_cast< sal_IntPtr >( xEndRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
++ //bokmarks have to be removed before the referenced text node is deleted in DelFullPara
++ if( pStartRange )
++ {
++ SwBookmark* pStartBookmark = pStartRange->GetBookmark();
++ if( pStartBookmark )
++ pDoc->deleteBookmark( pStartBookmark->GetName() );
++ }
++ if( pEndRange )
++ {
++ SwBookmark* pEndBookmark = pEndRange->GetBookmark();
++ if( pEndBookmark )
++ pDoc->deleteBookmark( pEndBookmark->GetName() );
++ }
++
+ pDoc->StartUndo( UNDO_START, NULL );
+ bool bIllegalException = false;
+ bool bRuntimeException = false;
+@@ -1708,8 +1728,34 @@ uno::Reference< text::XTextContent > SwX
+ for(sal_Int32 nProp = 0; nProp < rFrameProperties.getLength(); ++nProp)
+ pNewFrame->SwXFrame::setPropertyValue(pValues[nProp].Name, pValues[nProp].Value);
+
++ {//has to be in a block to remove the SwIndexes before DelFullPara is called
+ uno::Reference< text::XTextRange> xInsertTextRange = new SwXTextRange(aStartPam, this);
+ pNewFrame->attach( xInsertTextRange );
++ pNewFrame->setName(pDoc->GetUniqueFrameName());
++ }
++
++ if( !aStartPam.GetTxt().Len() )
++ {
++
++ bool bMoved = false;
++ {//has to be in a block to remove the SwIndexes before DelFullPara is called
++ SwPaM aMovePam( *aStartPam.GetNode() );
++ if( aMovePam.Move( fnMoveForward, fnGoCntnt ) )
++ {
++ //move the anchor to the next paragraph
++ SwFmtAnchor aNewAnchor( pNewFrame->GetFrmFmt()->GetAnchor() );
++ aNewAnchor.SetAnchor( aMovePam.Start() );
++ pDoc->SetAttr( aNewAnchor, *pNewFrame->GetFrmFmt() );
++ }
++ bMoved = true;
++ }
++ if(bMoved)
++ {
++ aStartPam.DeleteMark();
++// SwPaM aDelPam( *aStartPam.GetNode() );
++ pDoc->DelFullPara(aStartPam/*aDelPam*/);
++ }
++ }
+ }
+ catch( lang::IllegalArgumentException& rIllegal )
+ {
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Tue Jan 29 17:11:58 2008
@@ -1551,18 +1551,15 @@
cws-xmlfilter02-sw.diff
cws-xmlfilter02-toolkit.diff
+cws-xmlfilter03-sw.diff
+cws-xmlfilter03-offapi.diff
+
win32-installer-register-moox-types.diff
buildfix-x86-64-visibility-workaround-writerfilter.diff
-buildfix-writerfilter-ooxml-deps.diff
-
-writerfilter-source-dmapper-domainmapper_cxx.diff
-
gperf-3-is-needed.diff
-cws-gcc430two-ooxml.diff
-
[ OOXSTLport5 ]
SectionOwner => hmth
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
