diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-29 09:48:24 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-22 23:26:57 +0100 |
| commit | 319cbc8eafa0a60445544879d641d0e4dcae5376 (patch) | |
| tree | 1a4591bda6ce0bff323b92bb3ed73c4d3cf4bfae | |
| parent | 75e7e130448182c15697c8dd0b8d50324db4f79f (diff) | |
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
| -rw-r--r-- | sw/source/filter/basflt/iodetect.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 41adf6762445..e83635f50887 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(); |