mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "bin confusion with name AccessibleGridControlTableImplHelper"

Browse Source 
This reverts commit 302866858f, I suspect it depends on
another commit which is not yet pushed.
This commit is contained in:
Noel Grandin
2015-10-13 08:49:00 +02:00
parent 5130572761
commit 11b3555e2f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
View File

@@ -22,7 +22,7 @@
#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLE_HXX
#include "accessibility/extended/AccessibleGridControlTableBase.hxx" #include "accessibility/extended/AccessibleGridControlTableBase.hxx"
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <accessibility/extended/AccessibleGridControlTableCell.hxx> #include <accessibility/extended/AccessibleGridControlTableCell.hxx>
@@ -31,12 +31,12 @@
namespace accessibility { namespace accessibility {
typedef ::cppu::ImplHelper < css::accessibility::XAccessibleSelection > typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
AccessibleGridControlTableSelectionImplHelper; AccessibleGridControlTableImplHelper1;
/** This class represents the accessible object of the data table of a /** This class represents the accessible object of the data table of a
Grid control. */ Grid control. */
class AccessibleGridControlTable : public AccessibleGridControlTableBase, class AccessibleGridControlTable : public AccessibleGridControlTableBase,
public AccessibleGridControlTableSelectionImplHelper public AccessibleGridControlTableImplHelper1
{ {
public: public:
AccessibleGridControlTable( AccessibleGridControlTable(

4
accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
View File

@@ -22,14 +22,14 @@
#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
#include "accessibility/extended/AccessibleGridControlBase.hxx" #include "accessibility/extended/AccessibleGridControlBase.hxx"
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <com/sun/star/accessibility/XAccessibleTable.hpp>
namespace accessibility { namespace accessibility {
typedef ::cppu::ImplHelper < css::accessibility::XAccessibleTable > typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable >
AccessibleGridControlTableImplHelper; AccessibleGridControlTableImplHelper;
/** The Grid Control accessible table objects inherit from this base class. It /** The Grid Control accessible table objects inherit from this base class. It

2
accessibility/source/extended/AccessibleGridControlTable.cxx
View File

@@ -320,7 +320,7 @@ Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type& rType
{ {
Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) ); Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) );
return aAny.hasValue() ? return aAny.hasValue() ?
aAny : AccessibleGridControlTableSelectionImplHelper::queryInterface( rType ); aAny : AccessibleGridControlTableImplHelper1::queryInterface( rType );
} }
void SAL_CALL AccessibleGridControlTable::acquire() throw () void SAL_CALL AccessibleGridControlTable::acquire() throw ()