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

[Tor Lillqvist]

 patches/dev300/odf-converter-ignore-writerfilter.diff |   18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

New commits:
commit 2b56fd3b3a2ec0459025d5c48c284aca7c87b891
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 5 14:19:13 2011 +0300

    Make odf-converter-ignore-writerfilter.diff apply again

diff --git a/patches/dev300/odf-converter-ignore-writerfilter.diff b/patches/dev300/odf-converter-ignore-writerfilter.diff
index 2e9bb89..3add3a1 100644
--- a/patches/dev300/odf-converter-ignore-writerfilter.diff
+++ b/patches/dev300/odf-converter-ignore-writerfilter.diff
@@ -1,10 +1,3 @@
----
- filter/source/config/cache/filtercache.cxx |   95 ++++++++++++++++++++++++++++
- filter/source/config/cache/makefile.mk     |    1 +
- 2 files changed, 96 insertions(+), 0 deletions(-)
-
-diff --git filter/source/config/cache/filtercache.cxx filter/source/config/cache/filtercache.cxx
-index 657e8ad..0edbb81 100644
 --- filter/source/config/cache/filtercache.cxx
 +++ filter/source/config/cache/filtercache.cxx
 @@ -62,7 +62,15 @@
@@ -111,9 +104,9 @@ index 657e8ad..0edbb81 100644
 +    return false;
 +}
 +
- /*-----------------------------------------------
-     22.09.2003 14:27
- -----------------------------------------------*/
+ 
+ 
+ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig,
 @@ -1608,6 +1700,9 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
            sal_Int32        c      = lItems.getLength();
      for (sal_Int32 i=0; i<c; ++i)
@@ -124,8 +117,6 @@ index 657e8ad..0edbb81 100644
          CacheItemList::iterator pItem = pCache->find(pItems[i]);
          switch(eOption)
          {
-diff --git filter/source/config/cache/makefile.mk filter/source/config/cache/makefile.mk
-index fbc4806..44cb87a 100644
 --- filter/source/config/cache/makefile.mk
 +++ filter/source/config/cache/makefile.mk
 @@ -60,6 +60,7 @@ SLOFILES=       \
@@ -136,6 +127,3 @@ index fbc4806..44cb87a 100644
                  $(COMPHELPERLIB)    \
                  $(CPPUHELPERLIB)    \
                  $(CPPULIB)          \
--- 
-1.7.0.1
-