diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-26 16:24:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-03-07 08:23:38 +0200 |
| commit | cd8ea20aa4b85128956a79c80f7953d30e99e802 (patch) | |
| tree | 2ec962196db84427e97bbc9bb73f9566d70b6fd1 /framework/inc | |
| parent | 1b4b53a2ecd7f2283a2c86b2c474786918cbfbf2 (diff) | |
fdo#46808, Convert ui::UIConfigurationManager to new-style
Change-Id: I62c37eb6d0e0b2a681a84e1fa0067d0a9f967cf2
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/framework/configimporter.hxx | 4 | ||||
| -rw-r--r-- | framework/inc/services.h | 2 | ||||
| -rw-r--r-- | framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 12 |
3 files changed, 4 insertions, 14 deletions
diff --git a/framework/inc/framework/configimporter.hxx b/framework/inc/framework/configimporter.hxx index ab151ee8d059..06b6467f6c2a 100644 --- a/framework/inc/framework/configimporter.hxx +++ b/framework/inc/framework/configimporter.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/ui/XUIConfigurationManager.hpp> +#include <com/sun/star/ui/XUIConfigurationManager2.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ustring.hxx> @@ -34,7 +34,7 @@ namespace framework { public: static sal_Bool ImportCustomToolbars( - const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >& rContainerFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 >& rContainerFactory, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > >& rSeqContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rToolbarStorage ); diff --git a/framework/inc/services.h b/framework/inc/services.h index 6fb4b45c723e..956568db3721 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -41,7 +41,6 @@ namespace framework{ #define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" ) #define SERVICENAME_LAYOUTMANAGER DECLARE_ASCII("com.sun.star.frame.LayoutManager" ) #define SERVICENAME_POPUPMENUCONTROLLER DECLARE_ASCII("com.sun.star.frame.PopupMenuController" ) -#define SERVICENAME_UICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.UIConfigurationManager" ) #define SERVICENAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.ModuleUIConfigurationManager" ) #define SERVICENAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.ui.UIElementFactory" ) #define SERVICENAME_FRAMECONTROLLER DECLARE_ASCII("com.sun.star.frame.Controller" ) @@ -94,7 +93,6 @@ namespace framework{ #define IMPLEMENTATIONNAME_UICOMMANDDESCRIPTION DECLARE_ASCII("com.sun.star.comp.framework.UICommandDescription" ) #define IMPLEMENTATIONNAME_UIELEMENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.UIElementFactoryManager" ) #define IMPLEMENTATIONNAME_MODULEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ModuleManager" ) -#define IMPLEMENTATIONNAME_UICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.comp.framework.UIConfigurationManager" ) #define IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGERSUPPLIER DECLARE_ASCII("com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier" ) #define IMPLEMENTATIONNAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ModuleUIConfigurationManager" ) #define IMPLEMENTATIONNAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.MenuBarFactory" ) diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 6d93a74430a2..68d301453197 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -39,11 +39,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> - -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> -#include <com/sun/star/ui/XUIConfigurationManager.hpp> +#include <com/sun/star/ui/XUIConfigurationManager2.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/container/XIndexContainer.hpp> @@ -57,11 +53,7 @@ namespace framework { class UIConfigurationManager : public com::sun::star::lang::XTypeProvider , public com::sun::star::lang::XServiceInfo , - public com::sun::star::lang::XComponent , - public ::com::sun::star::ui::XUIConfiguration , - public ::com::sun::star::ui::XUIConfigurationManager , - public ::com::sun::star::ui::XUIConfigurationPersistence , - public ::com::sun::star::ui::XUIConfigurationStorage , + public com::sun::star::ui::XUIConfigurationManager2 , private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject { |