summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-29 09:48:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-11-29 10:27:53 +0000
commit94001499e0d7453c7012241334a9911dfccef76b (patch)
treea631fb68eb31840cd6a1e482602840beed1c348c
parentdeba3112b6d752f305f562c059dc16657b459864 (diff)
.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. Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461
-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 8fd07cb9c2be..d26ec7c10e90 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -260,6 +260,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();