ooo-build r11869 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Tue Mar 11 11:13:48 2008
New Revision: 11869
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11869&view=rev

Log:
2008-03-11  Jan Holesovsky  <kendy suse cz>

        * patches/src680/odf-converter-ignore-writerfilter.diff: Update also
          for xslx and pptx.


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

Modified: trunk/patches/src680/odf-converter-ignore-writerfilter.diff
==============================================================================
--- trunk/patches/src680/odf-converter-ignore-writerfilter.diff	(original)
+++ trunk/patches/src680/odf-converter-ignore-writerfilter.diff	Tue Mar 11 11:13:48 2008
@@ -1,3 +1,49 @@
+diff --git oox/source/core/filterdetect.cxx oox/source/core/filterdetect.cxx
+index e090c61..b5c97ce 100644
+--- oox/source/core/filterdetect.cxx
++++ oox/source/core/filterdetect.cxx
+@@ -48,6 +48,9 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <cppuhelper/implbase2.hxx>
+ 
++#include <unotools/bootstrap.hxx>
++#include <osl/file.hxx>
++
+ #include "oox/helper/attributelist.hxx"
+ #include "oox/helper/helper.hxx"
+ #include "oox/core/fasttokenhandler.hxx"
+@@ -325,6 +328,19 @@ FilterDetect::~FilterDetect()
+ 
+ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& lDescriptor ) throw( RuntimeException )
+ {
++    // hack for odf-converter - we ignore the built-in oox import filter if
++    // OdfConverter is present
++    rtl::OUString aPath;
++    ::utl::Bootstrap::PathStatus aBaseLocateResult = ::utl::Bootstrap::locateBaseInstallation( aPath );
++    if ( aBaseLocateResult == ::utl::Bootstrap::PATH_EXISTS )
++    {
++        aPath += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/OdfConverter" ) );
++
++        osl::DirectoryItem aDirItem;
++        if ( osl::DirectoryItem::get( aPath, aDirItem ) == osl::FileBase::E_None )
++            return rtl::OUString();
++    }
++
+     OUString aFilter;
+ 
+     Reference< XFastDocumentHandler > xHandler( new FilterDetectDocHandler(aFilter) );
+diff --git oox/util/makefile.mk oox/util/makefile.mk
+index 69713a6..3c69e95 100644
+--- oox/util/makefile.mk
++++ oox/util/makefile.mk
+@@ -74,6 +74,7 @@ SHL1STDLIBS= \
+ 		$(RTLLIB)		\
+ 		$(SALLIB)		\
+ 		$(BASEGFXLIB)	\
++		$(UNOTOOLSLIB)	\
+ 		$(SAXLIB)
+ 
+ SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 diff --git writerfilter/source/filter/WriterFilterDetection.cxx writerfilter/source/filter/WriterFilterDetection.cxx
 index e9030ac..9f910ae 100644
 --- writerfilter/source/filter/WriterFilterDetection.cxx