ooo-build r13992 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Mon Sep 22 10:56:49 2008
New Revision: 13992
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13992&view=rev

Log:
2008-09-22  Tor Lillqvist  <tml novell com>

	* patches/src680/odf-converter-ignore-writerfilter.diff: Unfuzzify.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/odf-converter-ignore-writerfilter.diff

Modified: trunk/patches/dev300/odf-converter-ignore-writerfilter.diff
==============================================================================
--- trunk/patches/dev300/odf-converter-ignore-writerfilter.diff	(original)
+++ trunk/patches/dev300/odf-converter-ignore-writerfilter.diff	Mon Sep 22 10:56:49 2008
@@ -2,7 +2,7 @@
 index e090c61..b5c97ce 100644
 --- oox/source/core/filterdetect.cxx
 +++ oox/source/core/filterdetect.cxx
-@@ -41,7 +41,10 @@
+@@ -41,12 +41,20 @@
  #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
  #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
  #include <com/sun/star/xml/sax/XFastParser.hpp>
@@ -12,8 +12,6 @@
 +
  #include <comphelper/processfactory.hxx>
  #include <comphelper/mediadescriptor.hxx>
- #include <comphelper/storagehelper.hxx>
-@@ -48,6 +48,11 @@
  #include <cppuhelper/implbase1.hxx>
  #include <cppuhelper/implbase2.hxx>
  
@@ -23,7 +21,7 @@
 +#include <rtl/ustring.hxx>
 +
  #include "oox/helper/attributelist.hxx"
- #include "oox/helper/helper.hxx"
+ #include "oox/helper/zipstorage.hxx"
  #include "oox/core/fasttokenhandler.hxx"
 @@ -291,6 +295,7 @@
  
@@ -55,7 +53,7 @@
 +
      OUString aFilter;
  
-     Reference< XFastDocumentHandler > xHandler( new FilterDetectDocHandler(aFilter) );
+     try
 @@ -414,6 +426,47 @@
      return FilterDetect_getSupportedServiceNames();
  }