diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-03 14:10:21 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-03 14:10:21 +0100 |
commit | dd6424c9f9647947a24dfe968fdb4126ee19dc10 (patch) | |
tree | e3a297a48689cf44cdcf32fc67fbee5912198e10 | |
parent | 80e6eab7014b8b0215a442296d517c2bd4ad8c82 (diff) |
Fix Extension_test-{active,passive}
Change-Id: Ibfa00b98bde90e1a84e19637179be83449b7743d
-rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 40 | ||||
-rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 40 |
2 files changed, 40 insertions, 40 deletions
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index b65cff58f843..c88e19184da3 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -68,9 +68,9 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } - static OUString SAL_CALL static_getImplementationName(); + static rtl::OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< rtl::OUString > SAL_CALL static_getSupportedServiceNames(); private: @@ -80,20 +80,20 @@ private: virtual ~Provider() {} - virtual OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, OUString const &, sal_Int32) + css::util::URL const &, rtl::OUString const &, sal_Int32) throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > @@ -104,18 +104,18 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -OUString Provider::static_getImplementationName() { - return OUString("com.sun.star.comp.test.deployment.active_native"); +rtl::OUString Provider::static_getImplementationName() { + return rtl::OUString("com.sun.star.comp.test.deployment.active_native"); } -css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames() +css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() { - OUString name("com.sun.star.test.deployment.active_native"); - return css::uno::Sequence< OUString >(&name, 1); + rtl::OUString name("com.sun.star.test.deployment.active_native"); + return css::uno::Sequence< rtl::OUString >(&name, 1); } css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( - css::util::URL const &, OUString const &, sal_Int32) + css::util::URL const &, rtl::OUString const &, sal_Int32) throw (css::uno::RuntimeException) { css::uno::Reference< css::frame::XDispatch > dispatch; @@ -159,11 +159,11 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } - static OUString SAL_CALL static_getImplementationName(); + static rtl::OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< rtl::OUString > SAL_CALL static_getSupportedServiceNames() - { return css::uno::Sequence< OUString >(); } + { return css::uno::Sequence< rtl::OUString >(); } private: Dispatch( @@ -172,15 +172,15 @@ private: virtual ~Dispatch() {} - virtual OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } @@ -204,8 +204,8 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -OUString Dispatch::static_getImplementationName() { - return OUString( +rtl::OUString Dispatch::static_getImplementationName() { + return rtl::OUString( "com.sun.star.comp.test.deployment.active_native_singleton"); } diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 2e64bccbda5e..b7325f629057 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -65,9 +65,9 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } - static OUString SAL_CALL static_getImplementationName(); + static rtl::OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< rtl::OUString > SAL_CALL static_getSupportedServiceNames(); private: @@ -77,20 +77,20 @@ private: virtual ~Provider() {} - virtual OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, OUString const &, sal_Int32) + css::util::URL const &, rtl::OUString const &, sal_Int32) throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > @@ -101,18 +101,18 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -OUString Provider::static_getImplementationName() { - return OUString("com.sun.star.comp.test.deployment.passive_native"); +rtl::OUString Provider::static_getImplementationName() { + return rtl::OUString("com.sun.star.comp.test.deployment.passive_native"); } -css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames() +css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() { - OUString name("com.sun.star.test.deployment.passive_native"); - return css::uno::Sequence< OUString >(&name, 1); + rtl::OUString name("com.sun.star.test.deployment.passive_native"); + return css::uno::Sequence< rtl::OUString >(&name, 1); } css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( - css::util::URL const &, OUString const &, sal_Int32) + css::util::URL const &, rtl::OUString const &, sal_Int32) throw (css::uno::RuntimeException) { css::uno::Reference< css::frame::XDispatch > dispatch; @@ -156,11 +156,11 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } - static OUString SAL_CALL static_getImplementationName(); + static rtl::OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< OUString > SAL_CALL + static css::uno::Sequence< rtl::OUString > SAL_CALL static_getSupportedServiceNames() - { return css::uno::Sequence< OUString >(); } + { return css::uno::Sequence< rtl::OUString >(); } private: Dispatch( @@ -169,15 +169,15 @@ private: virtual ~Dispatch() {} - virtual OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } @@ -201,8 +201,8 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -OUString Dispatch::static_getImplementationName() { - return OUString( +rtl::OUString Dispatch::static_getImplementationName() { + return rtl::OUString( "com.sun.star.comp.test.deployment.passive_native_singleton"); } |