[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-6' - sw/source

[Caolán McNamara]

 sw/source/filter/basflt/iodetect.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 31f3369bd86674dbbc0cbeb09ab7a53995f400d5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 29 09:48:24 2012 +0000

    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 at redhat.com>
    
    Conflicts:
    	sw/source/filter/basflt/iodetect.cxx
    
    Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461
    (cherry picked from commit 319cbc8eafa0a60445544879d641d0e4dcae5376)
    Reviewed-on: https://gerrit.libreoffice.org/2918
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>

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 @@ sal_Bool SwIoSystem::IsFileFilter( SfxMedium& rMedium, const String& rFmtName,
 
             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();