summaryrefslogtreecommitdiff
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-05-22 16:55:22 (GMT)
committer Eike Rathke <erack@redhat.com>2012-10-23 15:31:42 (GMT)
commitdc9b4a29f1928fabcd4094942d32bc5985091838 (patch) (side-by-side diff)
tree80c9d94abd9299bf364c1a7fe158d17e2a206a88
parent1141d04daea3a0091c2d7533018dbe17e5b5a8bd (diff)
downloadcore-dc9b4a29f1928fabcd4094942d32bc5985091838.zip
core-dc9b4a29f1928fabcd4094942d32bc5985091838.tar.gz
rhbz#868953 fdo#45084 When the caller specifies filter type, stick to it
and don't overwrite it. (cherry picked from commit 552bebe6fa27fa58d07d87283a4b24e6052ab3d4) Conflicts: filter/source/config/cache/typedetection.cxx Change-Id: I35a3efc506bbcc33ea4c3d2466929f8227dae102 Signed-off-by: Eike Rathke <erack@redhat.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--filter/source/config/cache/typedetection.cxx19
1 files changed, 12 insertions, 7 deletions
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 25b3742..5b73b89 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -143,9 +143,18 @@ TypeDetection::~TypeDetection()
css::uno::Reference< css::util::XURLTransformer > xParser(m_xSMGR->createInstance(SERVICE_URLTRANSFORMER), css::uno::UNO_QUERY);
xParser->parseStrict(aURL);
- //*******************************************
- // preselected filter, type or document service?
- // use it as first "flat" detected type later!
+ rtl::OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault(
+ comphelper::MediaDescriptor::PROP_FILTERNAME(), rtl::OUString());
+ if (!aSelectedFilter.isEmpty())
+ {
+ // Caller specified the filter type. Honor it. Just get the default
+ // type for that filter, and bail out.
+ if (impl_validateAndSetFilterOnDescriptor(stlDescriptor, aSelectedFilter))
+ return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get<rtl::OUString>();
+ }
+
+ // preselected type or document service? use it as first "flat" detected
+ // type later!
FlatDetection lFlatTypes;
impl_getPreselection(aURL, stlDescriptor, lFlatTypes);
@@ -690,10 +699,6 @@ void TypeDetection::impl_getPreselection(const css::util::URL& aP
if (sSelectedType.getLength())
impl_getPreselectionForType(sSelectedType, aParsedURL, rFlatTypes);
- ::rtl::OUString sSelectedFilter = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString());
- if (sSelectedFilter.getLength())
- impl_getPreselectionForFilter(sSelectedFilter, aParsedURL, rFlatTypes);
-
::rtl::OUString sSelectedDoc = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE(), ::rtl::OUString());
if (sSelectedDoc.getLength())
impl_getPreselectionForDocumentService(sSelectedDoc, aParsedURL, rFlatTypes);