[Libreoffice-commits] core.git: writerperfect/qa

David Tardon dtardon at redhat.com
Sun May 27 17:19:55 UTC 2018


 writerperfect/qa/unit/ImportTest.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit bb27318a41e7d8ee20cd23ed2c94d493f4ba0f81
Author: David Tardon <dtardon at redhat.com>
Date:   Sun May 27 08:13:03 2018 +0200

    creation of css::document::XFilter needs filter name
    
    Change-Id: I5d580e2efe6cf34b9855e47190f6242323d7823a
    Reviewed-on: https://gerrit.libreoffice.org/54873
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx
index 1775f4fc6eeb..3168ac6aade3 100644
--- a/writerperfect/qa/unit/ImportTest.cxx
+++ b/writerperfect/qa/unit/ImportTest.cxx
@@ -95,9 +95,12 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
     aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl;
     aDesc[utl::MediaDescriptor::PROP_READONLY()] <<= true;
     uno::Sequence<beans::PropertyValue> lDesc(aDesc.getAsConstPropertyValueList());
-    const rtl::OUString sType = m_xTypeDetection->queryTypeByDescriptor(lDesc, true);
-    CPPUNIT_ASSERT(!sType.isEmpty());
-    const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sType),
+    m_xTypeDetection->queryTypeByDescriptor(lDesc, true);
+    aDesc = lDesc;
+    rtl::OUString sFilter;
+    aDesc[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilter;
+    CPPUNIT_ASSERT(!sFilter.isEmpty());
+    const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sFilter),
                                                     UNO_QUERY);
     CPPUNIT_ASSERT(xFilter.is());
     return WpftLoader(rUrl, xFilter, rFactoryUrl, m_xDesktop, m_xTypeMap, m_xContext);


More information about the Libreoffice-commits mailing list