diff options
| -rw-r--r-- | comphelper/inc/comphelper/uno3.hxx | 15 | ||||
| -rw-r--r-- | reportdesign/inc/RptDef.hxx | 17 | ||||
| -rw-r--r-- | reportdesign/inc/UndoActions.hxx | 9 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/RptUndo.hxx | 13 | ||||
| -rw-r--r-- | toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx | 10 |
5 files changed, 37 insertions, 27 deletions
diff --git a/comphelper/inc/comphelper/uno3.hxx b/comphelper/inc/comphelper/uno3.hxx index dff10cc994d3..2a199905857e 100644 --- a/comphelper/inc/comphelper/uno3.hxx +++ b/comphelper/inc/comphelper/uno3.hxx @@ -274,21 +274,6 @@ namespace comphelper } return sal_False; } - #define FORWARD_DECLARE_INTERFACE(NAME,XFACE) \ - namespace com \ - { \ - namespace sun \ - {\ - namespace star \ - {\ - namespace NAME \ - {\ - class XFACE; \ - }\ - }\ - }\ - }\ - //......................................................................... } // namespace comphelper diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index c3bbd9cd1edc..95765bbe3f71 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -37,11 +37,18 @@ #include <svx/fmglob.hxx> #include <boost/shared_ptr.hpp> - -FORWARD_DECLARE_INTERFACE(report,XReportComponent) -FORWARD_DECLARE_INTERFACE(report,XReportDefinition) -FORWARD_DECLARE_INTERFACE(style,XStyle) -FORWARD_DECLARE_INTERFACE(beans,XPropertySet) +namespace com { namespace sun { namespace star { + namespace report { + class XReportComponent; + class XReportDefinition; + } + namespace style { + class XStyle; + } + namespace beans { + class XPropertySet; + } +}}} namespace rptui { diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index c16cab9900f0..f63613ac6473 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -60,8 +60,13 @@ #include <memory> #include <boost/shared_ptr.hpp> -FORWARD_DECLARE_INTERFACE(awt,XControl) -FORWARD_DECLARE_INTERFACE(awt,XControlContainer) +namespace com { namespace sun { namespace star { + namespace awt { + class XControl; + class XControlContainer; + } +}}} + namespace dbaui { class IController; diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 1ac8295fb7c2..504de5216457 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -31,9 +31,16 @@ #include "UndoActions.hxx" #include <functional> -FORWARD_DECLARE_INTERFACE(awt,XControl) -FORWARD_DECLARE_INTERFACE(awt,XControlContainer) -FORWARD_DECLARE_INTERFACE(drawing,XShape) +namespace com { namespace sun { namespace star { + namespace awt { + class XControl; + class XControlContainer; + } + namespace drawing { + class XShape; + } +}}} + namespace dbaui { class IController; diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx index 3bb3e0f3be49..eddabade1310 100644 --- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx @@ -43,8 +43,14 @@ #include <comphelper/IdPropArrayHelper.hxx> #include <comphelper/stl_types.hxx> -FORWARD_DECLARE_INTERFACE( lang, XMultiServiceFactory ) -FORWARD_DECLARE_INTERFACE( script, XNameContainer ) +namespace com { namespace sun { namespace star { + namespace lang { + class XMultiServiceFactory; + } + namespace script { + class XNameContainer; + } +}}} //........................................................................ // namespace toolkit |