diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /desktop/test/deployment/passive/passive_native.cxx | |
parent | 4e729de73f2947155248f8df5897380611b87917 (diff) |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop/test/deployment/passive/passive_native.cxx')
-rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 83b955a00313..ea62f7b0112f 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -66,9 +66,9 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } - static rtl::OUString SAL_CALL static_getImplementationName(); + static OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< rtl::OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL static_getSupportedServiceNames(); private: @@ -78,18 +78,18 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() override + virtual OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) override; + css::util::URL const &, OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( @@ -98,18 +98,18 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -rtl::OUString Provider::static_getImplementationName() { - return rtl::OUString("com.sun.star.comp.test.deployment.passive_native"); +OUString Provider::static_getImplementationName() { + return OUString("com.sun.star.comp.test.deployment.passive_native"); } -css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames() +css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames() { - rtl::OUString name("com.sun.star.test.deployment.passive_native"); - return css::uno::Sequence< rtl::OUString >(&name, 1); + OUString name("com.sun.star.test.deployment.passive_native"); + return css::uno::Sequence< OUString >(&name, 1); } css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) + css::util::URL const &, OUString const &, sal_Int32) { css::uno::Reference< css::frame::XDispatch > dispatch; if (!(context_->getValueByName( @@ -153,11 +153,11 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } - static rtl::OUString SAL_CALL static_getImplementationName(); + static OUString SAL_CALL static_getImplementationName(); - static css::uno::Sequence< rtl::OUString > SAL_CALL + static css::uno::Sequence< OUString > SAL_CALL static_getSupportedServiceNames() - { return css::uno::Sequence< rtl::OUString >(); } + { return css::uno::Sequence< OUString >(); } private: explicit Dispatch( @@ -166,13 +166,13 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() override + virtual OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return static_getSupportedServiceNames(); } @@ -193,8 +193,8 @@ private: css::uno::Reference< css::uno::XComponentContext > context_; }; -rtl::OUString Dispatch::static_getImplementationName() { - return rtl::OUString( +OUString Dispatch::static_getImplementationName() { + return OUString( "com.sun.star.comp.test.deployment.passive_native_singleton"); } |