summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-10-11 01:08:01 +0200
committerEike Rathke <erack@redhat.com>2013-10-11 01:17:29 +0200
commit823278dd095d754d0f673ef140c36c9fa7ebeffd (patch)
treeb8fb3b065a5a897439e94135ec7efd9c0e810a48
parent4192ac4a3af3a6ec5152b5fc967537945e749122 (diff)
resolved fdo#69948 honor a detected FilterName
TypeDetection::queryTypeByDescriptor() adds the FilterName property to the MediaDescriptor, use that if present. Strangely enough the sequence returned by XNameAccess::getByName(sType) of the type detection contains an empty PreferredFilter value so that is useless in this scenario. Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a
-rw-r--r--sfx2/source/appl/fileobj.cxx27
1 files changed, 21 insertions, 6 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 97e3504f43b8..e790f552bca4 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -399,13 +399,28 @@ OUString impl_getFilter( const OUString& _rURL )
OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True );
if ( !sType.isEmpty() )
{
- css::uno::Reference< css::container::XNameAccess > xTypeCont( xTypeDetection,
- css::uno::UNO_QUERY );
- if ( xTypeCont.is() )
+ // Honor a selected/detected filter.
+ for (sal_Int32 i=0; i < aDescrList.getLength(); ++i)
{
- ::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) );
- sFilter = lTypeProps.getUnpackedValueOrDefault(
- OUString("PreferredFilter"), OUString() );
+ if (aDescrList[i].Name == "FilterName")
+ {
+ if (aDescrList[i].Value >>= sFilter)
+ break;
+ }
+ }
+ if (sFilter.isEmpty())
+ {
+ css::uno::Reference< css::container::XNameAccess > xTypeCont( xTypeDetection,
+ css::uno::UNO_QUERY );
+ if ( xTypeCont.is() )
+ {
+ /* XXX: for fdo#69948 scenario the sequence returned by
+ * getByName() contains an empty PreferredFilter
+ * property value (since? expected?) */
+ ::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) );
+ sFilter = lTypeProps.getUnpackedValueOrDefault(
+ OUString("PreferredFilter"), OUString() );
+ }
}
}
}