diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2015-10-10 20:02:49 -0400 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-28 06:37:44 +0000 |
| commit | 604c6cf42f1d136e5c076b4ae17bec86e7e1a206 (patch) | |
| tree | 251af11b3d058c25c01520e0d03207b06f2d558c /accessibility | |
| parent | 10e4396dc7c96061750208c32f29c372737f63d2 (diff) | |
bin confusion with name AccessibleGridControlTableImplHelper
AccessibleGridControlTableBase.hxx :
typedef ::cppu::ImplHelper< css::accessibility::XAccessibleTable >
AccessibleGridControlTableImplHelper;
AccessibleGridControlTable.hxx :
typedef ::cppu::ImplHelper< css::accessibility::XAccessibleSelection >
AccessibleGridControlTableImplHelper1;
Change-Id: Icde57d148cf725a3bd4c0927edf7461598398e04
Reviewed-on: https://gerrit.libreoffice.org/19348
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'accessibility')
3 files changed, 7 insertions, 7 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 43a78db474a1..7a832c67959b 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/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <accessibility/extended/AccessibleGridControlTableCell.hxx> @@ -31,12 +31,12 @@ namespace accessibility { -typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > - AccessibleGridControlTableImplHelper1; +typedef ::cppu::ImplHelper < css::accessibility::XAccessibleSelection > + AccessibleGridControlTableSelectionImplHelper; /** This class represents the accessible object of the data table of a Grid control. */ class AccessibleGridControlTable : public AccessibleGridControlTableBase, - public AccessibleGridControlTableImplHelper1 + public AccessibleGridControlTableSelectionImplHelper { public: AccessibleGridControlTable( diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 8b9b4dc4105f..74a4753f3691 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/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> namespace accessibility { -typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable > +typedef ::cppu::ImplHelper < 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 0e459996b5ac..54b63c4c7e5d 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 : AccessibleGridControlTableImplHelper1::queryInterface( rType ); + aAny : AccessibleGridControlTableSelectionImplHelper::queryInterface( rType ); } void SAL_CALL AccessibleGridControlTable::acquire() throw () |