Skip to content

C
core
Kaydet (Commit) f0851f98 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Fix Extension_test-{active,passive} 

...by reverting part of 6f50961e "remove more
rtl::OUString and OString prefixes"

Change-Id: I50d37f437bb6f760c0d3990faaf71084913520f0
Reviewed-on: https://gerrit.libreoffice.org/65169
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst ff1016c0
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
desktop/test/deployment/active/active_native.cxx
Dosyayı görüntüle @ f0851f98
...@@ -69,9 +69,9 @@ public: ...@@ -69,9 +69,9 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext) css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Provider(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(); static_getSupportedServiceNames();
private: private:
...@@ -81,18 +81,18 @@ private: ...@@ -81,18 +81,18 @@ private:
virtual ~Provider() {} virtual ~Provider() {}
virtual OUString SAL_CALL getImplementationName() override virtual rtl::OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); } { return static_getImplementationName(); }
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); } { return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL virtual css::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames() override getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); } { return static_getSupportedServiceNames(); }
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
css::util::URL const &, OUString const &, sal_Int32) override; css::util::URL const &, rtl::OUString const &, sal_Int32) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
SAL_CALL queryDispatches( SAL_CALL queryDispatches(
...@@ -101,18 +101,18 @@ private: ...@@ -101,18 +101,18 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< css::uno::XComponentContext > context_;
}; };
OUString Provider::static_getImplementationName() { rtl::OUString Provider::static_getImplementationName() {
return OUString("com.sun.star.comp.test.deployment.active_native"); 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"); rtl::OUString name("com.sun.star.test.deployment.active_native");
return css::uno::Sequence< OUString >(&name, 1); return css::uno::Sequence< rtl::OUString >(&name, 1);
} }
css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( 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)
{ {
css::uno::Reference< css::frame::XDispatch > dispatch; css::uno::Reference< css::frame::XDispatch > dispatch;
if (!(context_->getValueByName( if (!(context_->getValueByName(
...@@ -156,11 +156,11 @@ public: ...@@ -156,11 +156,11 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext) css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Dispatch(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() static_getSupportedServiceNames()
{ return css::uno::Sequence< OUString >(); } { return css::uno::Sequence< rtl::OUString >(); }
private: private:
explicit Dispatch( explicit Dispatch(
...@@ -169,13 +169,13 @@ private: ...@@ -169,13 +169,13 @@ private:
virtual ~Dispatch() {} virtual ~Dispatch() {}
virtual OUString SAL_CALL getImplementationName() override virtual rtl::OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); } { return static_getImplementationName(); }
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); } { return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL virtual css::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames() override getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); } { return static_getSupportedServiceNames(); }
...@@ -196,8 +196,8 @@ private: ...@@ -196,8 +196,8 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< css::uno::XComponentContext > context_;
}; };
OUString Dispatch::static_getImplementationName() { rtl::OUString Dispatch::static_getImplementationName() {
return OUString( return rtl::OUString(
"com.sun.star.comp.test.deployment.active_native_singleton"); "com.sun.star.comp.test.deployment.active_native_singleton");
} }
......
desktop/test/deployment/passive/passive_native.cxx
Dosyayı görüntüle @ f0851f98
...@@ -66,9 +66,9 @@ public: ...@@ -66,9 +66,9 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext) css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Provider(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(); static_getSupportedServiceNames();
private: private:
...@@ -78,18 +78,18 @@ private: ...@@ -78,18 +78,18 @@ private:
virtual ~Provider() {} virtual ~Provider() {}
virtual OUString SAL_CALL getImplementationName() override virtual rtl::OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); } { return static_getImplementationName(); }
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); } { return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL virtual css::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames() override getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); } { return static_getSupportedServiceNames(); }
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
css::util::URL const &, OUString const &, sal_Int32) override; css::util::URL const &, rtl::OUString const &, sal_Int32) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
SAL_CALL queryDispatches( SAL_CALL queryDispatches(
...@@ -98,18 +98,18 @@ private: ...@@ -98,18 +98,18 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< css::uno::XComponentContext > context_;
}; };
OUString Provider::static_getImplementationName() { rtl::OUString Provider::static_getImplementationName() {
return OUString("com.sun.star.comp.test.deployment.passive_native"); 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"); rtl::OUString name("com.sun.star.test.deployment.passive_native");
return css::uno::Sequence< OUString >(&name, 1); return css::uno::Sequence< rtl::OUString >(&name, 1);
} }
css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch( 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)
{ {
css::uno::Reference< css::frame::XDispatch > dispatch; css::uno::Reference< css::frame::XDispatch > dispatch;
if (!(context_->getValueByName( if (!(context_->getValueByName(
...@@ -153,11 +153,11 @@ public: ...@@ -153,11 +153,11 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & xContext) css::uno::Reference< css::uno::XComponentContext > const & xContext)
{ return static_cast< cppu::OWeakObject * >(new Dispatch(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() static_getSupportedServiceNames()
{ return css::uno::Sequence< OUString >(); } { return css::uno::Sequence< rtl::OUString >(); }
private: private:
explicit Dispatch( explicit Dispatch(
...@@ -166,13 +166,13 @@ private: ...@@ -166,13 +166,13 @@ private:
virtual ~Dispatch() {} virtual ~Dispatch() {}
virtual OUString SAL_CALL getImplementationName() override virtual rtl::OUString SAL_CALL getImplementationName() override
{ return static_getImplementationName(); } { return static_getImplementationName(); }
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); } { return cppu::supportsService(this, ServiceName); }
virtual css::uno::Sequence< OUString > SAL_CALL virtual css::uno::Sequence< rtl::OUString > SAL_CALL
getSupportedServiceNames() override getSupportedServiceNames() override
{ return static_getSupportedServiceNames(); } { return static_getSupportedServiceNames(); }
...@@ -193,8 +193,8 @@ private: ...@@ -193,8 +193,8 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< css::uno::XComponentContext > context_;
}; };
OUString Dispatch::static_getImplementationName() { rtl::OUString Dispatch::static_getImplementationName() {
return OUString( return rtl::OUString(
"com.sun.star.comp.test.deployment.passive_native_singleton"); "com.sun.star.comp.test.deployment.passive_native_singleton");
} }
......
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