[Libreoffice-commits] .: sw/qa

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Mon Nov 14 18:35:01 PST 2011


 sw/qa/core/macros-test.cxx |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

New commits:
commit fe8c3c69fd784af9df56706c0026b4a09aed1a2d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Nov 15 02:39:34 2011 +0100

     we don't need to inherit from FiltersTest here

diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 10e83bc..d4ddbca 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -58,14 +58,11 @@ using namespace ::com::sun::star::uno;
 
 /* Implementation of Macros test */
 
-class SwMacrosTest
-    : public test::FiltersTest
-    , public test::BootstrapFixture
+class SwMacrosTest : public test::BootstrapFixture
 {
 public:
     SwMacrosTest();
 
-    virtual bool load(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData);
     SwDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
         const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0);
     uno::Reference< com::sun::star::lang::XComponent > loadFromDesktop(const rtl::OUString& rURL);
@@ -108,18 +105,6 @@ uno::Reference< com::sun::star::lang::XComponent > SwMacrosTest::loadFromDesktop
     return xComponent;
 }
 
-
-bool SwMacrosTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
-    const rtl::OUString &rUserData)
-{
-    SwDocShellRef xDocShRef;
-    bool bLoaded = xDocShRef.Is();
-    //reference counting of SwDocShellRef is very confused.
-    if (bLoaded)
-        xDocShRef->DoClose();
-    return bLoaded;
-}
-
 void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
 {
     rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/"));


More information about the Libreoffice-commits mailing list