sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 74 +-------------------
sc/source/ui/inc/AccessibleCsvControl.hxx | 53 +++-----------
2 files changed, 18 insertions(+), 109 deletions(-)
New commits:
commit 28b7b783202d251f43658b2ff1d8df3f10d6d1b8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:30:06 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:43:29 2023 +0000
Use ImplInheritanceHelper in ScAccessibleCsvCell
Change-Id: I46e9985fe3bb05dc677b4046b3cad18dea1086b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146276
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 075657fd9b21..eeaee6e2f91c 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1219,7 +1219,7 @@ ScAccessibleCsvCell::ScAccessibleCsvCell(
ScCsvGrid& rGrid,
OUString aCellText,
sal_Int32 nRow, sal_Int32 nColumn ) :
- ScAccessibleCsvControl( rGrid ),
+ ImplInheritanceHelper( rGrid ),
AccessibleStaticTextBase( SvxEditSourcePtr() ),
maCellText(std::move( aCellText )),
mnLine( nRow ? (nRow + rGrid.GetFirstVisLine() - 1) : CSV_LINE_HEADER ),
@@ -1310,11 +1310,11 @@ sal_Int64 SAL_CALL
ScAccessibleCsvCell::getAccessibleStateSet()
// XInterface -----------------------------------------------------------------
-IMPLEMENT_FORWARD_XINTERFACE2( ScAccessibleCsvCell, ScAccessibleCsvControl,
AccessibleStaticTextBase )
+IMPLEMENT_FORWARD_XINTERFACE2( ScAccessibleCsvCell, ImplInheritanceHelper,
AccessibleStaticTextBase )
// XTypeProvider --------------------------------------------------------------
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ScAccessibleCsvControl,
AccessibleStaticTextBase )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ImplInheritanceHelper,
AccessibleStaticTextBase )
// helpers --------------------------------------------------------------------
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx
b/sc/source/ui/inc/AccessibleCsvControl.hxx
index ea3308fc4eb5..cb1efc309353 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -30,7 +30,6 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <editeng/AccessibleStaticTextBase.hxx>
#include <comphelper/uno3.hxx>
#include <map>
@@ -400,8 +399,9 @@ private:
};
/** Accessible class representing a cell of the CSV grid control. */
-class ScAccessibleCsvCell : public ScAccessibleCsvControl
- , public
cppu::ImplHelper1<css::accessibility::XAccessible>
+class ScAccessibleCsvCell : public cppu::ImplInheritanceHelper<
+ ScAccessibleCsvControl,
+ css::accessibility::XAccessible>
, public ::accessibility::AccessibleStaticTextBase
{
protected:
commit ec68d4bb894882835aed28cee8537481afd0e302
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:25:24 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:43:22 2023 +0000
Use ImplInheritanceHelper in ScAccessibleCsvGrid
Change-Id: I1713fb24ed16ef9db6d2815a286d4182f19a5e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146275
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index bc5dd8208b80..075657fd9b21 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -727,7 +727,7 @@ static sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn )
}
ScAccessibleCsvGrid::ScAccessibleCsvGrid(ScCsvGrid& rGrid)
- : ScAccessibleCsvControl(rGrid)
+ : ImplInheritanceHelper(rGrid)
{
}
@@ -1069,39 +1069,6 @@ void SAL_CALL
ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int64 nSelectedC
implSelectColumn( nColumn, false );
}
-// XInterface -----------------------------------------------------------------
-
-Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const css::uno::Type& rType )
-{
- Any aAny( ScAccessibleCsvGridImpl::queryInterface( rType ) );
- return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface(
rType );
-}
-
-void SAL_CALL ScAccessibleCsvGrid::acquire() noexcept
-{
- ScAccessibleCsvControl::acquire();
-}
-
-void SAL_CALL ScAccessibleCsvGrid::release() noexcept
-{
- ScAccessibleCsvControl::release();
-}
-
-// XTypeProvider --------------------------------------------------------------
-
-Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes()
-{
- return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(),
- Sequence {
- cppu::UnoType<XAccessibleTable>::get(),
- cppu::UnoType<XAccessibleSelection>::get() });
-}
-
-Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
// events ---------------------------------------------------------------------
void ScAccessibleCsvGrid::SendFocusEvent( bool bFocused )
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx
b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 1c228a1c9317..ea3308fc4eb5 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -31,7 +31,6 @@
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
#include <editeng/AccessibleStaticTextBase.hxx>
#include <comphelper/uno3.hxx>
#include <map>
@@ -214,14 +213,12 @@ private:
class ScCsvGrid;
class ScAccessibleCsvCell;
-typedef ::cppu::ImplHelper3<
- css::accessibility::XAccessible,
- css::accessibility::XAccessibleTable,
- css::accessibility::XAccessibleSelection >
- ScAccessibleCsvGridImpl;
-
/** Accessible class representing the CSV grid control. */
-class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public
ScAccessibleCsvGridImpl
+class ScAccessibleCsvGrid : public cppu::ImplInheritanceHelper<
+ ScAccessibleCsvControl,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleTable,
+ css::accessibility::XAccessibleSelection>
{
protected:
typedef std::map< sal_Int64, rtl::Reference<ScAccessibleCsvCell> >
XAccessibleSet;
@@ -349,22 +346,6 @@ public:
/** Deselects the child with the specified index in all selected children.
*/
virtual void SAL_CALL deselectAccessibleChild( sal_Int64
nSelectedChildIndex ) override;
- // XInterface -------------------------------------------------------------
-
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType
) override;
-
- virtual void SAL_CALL acquire() noexcept override;
-
- virtual void SAL_CALL release() noexcept override;
-
- // XTypeProvider ----------------------------------------------------------
-
- /** Returns a sequence with all supported interface types. */
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
- /** Returns an implementation ID. */
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
override;
-
// events -----------------------------------------------------------------
public:
/** Sends a GetFocus or LoseFocus event to all listeners. */
commit 154035563590181d096d8eccf0f549f314ddecde
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 27 15:20:31 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Jan 28 17:43:14 2023 +0000
Use ImplInheritanceHelper in ScAccessibleCsvRuler
Change-Id: I24b64a97e5431d1d25d2894c6e2ae41ec13245c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146274
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 9d7e2bab5799..bc5dd8208b80 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -246,7 +246,7 @@ static void lcl_FillFontAttributes( Sequence< PropertyValue
>& rSeq, const vcl::
}
ScAccessibleCsvRuler::ScAccessibleCsvRuler(ScCsvRuler& rRuler)
- : ScAccessibleCsvControl(rRuler)
+ : ImplInheritanceHelper(rRuler)
{
constructStringBuffer();
}
@@ -611,37 +611,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::scrollSubstringTo(
sal_Int32 /* nStartIn
return false;
}
-// XInterface -----------------------------------------------------------------
-
-Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const css::uno::Type& rType
)
-{
- Any aAny( ScAccessibleCsvRulerImpl::queryInterface( rType ) );
- return aAny.hasValue() ? aAny : ScAccessibleCsvControl::queryInterface(
rType );
-}
-
-void SAL_CALL ScAccessibleCsvRuler::acquire() noexcept
-{
- ScAccessibleCsvControl::acquire();
-}
-
-void SAL_CALL ScAccessibleCsvRuler::release() noexcept
-{
- ScAccessibleCsvControl::release();
-}
-
-// XTypeProvider --------------------------------------------------------------
-
-Sequence< css::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes()
-{
- return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(),
- Sequence { cppu::UnoType<XAccessibleText>::get() });
-}
-
-Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
// events ---------------------------------------------------------------------
void ScAccessibleCsvRuler::SendCaretEvent()
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx
b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 6dfc22433880..1c228a1c9317 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -29,8 +29,8 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <editeng/AccessibleStaticTextBase.hxx>
#include <comphelper/uno3.hxx>
@@ -83,11 +83,11 @@ protected:
class ScCsvRuler;
-typedef ::cppu::ImplHelper2<css::accessibility::XAccessible,
- css::accessibility::XAccessibleText>
ScAccessibleCsvRulerImpl;
-
/** Accessible class representing the CSV ruler control. */
-class ScAccessibleCsvRuler : public ScAccessibleCsvControl, public
ScAccessibleCsvRulerImpl
+class ScAccessibleCsvRuler : public cppu::ImplInheritanceHelper<
+ ScAccessibleCsvControl,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleText>
{
private:
OUStringBuffer maBuffer; /// Contains the text representation of
the ruler.
@@ -175,14 +175,6 @@ public:
virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex,
sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType)
override;
- // XInterface -------------------------------------------------------------
-
- DECLARE_XINTERFACE()
-
- // XTypeProvider ----------------------------------------------------------
-
- DECLARE_XTYPEPROVIDER()
-
// events -----------------------------------------------------------------
public:
/** Sends a caret changed event to all listeners. */
