diff options
| -rw-r--r-- | sc/qa/unit/subsequent_filters_test.cxx | 22 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_filters_test2.cxx | 21 |
2 files changed, 2 insertions, 41 deletions
diff --git a/sc/qa/unit/subsequent_filters_test.cxx b/sc/qa/unit/subsequent_filters_test.cxx index 85a607503aad..3e9b17a682fe 100644 --- a/sc/qa/unit/subsequent_filters_test.cxx +++ b/sc/qa/unit/subsequent_filters_test.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <unotest/filters-test.hxx> #include <osl/file.hxx> #include <config_fonts.h> @@ -65,17 +64,11 @@ using namespace ::com::sun::star::uno; /* Implementation of Filters test */ -class ScFiltersTest - : public test::FiltersTest - , public ScBootstrapFixture +class ScFiltersTest : public ScBootstrapFixture { public: ScFiltersTest(); - virtual bool load( const OUString &rFilter, const OUString &rURL, - const OUString &rUserData, SfxFilterFlags nFilterFlags, - SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) override; - virtual void setUp() override; virtual void tearDown() override; @@ -307,19 +300,6 @@ private: uno::Reference<uno::XInterface> m_xCalcComponent; }; -bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, - const OUString &rUserData, SfxFilterFlags nFilterFlags, - SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) -{ - ScDocShellRef xDocShRef = ScBootstrapFixture::load( rURL, rFilter, rUserData, - OUString(), nFilterFlags, nClipboardID, nFilterVersion); - bool bLoaded = xDocShRef.is(); - //reference counting of ScDocShellRef is very confused. - if (bLoaded) - xDocShRef->DoClose(); - return bLoaded; -} - namespace { void testRangeNameImpl(const ScDocument& rDoc) diff --git a/sc/qa/unit/subsequent_filters_test2.cxx b/sc/qa/unit/subsequent_filters_test2.cxx index b1d1d101a1b2..3f89b53e5412 100644 --- a/sc/qa/unit/subsequent_filters_test2.cxx +++ b/sc/qa/unit/subsequent_filters_test2.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <unotest/filters-test.hxx> - #include <sal/config.h> #include <memory> @@ -64,15 +62,11 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -class ScFiltersTest2 : public test::FiltersTest, public ScBootstrapFixture +class ScFiltersTest2 : public ScBootstrapFixture { public: ScFiltersTest2(); - virtual bool load(const OUString& rFilter, const OUString& rURL, const OUString& rUserData, - SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID, - unsigned int nFilterVersion) override; - virtual void setUp() override; virtual void tearDown() override; @@ -325,19 +319,6 @@ void ScFiltersTest2::tearDown() test::BootstrapFixture::tearDown(); } -bool ScFiltersTest2::load(const OUString& rFilter, const OUString& rURL, const OUString& rUserData, - SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID, - unsigned int nFilterVersion) -{ - ScDocShellRef xDocShRef = ScBootstrapFixture::load(rURL, rFilter, rUserData, OUString(), - nFilterFlags, nClipboardID, nFilterVersion); - bool bLoaded = xDocShRef.is(); - //reference counting of ScDocShellRef is very confused. - if (bLoaded) - xDocShRef->DoClose(); - return bLoaded; -} - void ScFiltersTest2::testMiscRowHeights() { // FIXME: the DPI check should be removed when either (1) the test is fixed to work with |