Let's not use macros for mere forward declarations.

This macro also messed up static analysis of slickedit.

7 files changed, 51 insertions, 18 deletions

diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 8c32e46073a4..18058c7d82b9 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -37,7 +37,11 @@ class StarBASIC;
 class FmFormModel;
 class FmFormPageImpl;   // contains a list of all forms
 
-FORWARD_DECLARE_INTERFACE(container,XNameContainer)
+namespace com { namespace sun { namespace star {
+    namespace container {
+        class XNameContainer;
+    }
+}}}
 
 class SdrView;
 class SfxJSArray;
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index c74592c18caa..1f6c7ed88b17 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -49,7 +49,11 @@
 #include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
-FORWARD_DECLARE_INTERFACE(util,XNumberFormatsSupplier)
+namespace com { namespace sun { namespace star {
+    namespace util {
+        class XNumberFormatsSupplier;
+    }
+}}}
 
 // ===================================================================================================
 // Hilfsmethoden
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index f9dd40edbd8e..80e7067dbdda 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -33,8 +33,14 @@
 #include <comphelper/uno3.hxx>
 #include "svx/svxdllapi.h"
 
-FORWARD_DECLARE_INTERFACE(util,XNumberFormats)
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace util {
+        class XNumberFormats;
+    }
+}}}
 
 class OutputDevice;
 class FmFormModel;
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 304426d4d74d..9cefcae57ac6 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -31,9 +31,12 @@
 
 #include <svl/poolitem.hxx>
 #include <comphelper/uno3.hxx>
-//  FORWARD_DECLARE_INTERFACE(awt,XControlContainer)
-FORWARD_DECLARE_INTERFACE(uno,Any)
-//  class ::com::sun::star::uno::Any;
+
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        class Any;
+    }
+}}}
 
 //==================================================================
 class FmInterfaceItem : public SfxPoolItem
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index a62225d898cc..0f39df015b11 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -49,10 +49,15 @@ class FmFormObj;
 class FmFormPage;
 class SdrObject;
 
-//FORWARD_DECLARE_INTERFACE(uno,Reference)
-FORWARD_DECLARE_INTERFACE(io,XObjectOutputStream)
-FORWARD_DECLARE_INTERFACE(io,XObjectInputStream)
-FORWARD_DECLARE_INTERFACE(container,XIndexContainer)
+namespace com { namespace sun { namespace star {
+    namespace container {
+        class XIndexContainer;
+    }
+    namespace io {
+        class XObjectOutputStream;
+        class XObjectInputStream;
+    }
+}}}
 
 class SdrObjList;
 
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 76cf870e2242..3451f7c78e49 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -57,9 +57,12 @@ class FmFormObj;
 class SdrObject;
 class FmXFormView;
 
-FORWARD_DECLARE_INTERFACE(awt,XControl)
-FORWARD_DECLARE_INTERFACE(awt,XControlContainer)
-//FORWARD_DECLARE_INTERFACE(uno,Reference)
+namespace com { namespace sun { namespace star {
+    namespace awt {
+        class XControl;
+        class XControlContainer;;
+    }
+}}}
 
 //==================================================================
 // FmUndoPropertyAction
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 341d9534e018..81332aa21ac8 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -68,10 +68,18 @@ class OutputDevice;
 class SdrUnoObj;
 class SdrView;
 
-FORWARD_DECLARE_INTERFACE(awt,XControl)
-FORWARD_DECLARE_INTERFACE(awt,XWindow)
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(util,XNumberFormats)
+namespace com { namespace sun { namespace star {
+    namespace awt {
+        class XControl;
+        class XWindow;
+    }
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace util {
+        class XNumberFormats;
+    }
+}}}
 
 class FmXFormView;