From c42edd592e158d85a2231703552fdac6f13d7425 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 11 Oct 2013 01:08:01 +0200 Subject: 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. (cherry picked from commit 823278dd095d754d0f673ef140c36c9fa7ebeffd) Backported. Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a Reviewed-on: https://gerrit.libreoffice.org/6207 Tested-by: Kohei Yoshida Reviewed-by: Kohei Yoshida --- sfx2/source/appl/fileobj.cxx | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 1083a85956a4..553b2cd0546c 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -392,13 +392,32 @@ String impl_getFilter( const String& _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") + { + OUString aFilterName; + if (aDescrList[i].Value >>= aFilterName) + { + sFilter = aFilterName; + break; + } + } + } + if (!sFilter.Len()) + { + 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() ); + } } } } -- cgit v1.2.3