diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-07 12:26:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-07 14:00:27 +0200 |
| commit | a83740ebcf91649ff2611582b124bf2d0ce2e133 (patch) | |
| tree | 1de0ecf46457a01d3125c8cd33ba3cd6eddfbc3b /framework/inc/services/layoutmanager.hxx | |
| parent | cb9be0e492d047648185ae80553220fd9b538746 (diff) | |
framework: cleanup xtypeprovider.hxx includes
LayoutManager uses macro impl from comphelper, so use declarations
from comphelper too.
Change-Id: I638492849742782d48c3bb5439c2255e72f9f694
Reviewed-on: https://gerrit.libreoffice.org/38496
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc/services/layoutmanager.hxx')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 6b151785eefa..7dca5f09269e 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX -#include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> #include <properties.h> #include <stdtypes.h> #include <uielement/menubarmanager.hxx> @@ -52,6 +50,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertycontainer.hxx> +#include <comphelper/uno3.hxx> #include <tools/wintypes.hxx> #include <svtools/miscopt.hxx> #include <vcl/toolbox.hxx> @@ -82,8 +81,8 @@ namespace framework virtual ~LayoutManager() override; /** declaration of XInterface, XTypeProvider, XServiceInfo */ - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER + DECLARE_XINTERFACE() + DECLARE_XTYPEPROVIDER() virtual OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.framework.LayoutManager"); |