Kaydet (Commit) 5830799d authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

macros_test: use "css" short form

Change-Id: I2e8d8773703df67d090059be8bd9f3c7c7335f78
üst 69fe1066
...@@ -27,10 +27,10 @@ namespace unotest { ...@@ -27,10 +27,10 @@ namespace unotest {
class OOO_DLLPUBLIC_UNOTEST MacrosTest class OOO_DLLPUBLIC_UNOTEST MacrosTest
{ {
public: public:
com::sun::star::uno::Reference< com::sun::star::lang::XComponent > loadFromDesktop(const OUString& rURL, const OUString& rDocService = OUString() ); css::uno::Reference< css::lang::XComponent > loadFromDesktop(const OUString& rURL, const OUString& rDocService = OUString() );
protected: protected:
com::sun::star::uno::Reference< com::sun::star::frame::XDesktop2> mxDesktop; css::uno::Reference< css::frame::XDesktop2> mxDesktop;
}; };
} }
......
...@@ -15,21 +15,20 @@ ...@@ -15,21 +15,20 @@
#include "cppunit/TestAssert.h" #include "cppunit/TestAssert.h"
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
using namespace com::sun::star; using namespace css;
namespace unotest { namespace unotest {
uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(const OUString& rURL, const OUString& rDocService) uno::Reference<css::lang::XComponent> MacrosTest::loadFromDesktop(const OUString& rURL, const OUString& rDocService)
{ {
CPPUNIT_ASSERT_MESSAGE("no desktop", mxDesktop.is()); CPPUNIT_ASSERT_MESSAGE("no desktop", mxDesktop.is());
uno::Reference< com::sun::star::frame::XComponentLoader> xLoader = uno::Reference< com::sun::star::frame::XComponentLoader >( mxDesktop, uno::UNO_QUERY ); uno::Reference<frame::XComponentLoader> xLoader = uno::Reference<frame::XComponentLoader>(mxDesktop, uno::UNO_QUERY);
CPPUNIT_ASSERT_MESSAGE("no loader", xLoader.is()); CPPUNIT_ASSERT_MESSAGE("no loader", xLoader.is());
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > args(1); uno::Sequence<beans::PropertyValue> args(1);
args[0].Name = "MacroExecutionMode"; args[0].Name = "MacroExecutionMode";
args[0].Handle = -1; args[0].Handle = -1;
args[0].Value <<= args[0].Value <<= document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN; args[0].State = beans::PropertyState_DIRECT_VALUE;
args[0].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
if (!rDocService.isEmpty()) if (!rDocService.isEmpty())
{ {
...@@ -37,10 +36,10 @@ uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(c ...@@ -37,10 +36,10 @@ uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(c
args[1].Name = "DocumentService"; args[1].Name = "DocumentService";
args[1].Handle = -1; args[1].Handle = -1;
args[1].Value <<= rDocService; args[1].Value <<= rDocService;
args[1].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; args[1].State = beans::PropertyState_DIRECT_VALUE;
} }
uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, OUString("_default"), 0, args); uno::Reference<lang::XComponent> xComponent = xLoader->loadComponentFromURL(rURL, OUString("_default"), 0, args);
OUString sMessage = "loading failed: " + rURL; OUString sMessage = "loading failed: " + rURL;
CPPUNIT_ASSERT_MESSAGE(OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is()); CPPUNIT_ASSERT_MESSAGE(OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is());
return xComponent; return xComponent;
......
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