diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-20 22:41:38 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2013-12-20 22:58:29 +0100 |
| commit | 09af884e7b5712e0311a4c122a5213e7c89f626e (patch) | |
| tree | f4291ccbae836111fa05ff6404f1b53d1ca94450 /svx/source/inc | |
| parent | Spelling correction: s/retrive/retrieve/ (diff) | |
| download | core-09af884e7b5712e0311a4c122a5213e7c89f626e.tar.gz core-09af884e7b5712e0311a4c122a5213e7c89f626e.zip | |
Revert "svx: split into direct implementation getFactories"
Also reverts "These services are in fact implemented in svxcore library."
This reverts commit 090674dcb085cd41f4628e4f07c9a2268a18e862
and commit 4a969ac35174520f1ffeb4f919f5d7bb6d99a628.
This is embarrassing; needs more work.
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/recoveryui.hxx | 12 | ||||
| -rw-r--r-- | svx/source/inc/unogalthemeprovider.hxx | 15 |
2 files changed, 24 insertions, 3 deletions
diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 46c867db2f96..38febbbbf433 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -28,7 +28,8 @@ #include "docrecovery.hxx" -namespace { +namespace svx +{ namespace svxdr = ::svx::DocRecovery; @@ -108,6 +109,13 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo const css::util::URL& aURL ) throw(css::uno::RuntimeException); + //--------------------------------------- + // XServiceInfo helper + + static OUString st_getImplementationName(); + static css::uno::Sequence< OUString > st_getSupportedServiceNames(); + static css::uno::Reference< css::uno::XInterface > SAL_CALL st_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + //------------------------------------------- // helper private: @@ -124,7 +132,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo }; -} +} // namespace svx #endif // INCLUDED_SVX_SOURCE_INC_RECOVERYUI_HXX diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index 74e77dc6e461..8d1cd680c08f 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -25,9 +25,19 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/gallery/XGalleryThemeProvider.hpp> +#include <svx/svxdllapi.h> + class Gallery; -namespace { +namespace unogallery { + +// ------------------------- +// - some helper functions - +// ------------------------- + +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw(); +OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw(); // ----------------- // - GalleryThemes - @@ -41,6 +51,9 @@ public: GalleryThemeProvider(); ~GalleryThemeProvider(); + SVX_DLLPUBLIC static OUString getImplementationName_Static() throw(); + SVX_DLLPUBLIC static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); + protected: // XServiceInfo |