[Libreoffice-commits] core.git: sw/inc

[Stephan Bergmann]

 sw/inc/unotxdoc.hxx |   47 +++++------------------------------------------
 1 file changed, 5 insertions(+), 42 deletions(-)

New commits:
commit 4a56aa6a3c4e51fdb2ae304b36bc4eeb2d5647c7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 7 15:21:56 2015 +0100

    No need for implbase_ex_pre/post.hxx no more
    
    Change-Id: I90ffc2abbcc80128211540cef991a217fa2ef1e4

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 5102fa0..a837c76 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -65,8 +65,7 @@
 #include <svx/fmdmod.hxx>
 #include <editeng/UnoForbiddenCharsTable.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/ITiledRenderable.hxx>
 
 #include <unobaseclass.hxx>
@@ -74,42 +73,6 @@
 
 #include <deque>
 
-#define __IFC32 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
-Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31, Ifc32
-
-#define __CLASS_IFC32 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
-class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13, class Ifc14, class Ifc15, class Ifc16, \
-class Ifc17, class Ifc18, class Ifc19, class Ifc20, class Ifc21, class Ifc22, class Ifc23, class Ifc24,\
-class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31 , class Ifc32
-
-#define __PUBLIC_IFC32 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
-public Ifc13, public Ifc14, public Ifc15, public Ifc16, public Ifc17, public Ifc18, \
-public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23, public Ifc24, \
-public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc30, \
-public Ifc31, public Ifc32
-#include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/implbase_ex_pre.hxx>
-#define __IFC_EX_TYPE_INIT32( class_cast ) \
-    __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 3 ), __IFC_EX_TYPE_INIT( class_cast, 4 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 5 ), __IFC_EX_TYPE_INIT( class_cast, 6 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 7 ), __IFC_EX_TYPE_INIT( class_cast, 8 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 9 ), __IFC_EX_TYPE_INIT( class_cast, 10 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 11 ), __IFC_EX_TYPE_INIT( class_cast, 12 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 13 ), __IFC_EX_TYPE_INIT( class_cast, 14 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 15 ), __IFC_EX_TYPE_INIT( class_cast, 16 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 17 ), __IFC_EX_TYPE_INIT( class_cast, 18 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 19 ), __IFC_EX_TYPE_INIT( class_cast, 20 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 21 ), __IFC_EX_TYPE_INIT( class_cast, 22 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 23 ), __IFC_EX_TYPE_INIT( class_cast, 24 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 25 ), __IFC_EX_TYPE_INIT( class_cast, 26 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 27 ), __IFC_EX_TYPE_INIT( class_cast, 28 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 29 ), __IFC_EX_TYPE_INIT( class_cast, 30 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 31 ), __IFC_EX_TYPE_INIT( class_cast, 32)
-#include <cppuhelper/implbase_ex_post.hxx>
-
-__DEF_IMPLHELPER_EX( 32 )
-
 class SwDoc;
 class SwDocShell;
 class UnoActionContext;
@@ -125,7 +88,7 @@ class SwViewShell;
 
 typedef std::deque<UnoActionContext*> ActionContextArr;
 
-typedef cppu::WeakImplHelper32
+typedef cppu::WeakImplHelper
 <
     css::text::XTextDocument,
     css::text::XLineNumberingProperties,
@@ -472,7 +435,7 @@ public:
 
 };
 
-class SwXLinkTargetSupplier : public cppu::WeakImplHelper2
+class SwXLinkTargetSupplier : public cppu::WeakImplHelper
 <
     css::container::XNameAccess,
     css::lang::XServiceInfo
@@ -508,7 +471,7 @@ public:
     void    Invalidate() {pxDoc = 0;}
 };
 
-class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
+class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper
 <
     css::beans::XPropertySet,
     css::container::XNameAccess,
@@ -558,7 +521,7 @@ public:
 
 };
 
-class SwXOutlineTarget : public cppu::WeakImplHelper2
+class SwXOutlineTarget : public cppu::WeakImplHelper
 <
     css::beans::XPropertySet,
     css::lang::XServiceInfo