[Libreoffice-commits] core.git: accessibility/inc accessibility/source

[Noel Grandin]

 accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx     |    8 ++++----
 accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx |    4 ++--
 accessibility/source/extended/AccessibleGridControlTable.cxx                |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 11b3555e2f8e8c9b07c73fbfb89a0faffaeca269
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Oct 13 08:49:00 2015 +0200

    Revert "bin confusion with name AccessibleGridControlTableImplHelper"
    
    This reverts commit 302866858f1f1c194cadab5d01c2e912034c6c63, I suspect it depends on
    another commit which is not yet pushed.

diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index 7a832c6..43a78db 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -22,7 +22,7 @@
 #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
 
 #include "accessibility/extended/AccessibleGridControlTableBase.hxx"
-#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <accessibility/extended/AccessibleGridControlTableCell.hxx>
 
@@ -31,12 +31,12 @@
 namespace accessibility {
 
 
-typedef ::cppu::ImplHelper < css::accessibility::XAccessibleSelection >
-        AccessibleGridControlTableSelectionImplHelper;
+typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
+        AccessibleGridControlTableImplHelper1;
 /** This class represents the accessible object of the data table of a
     Grid control. */
 class AccessibleGridControlTable : public AccessibleGridControlTableBase,
-                                public AccessibleGridControlTableSelectionImplHelper
+                                public AccessibleGridControlTableImplHelper1
 {
 public:
     AccessibleGridControlTable(
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index 74a4753..8b9b4dc 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -22,14 +22,14 @@
 #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
 
 #include "accessibility/extended/AccessibleGridControlBase.hxx"
-#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 
 
 
 namespace accessibility {
 
-typedef ::cppu::ImplHelper < css::accessibility::XAccessibleTable >
+typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable >
         AccessibleGridControlTableImplHelper;
 
 /** The Grid Control accessible table objects inherit from this base class. It
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 54b63c4..0e45999 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -320,7 +320,7 @@ Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type& rType
 {
     Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) );
     return aAny.hasValue() ?
-        aAny : AccessibleGridControlTableSelectionImplHelper::queryInterface( rType );
+        aAny : AccessibleGridControlTableImplHelper1::queryInterface( rType );
 }
 
 void SAL_CALL AccessibleGridControlTable::acquire() throw ()