Kaydet (Commit) dd6424c9 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix Extension_test-{active,passive}

Change-Id: Ibfa00b98bde90e1a84e19637179be83449b7743d
üst 80e6eab7
...@@ -68,9 +68,9 @@ public: ...@@ -68,9 +68,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:
...@@ -80,20 +80,20 @@ private: ...@@ -80,20 +80,20 @@ private:
virtual ~Provider() {} virtual ~Provider() {}
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException) SAL_OVERRIDE throw (css::uno::RuntimeException) SAL_OVERRIDE
{ return static_getImplementationName(); } { 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 throw (css::uno::RuntimeException) SAL_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() throw (css::uno::RuntimeException) SAL_OVERRIDE getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_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) css::util::URL const &, rtl::OUString const &, sal_Int32)
throw (css::uno::RuntimeException) SAL_OVERRIDE; throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
...@@ -104,18 +104,18 @@ private: ...@@ -104,18 +104,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)
throw (css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
css::uno::Reference< css::frame::XDispatch > dispatch; css::uno::Reference< css::frame::XDispatch > dispatch;
...@@ -159,11 +159,11 @@ public: ...@@ -159,11 +159,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:
Dispatch( Dispatch(
...@@ -172,15 +172,15 @@ private: ...@@ -172,15 +172,15 @@ private:
virtual ~Dispatch() {} virtual ~Dispatch() {}
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException) SAL_OVERRIDE throw (css::uno::RuntimeException) SAL_OVERRIDE
{ return static_getImplementationName(); } { 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 throw (css::uno::RuntimeException) SAL_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() throw (css::uno::RuntimeException) SAL_OVERRIDE getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
{ return static_getSupportedServiceNames(); } { return static_getSupportedServiceNames(); }
...@@ -204,8 +204,8 @@ private: ...@@ -204,8 +204,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");
} }
......
...@@ -65,9 +65,9 @@ public: ...@@ -65,9 +65,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:
...@@ -77,20 +77,20 @@ private: ...@@ -77,20 +77,20 @@ private:
virtual ~Provider() {} virtual ~Provider() {}
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException) SAL_OVERRIDE throw (css::uno::RuntimeException) SAL_OVERRIDE
{ return static_getImplementationName(); } { 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 throw (css::uno::RuntimeException) SAL_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() throw (css::uno::RuntimeException) SAL_OVERRIDE getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_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) css::util::URL const &, rtl::OUString const &, sal_Int32)
throw (css::uno::RuntimeException) SAL_OVERRIDE; throw (css::uno::RuntimeException) SAL_OVERRIDE;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
...@@ -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.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)
throw (css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
css::uno::Reference< css::frame::XDispatch > dispatch; css::uno::Reference< css::frame::XDispatch > dispatch;
...@@ -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:
Dispatch( Dispatch(
...@@ -169,15 +169,15 @@ private: ...@@ -169,15 +169,15 @@ private:
virtual ~Dispatch() {} virtual ~Dispatch() {}
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException) SAL_OVERRIDE throw (css::uno::RuntimeException) SAL_OVERRIDE
{ return static_getImplementationName(); } { 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 throw (css::uno::RuntimeException) SAL_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() throw (css::uno::RuntimeException) SAL_OVERRIDE getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE
{ return static_getSupportedServiceNames(); } { return static_getSupportedServiceNames(); }
...@@ -201,8 +201,8 @@ private: ...@@ -201,8 +201,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