diff options
Diffstat (limited to 'framework/source/accelerators/documentacceleratorconfiguration.cxx')
| -rw-r--r-- | framework/source/accelerators/documentacceleratorconfiguration.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 39c32b3584ec..8019e81e5694 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -68,10 +68,8 @@ public: reference to an uno service manager, which is used internaly. */ DocumentAcceleratorConfiguration( - const css::uno::Reference< css::uno::XComponentContext >& xContext); - - void SAL_CALL constructorInit(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Sequence< css::uno::Any >& lArguments); virtual ~DocumentAcceleratorConfiguration(); @@ -114,13 +112,10 @@ private: //----------------------------------------------- DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration( - const css::uno::Reference< css::uno::XComponentContext >& xContext) + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments) : DocumentAcceleratorConfiguration_BASE(xContext) { -} - -void DocumentAcceleratorConfiguration::constructorInit(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) -{ WriteGuard aWriteLock(m_aLock); css::uno::Reference<css::embed::XStorage> xRoot; @@ -229,12 +224,9 @@ void DocumentAcceleratorConfiguration::impl_ts_clearCache() extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_framework_DocumentAcceleratorConfiguration_get_implementation( css::uno::XComponentContext *context, - cppu::constructor_InitializationFunc &init_func) + css::uno::Sequence<css::uno::Any> const &arguments) { - // 2nd phase initialization needed - init_func = static_cast<cppu::constructor_InitializationFunc>(&DocumentAcceleratorConfiguration::constructorInit); - - return static_cast<cppu::OWeakObject *>(new DocumentAcceleratorConfiguration(context)); + return cppu::acquire(new DocumentAcceleratorConfiguration(context, arguments)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |