[Libreoffice-commits] core.git: starmath/source

[Takeshi Abe]

 starmath/source/accessibility.hxx |    7 +++----
 starmath/source/smdetect.hxx      |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 3e9914eded2c57f9c205c994f90e1b3292deec63
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sat Feb 28 16:55:13 2015 +0900

    tdf#88206 Change uses of cppu::WeakImplHelper* to the variadic variant
    
    ... in starmath.
    
    Change-Id: If414142c7d1356b8dbbf82bed70b908a4d161653
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 3948ef9..9ff782f 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -30,8 +30,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/SfxBroadcaster.hxx>
 
 #include <editeng/editeng.hxx>
@@ -53,7 +52,7 @@ struct AccessibleEventObject;
 
 
 typedef
-cppu::WeakImplHelper6
+cppu::WeakImplHelper
     <
         com::sun::star::lang::XServiceInfo,
         com::sun::star::accessibility::XAccessible,
@@ -302,7 +301,7 @@ public:
 
 
 typedef
-cppu::WeakImplHelper5
+cppu::WeakImplHelper
     <
         com::sun::star::lang::XServiceInfo,
         com::sun::star::accessibility::XAccessible,
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index 7c0868b..f7a274f 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -51,7 +51,7 @@ namespace com
 
 #include <sfx2/sfxuno.hxx>
 
-class SmFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
+class SmFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
                             SmFilterDetect( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );