diff options
| author | Lars Langhans <lla@openoffice.org> | 2010-06-18 14:29:05 +0200 |
|---|---|---|
| committer | Lars Langhans <lla@openoffice.org> | 2010-06-18 14:29:05 +0200 |
| commit | 3eb46cc6da3ce17dccc3dba51704b3bafce94034 (patch) | |
| tree | 3df6afb6afbfa30c8a09ec5d752adbaa3ff7a4cb /smoketestoo_native | |
| parent | 924eab5afc99b0b0ecfa76ac4606a058e0d67328 (diff) | |
| parent | 3c386d9c15c86fee3ff7340f029683b1d1e197ed (diff) | |
merge DEV300_m83
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 3 | ||||
| -rw-r--r-- | smoketestoo_native/smoketest.cxx | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 0337c748d914..ec0d6be313c8 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -49,7 +49,8 @@ ALLTAR : cpptest cpptest : $(SHL1TARGETN) $(BIN)/smoketestdoc.sxw -OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw +TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw +CPPTEST_LIBRARY = $(SHL1TARGETN) $(BIN)/smoketestdoc.sxw: data/smoketestdoc.sxw $(COPY) $< $@ diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index e2cb51127f47..0d7e636f142b 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -53,7 +53,7 @@ #include "osl/diagnose.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "test/getargument.hxx" +#include "test/gettestargument.hxx" #include "test/officeconnection.hxx" #include "test/oustringostreaminserter.hxx" #include "test/toabsolutefileurl.hxx" @@ -121,8 +121,8 @@ void Test::tearDown() { void Test::test() { rtl::OUString doc; CPPUNIT_ASSERT( - test::getArgument( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("doc")), &doc)); + test::getTestArgument( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smoketest.doc")), &doc)); css::uno::Sequence< css::beans::PropertyValue > args(1); args[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("MacroExecutionMode")); @@ -141,10 +141,12 @@ void Test::test() { css::uno::Reference< css::frame::XController >( css::uno::Reference< css::frame::XModel >( css::uno::Reference< css::frame::XComponentLoader >( - connection_.getFactory()->createInstance( - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.frame.Desktop"))), + (connection_.getComponentContext()-> + getServiceManager()->createInstanceWithContext( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.frame.Desktop")), + connection_.getComponentContext())), css::uno::UNO_QUERY_THROW)->loadComponentFromURL( test::toAbsoluteFileUrl(doc), rtl::OUString( |