Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2918

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/18/2918/1

fdo#58071: .dot files sometimes rejected by writer

because CWW8 appears twice, once for normal .doc and once for .dot. So a .dot
files is tested twice if it's supported by the WW8 filter. Depending on the
(effectively arbitrary) order they appear in the list .dots may fail the "is a
normal non template .doc" test after the "is a template .dot" test and get
rejected as a CWW8 candidate.

(cherry picked from commit 94001499e0d7453c7012241334a9911dfccef76b)

Signed-off-by: Michael Stahl <mstahl@redhat.com>

Conflicts:
        sw/source/filter/basflt/iodetect.cxx

Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461
(cherry picked from commit 319cbc8eafa0a60445544879d641d0e4dcae5376)
---
M sw/source/filter/basflt/iodetect.cxx
1 file changed, 7 insertions(+), 0 deletions(-)



diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 41adf67..e83635f 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -271,6 +271,13 @@
 
             if( bRet && ppFilter  )
                 *ppFilter = pFltr;
+
+            //The same underlying filter can appear multiple times in the
+            //filter list, e.g. CWW8 filter twice, once for .doc and once for
+            //.dot.  We just care here if its either, not enforce that it's
+            //both which would be a bit of an odd requirement
+            if (bRet)
+                break;
         }
 
         pFltr = aIter.Next();

-- 
To view, visit https://gerrit.libreoffice.org/2918
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-6
Gerrit-Owner: Michael Stahl <mstahl@redhat.com>
Gerrit-Reviewer: Caolán McNamara <caolanm@redhat.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.