Kaydet (Commit) fe8c3c69 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

we don't need to inherit from FiltersTest here

üst f7319622
...@@ -58,14 +58,11 @@ using namespace ::com::sun::star::uno; ...@@ -58,14 +58,11 @@ using namespace ::com::sun::star::uno;
/* Implementation of Macros test */ /* Implementation of Macros test */
class SwMacrosTest class SwMacrosTest : public test::BootstrapFixture
: public test::FiltersTest
, public test::BootstrapFixture
{ {
public: public:
SwMacrosTest(); 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, SwDocShellRef load(const rtl::OUString &rFilter, const rtl::OUString &rURL,
const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0); const rtl::OUString &rUserData, const rtl::OUString& rTypeName, sal_uLong nFormatType=0);
uno::Reference< com::sun::star::lang::XComponent > loadFromDesktop(const rtl::OUString& rURL); 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 ...@@ -108,18 +105,6 @@ uno::Reference< com::sun::star::lang::XComponent > SwMacrosTest::loadFromDesktop
return xComponent; 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) void SwMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
{ {
rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/")); rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment