diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 09:48:24 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-13 11:12:34 +0200 |
| commit | 4a60855a3bb42e6f7f9474314d496e8fe8188c90 (patch) | |
| tree | 290451448a63ca0c16b3516742e7dbba91292d27 | |
| parent | 20938c1b7a1f3a536c045d8e4fad6b04e1371c27 (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.cxx | 6 |
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(); |