rename to match text and spreadsheet tests

Change-Id: I614326cfe8ade8ea07822479cbc656db8e51c1b7

2 files changed, 30 insertions, 30 deletions

diff --git a/writerperfect/qa/unit/DrawImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx
index 2c3d49cf51d6..8b548c85a125 100644
--- a/writerperfect/qa/unit/DrawImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -30,10 +30,10 @@ namespace
 
 namespace uno = css::uno;
 
-class DrawImportFilter : public writerperfect::ImportFilter<OdgGenerator>
+class DrawingImportFilter : public writerperfect::ImportFilter<OdgGenerator>
 {
 public:
-    explicit DrawImportFilter(const uno::Reference< uno::XComponentContext > &rxContext)
+    explicit DrawingImportFilter(const uno::Reference< uno::XComponentContext > &rxContext)
         : writerperfect::ImportFilter<OdgGenerator>(rxContext) {}
 
     // XServiceInfo
@@ -48,35 +48,35 @@ private:
     static void generate(librevenge::RVNGDrawingInterface &rDocument);
 };
 
-bool DrawImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdgGenerator &rGenerator, utl::MediaDescriptor &)
+bool DrawingImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdgGenerator &rGenerator, utl::MediaDescriptor &)
 {
-    DrawImportFilter::generate(rGenerator);
+    DrawingImportFilter::generate(rGenerator);
     return true;
 }
 
-bool DrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName)
+bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName)
 {
     rTypeName = "WpftDummyText";
     return true;
 }
 
 // XServiceInfo
-rtl::OUString SAL_CALL DrawImportFilter::getImplementationName()
+rtl::OUString SAL_CALL DrawingImportFilter::getImplementationName()
 {
-    return OUString("org.libreoffice.comp.Wpft.QA.DrawImportFilter");
+    return OUString("org.libreoffice.comp.Wpft.QA.DrawingImportFilter");
 }
 
-sal_Bool SAL_CALL DrawImportFilter::supportsService(const rtl::OUString &rServiceName)
+sal_Bool SAL_CALL DrawingImportFilter::supportsService(const rtl::OUString &rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL DrawImportFilter::getSupportedServiceNames()
+uno::Sequence< rtl::OUString > SAL_CALL DrawingImportFilter::getSupportedServiceNames()
 {
     return {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
 }
 
-void DrawImportFilter::generate(librevenge::RVNGDrawingInterface &rDocument)
+void DrawingImportFilter::generate(librevenge::RVNGDrawingInterface &rDocument)
 {
     using namespace librevenge;
 
@@ -106,21 +106,21 @@ void DrawImportFilter::generate(librevenge::RVNGDrawingInterface &rDocument)
 namespace
 {
 
-class DrawImportTest : public writerperfect::test::WpftFilterFixture
+class DrawingImportTest : public writerperfect::test::WpftFilterFixture
 {
 public:
     void test();
 
-    CPPUNIT_TEST_SUITE(DrawImportTest);
+    CPPUNIT_TEST_SUITE(DrawingImportTest);
     CPPUNIT_TEST(test);
     CPPUNIT_TEST_SUITE_END();
 };
 
-void DrawImportTest::test()
+void DrawingImportTest::test()
 {
     using namespace css;
 
-    rtl::Reference<DrawImportFilter> xFilter{new DrawImportFilter(m_xContext)};
+    rtl::Reference<DrawingImportFilter> xFilter{new DrawingImportFilter(m_xContext)};
     writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), "private:factory/sdraw", m_xDesktop, m_xContext);
 
     uno::Reference<drawing::XDrawPagesSupplier> xDoc(aLoader.getDocument(), uno::UNO_QUERY);
@@ -147,7 +147,7 @@ void DrawImportTest::test()
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(DrawImportTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(DrawingImportTest);
 
 }
 
diff --git a/writerperfect/qa/unit/ImpressImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx
index bdfe53302aa9..091bc90118bf 100644
--- a/writerperfect/qa/unit/ImpressImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -30,10 +30,10 @@ namespace
 
 namespace uno = css::uno;
 
-class ImpressImportFilter : public writerperfect::ImportFilter<OdpGenerator>
+class PresentationImportFilter : public writerperfect::ImportFilter<OdpGenerator>
 {
 public:
-    explicit ImpressImportFilter(const uno::Reference< uno::XComponentContext > &rxContext)
+    explicit PresentationImportFilter(const uno::Reference< uno::XComponentContext > &rxContext)
         : writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
 
     // XServiceInfo
@@ -48,35 +48,35 @@ private:
     static void generate(librevenge::RVNGPresentationInterface &rDocument);
 };
 
-bool ImpressImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdpGenerator &rGenerator, utl::MediaDescriptor &)
+bool PresentationImportFilter::doImportDocument(librevenge::RVNGInputStream &, OdpGenerator &rGenerator, utl::MediaDescriptor &)
 {
-    ImpressImportFilter::generate(rGenerator);
+    PresentationImportFilter::generate(rGenerator);
     return true;
 }
 
-bool ImpressImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName)
+bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &, rtl::OUString &rTypeName)
 {
     rTypeName = "WpftDummyText";
     return true;
 }
 
 // XServiceInfo
-rtl::OUString SAL_CALL ImpressImportFilter::getImplementationName()
+rtl::OUString SAL_CALL PresentationImportFilter::getImplementationName()
 {
-    return OUString("org.libreoffice.comp.Wpft.QA.ImpressImportFilter");
+    return OUString("org.libreoffice.comp.Wpft.QA.PresentationImportFilter");
 }
 
-sal_Bool SAL_CALL ImpressImportFilter::supportsService(const rtl::OUString &rServiceName)
+sal_Bool SAL_CALL PresentationImportFilter::supportsService(const rtl::OUString &rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL ImpressImportFilter::getSupportedServiceNames()
+uno::Sequence< rtl::OUString > SAL_CALL PresentationImportFilter::getSupportedServiceNames()
 {
     return {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
 }
 
-void ImpressImportFilter::generate(librevenge::RVNGPresentationInterface &rDocument)
+void PresentationImportFilter::generate(librevenge::RVNGPresentationInterface &rDocument)
 {
     using namespace librevenge;
 
@@ -106,21 +106,21 @@ void ImpressImportFilter::generate(librevenge::RVNGPresentationInterface &rDocum
 namespace
 {
 
-class ImpressImportTest : public writerperfect::test::WpftFilterFixture
+class PresentationImportTest : public writerperfect::test::WpftFilterFixture
 {
 public:
     void test();
 
-    CPPUNIT_TEST_SUITE(ImpressImportTest);
+    CPPUNIT_TEST_SUITE(PresentationImportTest);
     CPPUNIT_TEST(test);
     CPPUNIT_TEST_SUITE_END();
 };
 
-void ImpressImportTest::test()
+void PresentationImportTest::test()
 {
     using namespace css;
 
-    rtl::Reference<ImpressImportFilter> xFilter{new ImpressImportFilter(m_xContext)};
+    rtl::Reference<PresentationImportFilter> xFilter{new PresentationImportFilter(m_xContext)};
     writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter.get(), "private:factory/simpress", m_xDesktop, m_xContext);
 
     uno::Reference<drawing::XDrawPagesSupplier> xDoc(aLoader.getDocument(), uno::UNO_QUERY);
@@ -147,7 +147,7 @@ void ImpressImportTest::test()
     CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION(ImpressImportTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PresentationImportTest);
 
 }