[Libreoffice-commits] .: 2 commits - comphelper/inc dbaccess/source reportdesign/inc reportdesign/source toolkit/inc
Kohei Yoshida
kohei at kemper.freedesktop.org
Thu Aug 11 17:54:37 PDT 2011
comphelper/inc/comphelper/uno3.hxx | 15 ---------------
dbaccess/source/ui/app/AppController.hxx | 12 +++++++++---
dbaccess/source/ui/dlg/UserAdmin.hxx | 14 +++++++++++---
dbaccess/source/ui/inc/IItemSetHelper.hxx | 16 ++++++++++++----
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 14 +++++++++++---
dbaccess/source/ui/inc/UserAdminDlg.hxx | 14 +++++++++++---
dbaccess/source/ui/inc/dbadmin.hxx | 14 +++++++++++---
dbaccess/source/ui/inc/dbwiz.hxx | 14 +++++++++++---
dbaccess/source/ui/inc/dbwizsetup.hxx | 14 +++++++++++---
dbaccess/source/ui/inc/sbagrid.hxx | 9 ++++++---
reportdesign/inc/RptDef.hxx | 17 ++++++++++++-----
reportdesign/inc/UndoActions.hxx | 9 +++++++--
reportdesign/source/ui/inc/RptUndo.hxx | 13 ++++++++++---
toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx | 10 ++++++++--
14 files changed, 130 insertions(+), 55 deletions(-)
New commits:
commit ceb46895530a870e4b981d677f8fc7b3174460da
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Thu Aug 11 19:58:59 2011 -0400
Removed the rest of FORWARD_DECLARE_INTERFACE.
diff --git a/comphelper/inc/comphelper/uno3.hxx b/comphelper/inc/comphelper/uno3.hxx
index dff10cc..2a19990 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 c3bbd9c..95765bb 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 c16cab9..f63613a 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 1ac8295..504de52 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 3bb3e0f..eddabad 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
commit f871b281c91bfb2780619052705f864b6a566b6d
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Thu Aug 11 19:53:21 2011 -0400
No more FORWARD_DECLARE_INTERFACE in dbaccess.
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 8067846..a0a13fe 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 7345812..62f34e4 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 8d39925..d5bd905 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 e9c7880..ea39919 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 6315528..3db0c3b 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 a01314d..841bcfa 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 414a3a0..5510a51 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 a6b4db6..9211521 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 0d3dc74..344488a 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
More information about the Libreoffice-commits
mailing list