offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl | 23
----------
vcl/osx/a11ylistener.cxx | 4 -
vcl/unx/gtk3/a11y/atklistener.cxx | 20
--------
3 files changed, 1 insertion(+), 46 deletions(-)
New commits:
commit f622149cb2ee3a8259f8e8f3b013ca5b4b5e1d80
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Mar 28 16:15:57 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Mar 29 06:54:19 2022 +0200
a11y: Drop unused, deprecated table model change event types
All places that were previously emitting
`AccessibleTableModelChangeType::INSERT`
and `AccessibleTableModelChangeType::DELETE`
events have been ported to emit
the 4 new event types introduced in
Change-Id I30821a5acafa4f3d1dafdfc219f3b4568d9a6e89,
"a11y: Add new table model change types for row/col insertion/del"
instead.
Therefore, the handling of those events can be
dropped from the gtk3 VCL plugin and for macOS's
a11y listener as well.
Also, drop the now completely unused
constants from the IDL file as mentioned
in Change-Id I30821a5acafa4f3d1dafdfc219f3b4568d9a6e89:
> From a UNO API perspective, this change
> and the final removal of the
> `AccessibleTableModelChangeType::DELETE`
> and `AccessibleTableModelChangeType::INSERT`
> constants in a follow-up commit
> should be unproblematic, because the
> corresponding APIs have been unpublished in
>
> commit 70626249cd247d9acdad417b8eaf252bae22c059
> Date: Thu Nov 29 00:27:03 2012 +0100
>
> API CHANGE a11y unpublishing and add/removeListener rename.
Change-Id: I1c062e26481b916af882e301c5f911aba9550ea3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132221
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git
a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
index 69669eb11eda..02164df9731e 100644
--- a/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleTableModelChangeType.idl
@@ -44,29 +44,6 @@ module com { module sun { module star { module accessibility
{
*/
constants AccessibleTableModelChangeType
{
- /** One or more rows and/or columns have been inserted.
-
- <p>Use the fields of the AccessibleTableModelChange
- structure to determine the indices of the rows and/or columns that
- have been inserted.</p>
-
- @deprecated: use ROWS_INSERTED/COLUMNS_INSERTED instead.
- This constant will be removed once all remaining uses have been
- ported.
- */
- const short INSERT = 1;
-
- /** One or more rows and/or columns have been deleted.
-
- <p>The affected area of the table is stored in the fields of the
- AccessibleTableModelChange structure.</p>
-
- @deprecated: use ROWS_REMOVED/COLUMNS_REMOVED instead.
- This constant will be removed once all remaining uses have been
- ported.
- */
- const short DELETE = 2;
-
/** Some of the table data has changed.
<p>The number of rows and columns remains unchanged. Only (some of)
diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index fd275dab3079..b49b4509270e 100644
--- a/vcl/osx/a11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -42,9 +42,7 @@ static NSString * getTableNotification( const
AccessibleEventObject& aEvent )
if( (aEvent.NewValue >>= aChange) &&
(aChange.Type == AccessibleTableModelChangeType::ROWS_INSERTED ||
- aChange.Type == AccessibleTableModelChangeType::ROWS_REMOVED ||
- (( AccessibleTableModelChangeType::INSERT == aChange.Type ||
AccessibleTableModelChangeType::DELETE == aChange.Type ) &&
- aChange.FirstRow != aChange.LastRow )))
+ aChange.Type == AccessibleTableModelChangeType::ROWS_REMOVED))
{
notification = NSAccessibilityRowCountChangedNotification;
}
diff --git a/vcl/unx/gtk3/a11y/atklistener.cxx
b/vcl/unx/gtk3/a11y/atklistener.cxx
index d73c2f753b3b..f0c2504c9acf 100644
--- a/vcl/unx/gtk3/a11y/atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/atklistener.cxx
@@ -625,28 +625,8 @@ void AtkListener::notifyEvent( const
accessibility::AccessibleEventObject& aEven
sal_Int32 nRowsChanged = aChange.LastRow - aChange.FirstRow + 1;
sal_Int32 nColumnsChanged = aChange.LastColumn -
aChange.FirstColumn + 1;
- static const struct {
- const char *row;
- const char *col;
- } aSignalNames[] =
- {
- { nullptr, nullptr }, // dummy
- { "row_inserted", "column_inserted" }, // INSERT = 1
- { "row_deleted", "column_deleted" } // DELETE = 2
- };
switch( aChange.Type )
{
- case accessibility::AccessibleTableModelChangeType::INSERT:
- case accessibility::AccessibleTableModelChangeType::DELETE:
- if( nRowsChanged > 0 )
- g_signal_emit_by_name( G_OBJECT( atk_obj ),
- aSignalNames[aChange.Type].row,
- aChange.FirstRow, nRowsChanged
);
- if( nColumnsChanged > 0 )
- g_signal_emit_by_name( G_OBJECT( atk_obj ),
- aSignalNames[aChange.Type].col,
- aChange.FirstColumn,
nColumnsChanged );
- break;
case
accessibility::AccessibleTableModelChangeType::COLUMNS_INSERTED:
g_signal_emit_by_name(G_OBJECT(atk_obj), "column-inserted",
aChange.FirstColumn,
nColumnsChanged);
