[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc

[Kohei Yoshida]

 binfilter/bf_svx/source/inc/fmpgeimp.hxx |   14 ++++++++++----
 binfilter/bf_svx/source/inc/fmundo.hxx   |   13 +++++++------
 binfilter/bf_svx/source/inc/fmvwimp.hxx  |   19 ++++++++++++++-----
 binfilter/bf_svx/source/inc/taborder.hxx |    8 ++++++--
 binfilter/inc/bf_svx/fmpage.hxx          |    8 ++++++--
 binfilter/inc/bf_svx/fmsearch.hxx        |   12 +++++++-----
 binfilter/inc/bf_svx/fmview.hxx          |   11 +++++++++--
 7 files changed, 59 insertions(+), 26 deletions(-)

New commits:
commit b769354d56609af8e9fadeffc312dac3478cd055
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Aug 11 22:26:00 2011 -0400

    Squashed all uses of FORWARD_DECLARE_INTERFACE.

diff --git a/binfilter/bf_svx/source/inc/fmpgeimp.hxx b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
index ec8a0f4..3beb686 100644
--- a/binfilter/bf_svx/source/inc/fmpgeimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmpgeimp.hxx
@@ -38,10 +38,16 @@
 
 #include <vector>
 
-#include <comphelper/uno3.hxx>
-FORWARD_DECLARE_INTERFACE(io,XObjectOutputStream)
-FORWARD_DECLARE_INTERFACE(io,XObjectInputStream)
-FORWARD_DECLARE_INTERFACE(container,XIndexContainer)
+namespace com { namespace sun { namespace star {
+    namespace io {
+        class XObjectOutputStream;
+        class XObjectInputStream;
+    }
+    namespace container {
+        class XIndexContainer;
+    }
+}}}
+
 class SvStream;
 namespace binfilter {
 
diff --git a/binfilter/bf_svx/source/inc/fmundo.hxx b/binfilter/bf_svx/source/inc/fmundo.hxx
index 85db88e..ae4669a 100644
--- a/binfilter/bf_svx/source/inc/fmundo.hxx
+++ b/binfilter/bf_svx/source/inc/fmundo.hxx
@@ -36,14 +36,15 @@
 
 #include <cppuhelper/implbase3.hxx>
 
-
-
-
 #include "svdouno.hxx"
 
-#include <comphelper/uno3.hxx>
-FORWARD_DECLARE_INTERFACE(awt,XControl)
-FORWARD_DECLARE_INTERFACE(awt,XControlContainer)
+namespace com { namespace sun { namespace star {
+    namespace awt {
+        class XControl;
+        class XControlContainer;
+    }
+}}}
+
 namespace binfilter {
 
 class FmFormModel;
diff --git a/binfilter/bf_svx/source/inc/fmvwimp.hxx b/binfilter/bf_svx/source/inc/fmvwimp.hxx
index 8d67dc8..bf3346d 100644
--- a/binfilter/bf_svx/source/inc/fmvwimp.hxx
+++ b/binfilter/bf_svx/source/inc/fmvwimp.hxx
@@ -42,13 +42,22 @@
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
-#include <comphelper/uno3.hxx>
 
 #include "svdmark.hxx"
-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 Window;
 class OutputDevice;
 namespace binfilter {
diff --git a/binfilter/bf_svx/source/inc/taborder.hxx b/binfilter/bf_svx/source/inc/taborder.hxx
index 569951c..3b63b21 100644
--- a/binfilter/bf_svx/source/inc/taborder.hxx
+++ b/binfilter/bf_svx/source/inc/taborder.hxx
@@ -46,8 +46,12 @@
 class SdrModel;
 class ImageList;
 
-#include <comphelper/uno3.hxx>
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
+namespace com { namespace sun { namespace star {
+    namespace beans {
+        class XPropertySet;
+    }
+}}}
+
 namespace binfilter {
 
 //========================================================================
diff --git a/binfilter/inc/bf_svx/fmpage.hxx b/binfilter/inc/bf_svx/fmpage.hxx
index 969a0a0..d46af56 100644
--- a/binfilter/inc/bf_svx/fmpage.hxx
+++ b/binfilter/inc/bf_svx/fmpage.hxx
@@ -33,8 +33,12 @@
 
 #include <bf_svx/svdpage.hxx>
 
-#include <comphelper/uno3.hxx>
-FORWARD_DECLARE_INTERFACE(container,XNameContainer)
+namespace com { namespace sun { namespace star {
+    namespace container {
+        class XNameContainer;
+    }
+}}}
+
 namespace binfilter {
 
 class StarBASIC;
diff --git a/binfilter/inc/bf_svx/fmsearch.hxx b/binfilter/inc/bf_svx/fmsearch.hxx
index 4e3ddac..197f15f 100644
--- a/binfilter/inc/bf_svx/fmsearch.hxx
+++ b/binfilter/inc/bf_svx/fmsearch.hxx
@@ -48,13 +48,15 @@
 
 #include <tools/link.hxx>
 
-
-#include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
-FORWARD_DECLARE_INTERFACE(util,XNumberFormatsSupplier)
-namespace binfilter {
 
-//FORWARD_DECLARE_INTERFACE(uno,Reference)
+namespace com { namespace sun { namespace star {
+    namespace util {
+        class XNumberFormatsSupplier;
+    }
+}}}
+
+namespace binfilter {
 
 // ===================================================================================================
 // moegliche Rueckgabewerte fuer den Found-Handler
diff --git a/binfilter/inc/bf_svx/fmview.hxx b/binfilter/inc/bf_svx/fmview.hxx
index 1a80b4a..84a3fa0 100644
--- a/binfilter/inc/bf_svx/fmview.hxx
+++ b/binfilter/inc/bf_svx/fmview.hxx
@@ -38,8 +38,15 @@
 #include <bf_svx/view3d.hxx>
 #include <comphelper/uno3.hxx>
 
-FORWARD_DECLARE_INTERFACE(util,XNumberFormats)
-FORWARD_DECLARE_INTERFACE(beans,XPropertySet)
+namespace com { namespace sun { namespace star {
+    namespace util {
+        class XNumberFormats;
+    }
+    namespace beans {
+        class XPropertySet;
+    }
+}}}
+
 class OutputDevice;
 namespace binfilter {
 class ExtOutputDevice;