No more FORWARD_DECLARE_INTERFACE in dbaccess.

9 files changed, 93 insertions, 28 deletions

diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 8067846c2c1e..a0a13fe0ecb4 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -65,9 +65,15 @@ class TransferableHelper;
 class TransferableClipboardListener;
 class SfxFilter;
 
-FORWARD_DECLARE_INTERFACE(container,XNameContainer)
-FORWARD_DECLARE_INTERFACE(container,XContainer)
-FORWARD_DECLARE_INTERFACE(ucb,XContent)
+namespace com { namespace sun { namespace star {
+    namespace container {
+        class XNameContainer;
+        class XContainer;
+    }
+    namespace ucb {
+        class XContent;
+    }
+}}}
 
 //........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 73458126dbb1..62f34e453a86 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -38,9 +38,17 @@
 #include "adminpages.hxx"
 #include <comphelper/uno3.hxx>
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx
index 8d39925c33e0..d5bd9058582f 100644
--- a/dbaccess/source/ui/inc/IItemSetHelper.hxx
+++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx
@@ -33,10 +33,18 @@
 #include <comphelper/uno3.hxx>
 #include "dsntypes.hxx"
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(sdbc,XDriver)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+        class XDriver;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 class SfxItemSet;
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index e9c7880caf9c..ea399195c9bc 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -36,9 +36,17 @@
 
 #include <memory>
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 //.........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 6315528cda88..3db0c3bf5d41 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -36,9 +36,17 @@
 #include "moduledbu.hxx"
 #include <memory>
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 //.........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index a01314d188c1..841bcfabbc2c 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -36,9 +36,17 @@
 #include <comphelper/uno3.hxx>
 #include <memory>
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 //.........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 414a3a0b5108..5510a51c7fc1 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -37,9 +37,17 @@
 #include "moduledbu.hxx"
 #include <memory>
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index a6b4db6b6b02..921152162b1c 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -39,9 +39,17 @@
 #include <connectivity/dbtools.hxx>
 #include "moduledbu.hxx"
 
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
-FORWARD_DECLARE_INTERFACE(sdbc,XConnection)
-FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+    namespace sdbc {
+        class XConnection;
+    }
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
 
 //.........................................................................
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 0d3dc746fa2b..344488aad77f 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -44,6 +44,12 @@
 
 class SvNumberFormatter;
 
+namespace com { namespace sun { namespace star {
+    namespace lang {
+        class XMultiServiceFactory;
+    }
+}}}
+
 namespace dbaui
 {
     //------------------------------------------------------------------
@@ -60,9 +66,6 @@ namespace dbaui
     // SbaXGridControl
     //==================================================================
 
-    //  class ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ;
-    FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory)
-
     class SbaXStatusMultiplexer;
     class SbaXGridControl
                 :public FmXGridControl