[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300 patches/ooxml

[Tor Lillqvist]

 patches/dev300/apply                                              |    1 
 patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff |   21 ----------
 2 files changed, 22 deletions(-)

New commits:
commit ceb2cbf2603730e51b1bd05d4e7609aa1fde1cba
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:14:31 2011 +0300

    writerfilter-source-dmapper-domainmapper-debug.diff is already in

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5457ba0..705f7cc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1053,7 +1053,6 @@ SectionIssue => i#33654
 win32-installer-register-moox-types.diff
 
 writerfilter-module-writer.diff #disabled
-writerfilter-source-dmapper-domainmapper-debug.diff
 
 # Ugly temporary fix
 docx-ugly-fix.diff, n#548701, cbosdo
diff --git a/patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff b/patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff
deleted file mode 100644
index 18693e5..0000000
--- a/patches/ooxml/writerfilter-source-dmapper-domainmapper-debug.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- writerfilter/source/dmapper/DomainMapper.cxx |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git writerfilter/source/dmapper/DomainMapper.cxx writerfilter/source/dmapper/DomainMapper.cxx
-index df93153..643f1c5 100755
---- writerfilter/source/dmapper/DomainMapper.cxx
-+++ writerfilter/source/dmapper/DomainMapper.cxx
-@@ -102,6 +102,9 @@ namespace dmapper{
- #ifdef DEBUG_DOMAINMAPPER
- TagLogger::Pointer_t dmapper_logger(TagLogger::getInstance("DOMAINMAPPER"));
- #endif
-+#if OSL_DEBUG_LEVEL > 0
-+#include <resourcemodel/QNameToString.hxx>
-+#endif
- 
- /* ---- Fridrich's mess begins here ---- */
- struct _PageSz
--- 
-1.7.0.1
-