summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-29 09:48:24 +0000
committerAndras Timar <atimar@suse.com>2013-01-13 21:59:34 +0100
commit46bee74bf9ae9173ab903969edc02920cf15a9b3 (patch)
tree89960af21e645e864793ddde781fbe7636f75cd1
parent403521ad614d880876a6db0b98c0b6063f04ae39 (diff)
.dot files sometimes rejected by writer, bnc#793422
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. Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461 Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
-rw-r--r--sw/source/filter/basflt/iodetect.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index b99d57ccfbde..f32fa1c0304b 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -266,6 +266,12 @@ sal_Bool SwIoSystem::IsFileFilter(SfxMedium& rMedium, const String& rFmtName)
}
}
}
+ //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();