compilerplugins/clang/unusedenumconstants.readonly.results | 2
include/comphelper/accflowenum.hxx | 36 ---
include/svx/srchdlg.hxx | 1
include/vcl/weld.hxx | 5
include/vcl/window.hxx | 4
offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl | 1
sc/source/ui/Accessibility/AccessibleDocument.cxx | 94 --------
sc/source/ui/inc/AccessibleDocument.hxx | 7
sc/source/ui/view/tabvwshe.cxx | 38 ---
sd/IwyuFilter_sd.yaml | 1
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 9
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 112 ----------
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 7
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 6
sd/source/ui/view/Outliner.cxx | 10
svx/source/dialog/srchdlg.cxx | 56 -----
sw/source/core/access/accdoc.cxx | 72 ------
sw/source/core/access/accdoc.hxx | 8
sw/source/uibase/uiview/viewsrch.cxx | 34 ---
toolkit/source/awt/vclxaccessiblecomponent.cxx | 3
vcl/inc/salvtables.hxx | 5
vcl/inc/window.h | 1
vcl/source/app/salvtables.cxx | 11
vcl/source/window/window2.cxx | 15 -
vcl/unx/gtk3/gtk3gtkinst.cxx | 28 --
25 files changed, 4 insertions(+), 562 deletions(-)
New commits:
commit 0b94169d820482434dc98a37c3c1633ca46fd0dc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 27 17:38:24 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 28 09:52:23 2020 +0200
Resolves: tdf#133411 drop CONTENT_FLOWS_TO from dialog to search results
in the document, looks like only the calc one actually works, and when
it works on large quantities of results calc grinds to a complete halt
This was introduced with:
commit b41332475783c31136673fb44cf4c411bb0148f8
Date: Mon Dec 2 15:54:29 2013 +0000
Integrate branch of IAccessible2
and has been a problem on and off with calc's potentially ~infinite grid
There is the on-by-default search results dialog in calc (which has a limit
on
how many it shows) which provides an alternative route to iterate through
the
results
Change-Id: I2685e480d2d15220be0bddbc83baad3992e7d5d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95006
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 439013c92e20..1285b0cbfbbd 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -170,8 +170,6 @@ framework/inc/xml/toolboxdocumenthandler.hxx:53
enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry
TB_ATTRIBUTE_STYLE
framework/inc/xml/toolboxdocumenthandler.hxx:54
enum framework::OReadToolBoxDocumentHandler::ToolBox_XML_Entry
TB_ATTRIBUTE_UINAME
-include/comphelper/accflowenum.hxx:27
- enum AccessibilityFlowTo FORSPELLCHECKFLOWTO
include/connectivity/dbtools.hxx:813
enum connectivity::dbase::DBFType dBaseIII
include/connectivity/dbtools.hxx:814
diff --git a/include/comphelper/accflowenum.hxx
b/include/comphelper/accflowenum.hxx
deleted file mode 100644
index a5e3b9eb680a..000000000000
--- a/include/comphelper/accflowenum.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_COMPHELPER_ACCFLOWENUM_HXX
-#define INCLUDED_COMPHELPER_ACCFLOWENUM_HXX
-
-#include <sal/types.h>
-
-/**
- enum for css::accessibility::XAccessibleGetAccFlowTo::getAccFlowTo method
-*/
-enum class AccessibilityFlowTo : sal_Int32
-{
- ForFindReplaceItem = 2,
- ForFindReplaceRange = 3
-};
-
-#endif // INCLUDED_COMPHELPER_ACCFLOWENUM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 593d54487964..6b45e838dcf9 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -128,7 +128,6 @@ public:
TransliterationFlags GetTransliterationFlags() const;
- void SetDocWin(vcl::Window* pDocWin, SvxSearchCmd eCommand, bool bSuccess);
void SetSaveToModule(bool b);
void SetSearchLabel(const OUString& rStr);
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 7766749cd007..cad56785acb2 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -170,11 +170,6 @@ public:
virtual void set_accessible_relation_labeled_by(weld::Widget* pLabel) = 0;
virtual void set_accessible_relation_label_for(weld::Widget* pLabeled) = 0;
- virtual void
- add_extra_accessible_relation(const
css::accessibility::AccessibleRelation& rRelation)
- = 0;
- virtual void clear_extra_accessible_relations() = 0;
-
virtual void set_tooltip_text(const OUString& rTip) = 0;
virtual OUString get_tooltip_text() const = 0;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 66d61ead5478..5bef729e65f4 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1256,10 +1256,6 @@ public:
void SetAccessibleRelationMemberOf(
vcl::Window* pMemberOf );
vcl::Window* GetAccessibleRelationMemberOf() const;
- void AddExtraAccessibleRelation(const
css::accessibility::AccessibleRelation &rRelation);
- const std::vector<css::accessibility::AccessibleRelation>&
GetExtraAccessibleRelations() const;
- void ClearExtraAccessibleRelations();
-
// to avoid sending accessibility events in cases like closing dialogs
// by default checks complete parent path
bool IsAccessibilityEventsSuppressed( bool
bTraverseParentPath = true );
diff --git a/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
b/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
index 0e8f9cd69ae4..56246775b5cc 100644
--- a/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
+++ b/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
@@ -28,7 +28,6 @@ module com { module sun { module star { module accessibility {
// !!!
interface XAccessibleGetAccFlowTo : ::com::sun::star::uno::XInterface
{
- // @param nType see include/comphelper/accflowenum.hxx
sequence<any> getAccFlowTo([in] any aXShape, [in] long nType);
};
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 4dfc5848a0b3..f7f2c8aed866 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -52,7 +52,6 @@
#include <svx/AccessibleShapeTreeInfo.hxx>
#include <svx/AccessibleShapeInfo.hxx>
#include <svx/IAccessibleParent.hxx>
-#include <comphelper/accflowenum.hxx>
#include <comphelper/sequence.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/docfile.hxx>
@@ -1616,13 +1615,6 @@ void SAL_CALL ScAccessibleDocument::selectionChanged(
const lang::EventObject& /
uno::Any SAL_CALL ScAccessibleDocument::queryInterface( uno::Type const &
rType )
{
- uno::Any aAnyTmp;
- if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get())
- {
- css::uno::Reference<XAccessibleGetAccFlowTo> AccFromXShape = this;
- aAnyTmp <<= AccFromXShape;
- return aAnyTmp;
- }
uno::Any aAny (ScAccessibleDocumentImpl::queryInterface(rType));
return aAny.hasValue() ? aAny :
ScAccessibleContextBase::queryInterface(rType);
}
@@ -2234,92 +2226,6 @@ uno::Any SAL_CALL
ScAccessibleDocument::getExtendedAttributes()
return anyAtrribute;
}
-css::uno::Sequence< css::uno::Any >
ScAccessibleDocument::GetScAccFlowToSequence()
-{
- if ( getAccessibleChildCount() )
- {
- uno::Reference < XAccessible > xSCTableAcc = getAccessibleChild( 0 );
// table
- if ( xSCTableAcc.is() )
- {
- uno::Reference < XAccessibleSelection > xAccSelection(
xSCTableAcc, uno::UNO_QUERY );
- sal_Int32 nSelCount =
xAccSelection->getSelectedAccessibleChildCount();
- if( nSelCount )
- {
- uno::Reference < XAccessible > xSel =
xAccSelection->getSelectedAccessibleChild( 0 ); // selected cell
- if ( xSel.is() )
- {
- uno::Reference < XAccessibleContext > xSelContext(
xSel->getAccessibleContext() );
- if ( xSelContext.is() )
- {
- if ( xSelContext->getAccessibleRole() ==
AccessibleRole::TABLE_CELL )
- {
- sal_Int32 nParaCount = 0;
- uno::Sequence <uno::Any> aSequence(nSelCount);
- for ( sal_Int32 i = 0; i < nSelCount; i++ )
- {
- xSel =
xAccSelection->getSelectedAccessibleChild( i ) ;
- if ( xSel.is() )
- {
- xSelContext = xSel->getAccessibleContext();
- if ( xSelContext.is() )
- {
- if ( xSelContext->getAccessibleRole()
== AccessibleRole::TABLE_CELL )
- {
- aSequence[nParaCount] <<= xSel;
- nParaCount++;
- }
- }
- }
- }
- aSequence.realloc(nParaCount);
- return aSequence;
- }
- }
- }
- }
- }
- }
- uno::Sequence <uno::Any> aEmpty;
- return aEmpty;
-}
-
-css::uno::Sequence< css::uno::Any >
- SAL_CALL ScAccessibleDocument::getAccFlowTo(const css::uno::Any& rAny,
sal_Int32 nType)
-{
- AccessibilityFlowTo eType = static_cast<AccessibilityFlowTo>(nType);
-
-#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
- assert(eType == AccessibilityFlowTo::ForFindReplaceItem || eType ==
AccessibilityFlowTo::ForFindReplaceRange);
-#endif
-
- SolarMutexGuard g;
-
- bool bSuccess(false);
- rAny >>= bSuccess;
- if ( bSuccess )
- {
- if (eType == AccessibilityFlowTo::ForFindReplaceRange)
- {
- uno::Sequence< uno::Any> aSeq = GetScAccFlowToSequence();
- if ( aSeq.hasElements() )
- {
- return aSeq;
- }
- }
-
- if( mpAccessibleSpreadsheet.is() )
- {
- uno::Reference < XAccessible > xFindCellAcc =
mpAccessibleSpreadsheet->GetActiveCell();
- // add xFindCellAcc to the return the Sequence
- uno::Sequence< uno::Any> aSeq2(1);
- aSeq2[0] <<= xFindCellAcc;
- return aSeq2;
- }
- }
- uno::Sequence< uno::Any> aEmpty;
- return aEmpty;
-}
-
sal_Int32 SAL_CALL ScAccessibleDocument::getForeground( )
{
return sal_Int32(COL_BLACK);
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx
b/sc/source/ui/inc/AccessibleDocument.hxx
index 731c6a9628e2..364fbcb3e7c9 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <cppuhelper/implbase3.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#include <svx/IAccessibleViewForwarder.hxx>
class ScTabViewShell;
@@ -53,7 +52,6 @@ typedef cppu::ImplHelper3<
css::accessibility::XAccessibleSelection,
class ScAccessibleDocument
: public ScAccessibleDocumentBase,
public ScAccessibleDocumentImpl,
- public css::accessibility::XAccessibleGetAccFlowTo,
public accessibility::IAccessibleViewForwarder
{
public:
@@ -258,11 +256,8 @@ private:
public:
ScDocument *GetDocument() const ;
ScAddress GetCurCellAddress() const;
- //===== XAccessibleGetAccFromXShape
============================================
- css::uno::Sequence< css::uno::Any >
- SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
override;
- virtual sal_Int32 SAL_CALL getForeground( ) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) override;
virtual sal_Int32 SAL_CALL getBackground( ) override;
};
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 74dfe9001dcd..138d154e046a 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -247,25 +247,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
const SvxSearchItem* pSearchItem = static_cast<const
SvxSearchItem*>(pItem);
ScGlobal::SetSearchItem( *pSearchItem );
- bool bSuccess = SearchAndReplace( pSearchItem, true,
rReq.IsAPI() );
- SfxChildWindow* pChildWindow =
SfxViewFrame::Current()->GetChildWindow(
- SvxSearchDialogWrapper::GetChildWindowId());
- if (pChildWindow)
- {
- SvxSearchDialog* pSearchDlg =
static_cast<SvxSearchDialog*>(pChildWindow->GetController().get());
- if( pSearchDlg )
- {
- ScTabView* pTabView = GetViewData().GetView();
- if( pTabView )
- {
- vcl::Window* pWin = pTabView->GetActiveWin();
- if( pWin )
- {
- pSearchDlg->SetDocWin(pWin,
pSearchItem->GetCommand(), bSuccess);
- }
- }
- }
- }
+ SearchAndReplace( pSearchItem, true, rReq.IsAPI() );
rReq.Done();
}
}
@@ -317,24 +299,6 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
rReq.IsAPI() ?
SfxCallMode::API|SfxCallMode::SYNCHRON :
SfxCallMode::RECORD,
{ &aSearchItem });
- SfxChildWindow* pChildWindow =
SfxViewFrame::Current()->GetChildWindow(
- SvxSearchDialogWrapper::GetChildWindowId());
- if (pChildWindow)
- {
- SvxSearchDialog* pSearchDlg =
static_cast<SvxSearchDialog*>(pChildWindow->GetController().get());
- if( pSearchDlg )
- {
- ScTabView* pTabView = GetViewData().GetView();
- if( pTabView )
- {
- vcl::Window* pWin = pTabView->GetActiveWin();
- if( pWin )
- {
- pSearchDlg->SetDocWin(pWin,
aSearchItem.GetCommand(), false);
- }
- }
- }
- }
}
else
{
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index d69c951a8bbd..4681b29a8259 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -146,7 +146,6 @@ blacklist:
sd/source/ui/inc/AccessibleDocumentViewBase.hxx:
# base class has to be a complete type
- com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp
- - com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp
- com/sun/star/awt/XFocusListener.hpp
- com/sun/star/awt/XWindowListener.hpp
- com/sun/star/beans/XPropertyChangeListener.hpp
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 540a4db23fea..67c1a1fb08b7 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -382,7 +382,6 @@ uno::Any SAL_CALL
static_cast<awt::XWindowListener*>(this),
static_cast<awt::XFocusListener*>(this)
,static_cast<XAccessibleExtendedAttributes*>(this)
- ,static_cast<XAccessibleGetAccFlowTo*>(this)
);
return aReturn;
}
@@ -765,14 +764,6 @@ uno::Any SAL_CALL
AccessibleDocumentViewBase::getExtendedAttributes()
return anyAtrribute;
}
-css::uno::Sequence< css::uno::Any >
- SAL_CALL AccessibleDocumentViewBase::getAccFlowTo(const
css::uno::Any&, sal_Int32 )
-{
- css::uno::Sequence< uno::Any> aRet;
-
- return aRet;
-}
-
sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground( )
{
return sal_Int32(COL_BLACK);
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 2f97fcafc696..6d13f723e14c 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <cppuhelper/queryinterface.hxx>
-#include <comphelper/accflowenum.hxx>
#include <comphelper/processfactory.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
@@ -744,117 +743,6 @@ void SAL_CALL AccessibleDrawDocumentView::disposing()
AccessibleDocumentViewBase::disposing ();
}
-css::uno::Sequence< css::uno::Any >
- SAL_CALL AccessibleDrawDocumentView::getAccFlowTo(const css::uno::Any&
/*rAny*/, sal_Int32 nType)
-{
-#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
- AccessibilityFlowTo eType = static_cast<AccessibilityFlowTo>(nType);
- assert(eType == AccessibilityFlowTo::ForFindReplaceItem || eType ==
AccessibilityFlowTo::ForFindReplaceRange);
-#else
- (void) nType;
-#endif
-
- SolarMutexGuard g;
-
- sal_Int32 nChildCount = getSelectedAccessibleChildCount();
- if ( nChildCount )
- {
- uno::Reference < XAccessible > xSel = getSelectedAccessibleChild( 0 );
- if ( xSel.is() )
- {
- uno::Reference < XAccessibleSelection > xAccChildSelection( xSel,
uno::UNO_QUERY );
- if ( xAccChildSelection.is() )
- {
- if ( xAccChildSelection->getSelectedAccessibleChildCount() )
- {
- uno::Reference < XAccessible > xChildSel =
xAccChildSelection->getSelectedAccessibleChild( 0 );
- if ( xChildSel.is() )
- {
- uno::Reference < XAccessibleContext >
xChildSelContext( xChildSel->getAccessibleContext() );
- if ( xChildSelContext.is() &&
- xChildSelContext->getAccessibleRole() ==
AccessibleRole::PARAGRAPH )
- {
- uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] <<= xChildSel;
- return aRet;
- }
- }
- }
- }
- }
- }
- else
- {
- uno::Reference<XAccessible> xPara = GetSelAccContextInTable();
- if ( xPara.is() )
- {
- uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] <<= xPara;
- return aRet;
- }
- }
-
- css::uno::Sequence< uno::Any> aRet;
- return aRet;
-}
-uno::Reference<XAccessible>
AccessibleDrawDocumentView::GetSelAccContextInTable()
-{
- uno::Reference<XAccessible> xRet;
- sal_Int32 nCount = mpChildrenManager ? mpChildrenManager->GetChildCount()
: 0;
- if ( nCount )
- {
- for ( sal_Int32 i = 0; i < nCount; i++ )
- {
- try
- {
- uno::Reference<XAccessible> xObj =
mpChildrenManager->GetChild(i);
- if ( xObj.is() )
- {
- uno::Reference<XAccessibleContext> xObjContext( xObj,
uno::UNO_QUERY );
- if ( xObjContext.is() && xObjContext->getAccessibleRole()
== AccessibleRole::TABLE )
- {
- uno::Reference<XAccessibleSelection> xObjSelection(
xObj, uno::UNO_QUERY );
- if ( xObjSelection.is() &&
xObjSelection->getSelectedAccessibleChildCount() )
- {
- uno::Reference<XAccessible> xCell =
xObjSelection->getSelectedAccessibleChild(0);
- if ( xCell.is() )
- {
- uno::Reference<XAccessibleSelection> xCellSel(
xCell, uno::UNO_QUERY );
- if ( xCellSel.is() &&
xCellSel->getSelectedAccessibleChildCount() )
- {
- uno::Reference<XAccessible> xPara =
xCellSel->getSelectedAccessibleChild( 0 );
- if ( xPara.is() )
- {
- uno::Reference<XAccessibleContext>
xParaContext( xPara, uno::UNO_QUERY );
- if ( xParaContext.is() &&
- xParaContext->getAccessibleRole()
== AccessibleRole::PARAGRAPH )
- {
- xRet = xPara;
- return xRet;
- }
- }
- }
- }
- }
- }
- }
- }
- catch (const lang::IndexOutOfBoundsException&)
- {
- uno::Reference<XAccessible> xEmpty;
- return xEmpty;
- }
- catch (const uno::RuntimeException&)
- {
- uno::Reference<XAccessible> xEmpty;
- return xEmpty;
- }
- }
- }
-
- return xRet;
-}
-
void AccessibleDrawDocumentView::UpdateAccessibleName()
{
OUString sNewName (CreateAccessibleName() + ": ");
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index fecd6fe2115f..2194dee2f290 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -33,7 +33,6 @@
#include <tools/link.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#include "Window.hxx"
@@ -87,8 +86,7 @@ class AccessibleDocumentViewBase
public css::beans::XPropertyChangeListener,
public css::awt::XWindowListener,
public css::awt::XFocusListener,
- public css::accessibility::XAccessibleExtendedAttributes,
- public css::accessibility::XAccessibleGetAccFlowTo
+ public css::accessibility::XAccessibleExtendedAttributes
{
public:
//===== internal ========================================================
@@ -313,9 +311,6 @@ protected:
*/
void SetAccessibleOLEObject (
const css::uno::Reference<css::accessibility::XAccessible>&
xOLEObject);
- //===== XAccessibleGetAccFromXShape
============================================
- css::uno::Sequence< css::uno::Any >
- SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
override;
public:
void SwitchViewActivated() { Activated(); }
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index 9b3294fcab8f..a98c092dc440 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -158,12 +158,6 @@ private:
virtual void impl_dispose() override;
- //===== XAccessibleGetAccFromXShape
============================================
- css::uno::Sequence< css::uno::Any >
- SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
override;
- css::uno::Reference< css::accessibility::XAccessible >
- GetSelAccContextInTable();
-
void UpdateAccessibleName();
};
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index b065a5c8d86f..86e8e9fc9bee 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -472,16 +472,6 @@ bool SdOutliner::StartSearchAndReplace (const
SvxSearchItem* pSearchItem)
}
mnStartPageIndex = sal_uInt16(-1);
}
-
- SfxChildWindow *pChildWin =
- SfxViewFrame::Current()->GetChildWindow(
- SvxSearchDialogWrapper::GetChildWindowId());
- if (pChildWin)
- {
- SvxSearchDialog* pSearchDlg =
-
static_cast<SvxSearchDialog*>(pChildWin->GetController().get());
- pSearchDlg->SetDocWin(pViewShell->GetActiveWindow(), nCommand,
false);
- }
}
mpDrawDocument->GetDocSh()->SetWaitCursor( false );
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 474e75535924..adab6f86b642 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -34,9 +34,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/ctloptions.hxx>
#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/accessibility/AccessibleRelation.hpp>
-#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -46,7 +43,6 @@
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
-#include <comphelper/accflowenum.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/scopeguard.hxx>
#include <svl/itempool.hxx>
@@ -2283,58 +2279,6 @@ void SvxSearchDialog::SaveToModule_Impl()
rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SfxCallMode::SLOT,
ppArgs );
}
-void SvxSearchDialog::SetDocWin(vcl::Window* pDocWin, SvxSearchCmd eCommand,
bool bSuccess)
-{
- m_xDialog->clear_extra_accessible_relations();
-
- if (!pDocWin)
- return;
-
- Reference<css::accessibility::XAccessible> xDocAcc =
pDocWin->GetAccessible();
- if (!xDocAcc.is())
- {
- return;
- }
- Reference<css::accessibility::XAccessibleGetAccFlowTo>
xGetAccFlowTo(xDocAcc, UNO_QUERY);
- if (!xGetAccFlowTo.is())
- {
- return;
- }
-
- /* tdf#128313 FlowTo tries to set an a11y relation between the search
dialog
- and its results. But for "find/replace" within a calc column we don't
- want to return the entire column as the result, we want the current
cell.
-
- But with search/all we do want the new multi-cellselection as the
result.
- */
- AccessibilityFlowTo eFlowTo(AccessibilityFlowTo::ForFindReplaceItem);
- switch (eCommand)
- {
- case SvxSearchCmd::FIND:
- case SvxSearchCmd::REPLACE:
- eFlowTo = AccessibilityFlowTo::ForFindReplaceItem;
- break;
- case SvxSearchCmd::FIND_ALL:
- case SvxSearchCmd::REPLACE_ALL:
- eFlowTo = AccessibilityFlowTo::ForFindReplaceRange;
- break;
- }
- uno::Sequence<uno::Any> aAnySeq =
xGetAccFlowTo->getAccFlowTo(Any(bSuccess), static_cast<sal_Int32>(eFlowTo));
-
- sal_Int32 nLen = aAnySeq.getLength();
- if (nLen)
- {
- uno::Sequence<uno::Reference<uno::XInterface>> aSequence(nLen);
- std::transform(aAnySeq.begin(), aAnySeq.end(), aSequence.begin(),
- [](const uno::Any& rAny) -> uno::Reference <
css::accessibility::XAccessible > {
- uno::Reference < css::accessibility::XAccessible > xAcc;
- rAny >>= xAcc;
- return xAcc;
- });
-
m_xDialog->add_extra_accessible_relation(css::accessibility::AccessibleRelation(css::accessibility::AccessibleRelationType::CONTENT_FLOWS_TO,
aSequence));
- }
-}
-
short SvxSearchDialog::executeSubDialog(VclAbstractDialog * dialog) {
assert(!m_executingSubDialog);
comphelper::ScopeGuard g([this] { m_executingSubDialog = false; });
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 18ae284d440c..bf2c0e844a2b 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <comphelper/accflowenum.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <vcl/svapp.hxx>
@@ -450,11 +449,6 @@ uno::Any SwAccessibleDocument::queryInterface(
uno::Reference<XAccessibleExtendedAttributes> aAttribute = this;
aRet <<= aAttribute;
}
- else if(rType == cppu::UnoType<XAccessibleGetAccFlowTo>::get())
- {
- uno::Reference<XAccessibleGetAccFlowTo> AccFlowTo = this;
- aRet <<= AccFlowTo;
- }
else
aRet = SwAccessibleContext::queryInterface( rType );
return aRet;
@@ -722,70 +716,4 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
return sal_Int32(SW_MOD()->GetColorConfig().GetColorValue(
::svtools::DOCCOLOR ).nColor);
}
-css::uno::Sequence< css::uno::Any >
- SAL_CALL SwAccessibleDocument::getAccFlowTo(const css::uno::Any&
/*rAny*/, sal_Int32 nType)
-{
-#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
- AccessibilityFlowTo eType = static_cast<AccessibilityFlowTo>(nType);
- assert(eType == AccessibilityFlowTo::ForFindReplaceItem || eType ==
AccessibilityFlowTo::ForFindReplaceRange);
-#else
- (void) nType;
-#endif
-
- SolarMutexGuard g;
-
- SwAccessibleMap* pAccMap = GetMap();
- if ( !pAccMap )
- {
- return uno::Sequence< uno::Any >();
- }
-
- SwCursorShell* pCursorShell = GetCursorShell();
- if ( pCursorShell )
- {
- SwPaM *_pStartCursor = pCursorShell->GetCursor(), *_pStartCursor2 =
_pStartCursor;
- o3tl::sorted_vector<SwFrame*> vFrameList;
- do
- {
- if ( !_pStartCursor )
- break;
- if ( _pStartCursor->HasMark() )
- {
- SwContentNode* pContentNode = _pStartCursor->GetContentNode();
- if (pContentNode)
- {
- SwFrame *const pFrame =
pContentNode->getLayoutFrame(pCursorShell->GetLayout(),
_pStartCursor->GetPoint());
- if ( pFrame )
- vFrameList.insert( pFrame );
- }
- }
- _pStartCursor = _pStartCursor->GetNext();
- }
- while( _pStartCursor != _pStartCursor2 );
-
- if ( !vFrameList.empty() )
- {
- uno::Sequence< uno::Any > aRet(vFrameList.size());
- sal_Int32 nIndex = 0;
- for ( const auto& rpFrame : vFrameList )
- {
- uno::Reference< XAccessible > xAcc =
pAccMap->GetContext(rpFrame, false);
- if ( xAcc.is() )
- {
- SwAccessibleContext *pAccImpl = static_cast<
SwAccessibleContext *>( xAcc.get() );
- if ( pAccImpl && pAccImpl->getAccessibleRole() ==
AccessibleRole::PARAGRAPH )
- {
- aRet[nIndex] <<= xAcc;
- }
- }
- nIndex++;
- }
- aRet.realloc(nIndex);
- return aRet;
- }
- }
-
- return uno::Sequence< uno::Any >();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index eb4ec56bd499..452a62a3310c 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -22,7 +22,6 @@
#include "acccontext.hxx"
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#include "accselectionhelper.hxx"
// base class for SwAccessibleDocument (in this same header file) and
@@ -91,8 +90,7 @@ public:
*/
class SwAccessibleDocument : public SwAccessibleDocumentBase,
public css::accessibility::XAccessibleSelection,
- public
css::accessibility::XAccessibleExtendedAttributes,
- public css::accessibility::XAccessibleGetAccFlowTo
+ public
css::accessibility::XAccessibleExtendedAttributes
{
// Implementation for XAccessibleSelection interface
SwAccessibleSelectionHelper maSelectionHelper;
@@ -169,10 +167,6 @@ public:
// XAccessibleComponent
sal_Int32 SAL_CALL getBackground() override;
-
- // XAccessibleGetAccFlowTo
- css::uno::Sequence< css::uno::Any >
- SAL_CALL getAccFlowTo(const css::uno::Any& rAny, sal_Int32 nType)
override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index e2b9fb88fdeb..440b77ad7968 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -234,15 +234,6 @@ void SwView::ExecSearch(SfxRequest& rReq)
lcl_emitSearchResultCallbacks(s_pSrchItem,
m_pWrtShell.get(), /* bHighlightAll = */ false);
}
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
-#if HAVE_FEATURE_DESKTOP
- {
- pSrchDlg = GetSearchDialog();
- if (pSrchDlg)
- {
- pSrchDlg->SetDocWin(m_pEditWin, eCommand, false);
- }
- }
-#endif
}
break;
case SvxSearchCmd::FIND_ALL:
@@ -266,15 +257,6 @@ void SwView::ExecSearch(SfxRequest& rReq)
else if (comphelper::LibreOfficeKit::isActive())
lcl_emitSearchResultCallbacks(s_pSrchItem,
m_pWrtShell.get(), /* bHighlightAll = */ true);
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
-#if HAVE_FEATURE_DESKTOP
- {
- pSrchDlg = GetSearchDialog();
- if (pSrchDlg)
- {
- pSrchDlg->SetDocWin(m_pEditWin, eCommand, false);
- }
- }
-#endif
}
break;
case SvxSearchCmd::REPLACE:
@@ -323,15 +305,6 @@ void SwView::ExecSearch(SfxRequest& rReq)
s_pSrchItem->SetCommand( nOldCmd );
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
}
-#if HAVE_FEATURE_DESKTOP
- {
- pSrchDlg = GetSearchDialog();
- if (pSrchDlg)
- {
- pSrchDlg->SetDocWin(m_pEditWin, eCommand, false);
- }
- }
-#endif
break;
case SvxSearchCmd::REPLACE_ALL:
@@ -391,13 +364,6 @@ void SwView::ExecSearch(SfxRequest& rReq)
SvxSearchDialogWrapper::SetSearchLabel(sText);
}
}
-#if HAVE_FEATURE_DESKTOP
- pSrchDlg = GetSearchDialog();
- if (pSrchDlg)
- {
- pSrchDlg->SetDocWin(m_pEditWin, eCommand, false);
- }
-#endif
break;
}
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 5e4002fb67f3..b046e9280768 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -374,9 +374,6 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet(
utl::AccessibleRelation
uno::Sequence< uno::Reference< uno::XInterface > > aSequence {
pMemberOf->GetAccessible() };
rRelationSet.AddRelation( accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
}
-
- for (const auto& rExtraRelation :
pWindow->GetExtraAccessibleRelations())
- rRelationSet.AddRelation(rExtraRelation);
}
}
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 86b9d0aec5bf..a71c31941d51 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -317,11 +317,6 @@ public:
virtual void set_accessible_relation_label_for(weld::Widget* pLabeled)
override;
- virtual void
- add_extra_accessible_relation(const
css::accessibility::AccessibleRelation& rRelation) override;
-
- virtual void clear_extra_accessible_relations() override;
-
virtual void set_tooltip_text(const OUString& rTip) override;
virtual OUString get_tooltip_text() const override;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 02a55afa198a..6b362e7d3bd9 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -283,7 +283,6 @@ public:
css::uno::Reference< css::accessibility::XAccessible > mxAccessible;
std::shared_ptr< VclSizeGroup > m_xSizeGroup;
std::vector<VclPtr<FixedText>> m_aMnemonicLabels;
- std::vector<css::accessibility::AccessibleRelation>
m_aExtraAccessibleRelations;
std::unique_ptr<ImplAccessibleInfos> mpAccessibleInfos;
VCLXWindow* mpVCLXWindow;
vcl::Region maWinRegion; //< region to 'shape' the
VCL window (frame coordinates)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 985503444597..6a8042ba2b1c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -374,17 +374,6 @@ void
SalInstanceWidget::set_accessible_relation_label_for(weld::Widget* pLabeled
m_xWidget->SetAccessibleRelationLabelFor(pAtkLabeled);
}
-void SalInstanceWidget::add_extra_accessible_relation(
- const css::accessibility::AccessibleRelation& rRelation)
-{
- m_xWidget->AddExtraAccessibleRelation(rRelation);
-}
-
-void SalInstanceWidget::clear_extra_accessible_relations()
-{
- m_xWidget->ClearExtraAccessibleRelations();
-}
-
void SalInstanceWidget::set_tooltip_text(const OUString& rTip)
{
m_xWidget->SetQuickHelpText(rTip);
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index f2069b87b885..6e5bbc372cb9 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1970,21 +1970,6 @@ const std::vector<VclPtr<FixedText> >&
Window::list_mnemonic_labels() const
return mpWindowImpl->m_aMnemonicLabels;
}
-void Window::AddExtraAccessibleRelation(const
css::accessibility::AccessibleRelation &rRelation)
-{
- mpWindowImpl->m_aExtraAccessibleRelations.push_back(rRelation);
-}
-
-const std::vector<css::accessibility::AccessibleRelation>&
Window::GetExtraAccessibleRelations() const
-{
- return mpWindowImpl->m_aExtraAccessibleRelations;
-}
-
-void Window::ClearExtraAccessibleRelations()
-{
- mpWindowImpl->m_aExtraAccessibleRelations.clear();
-}
-
} /* namespace vcl */
void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle&
rRect)
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f38c79f91a63..3b25934e4002 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2039,7 +2039,6 @@ private:
rtl::Reference<GtkDropTarget> m_xDropTarget;
rtl::Reference<GtkDragSource> m_xDragSource;
- std::vector<AtkRelation*> m_aExtraAtkRelations;
static void signalSizeAllocate(GtkWidget*, GdkRectangle* allocation,
gpointer widget)
{
@@ -2753,33 +2752,6 @@ public:
g_object_unref(pRelationSet);
}
- virtual void add_extra_accessible_relation(const
css::accessibility::AccessibleRelation &rRelation) override
- {
- AtkObject* pAtkObject = gtk_widget_get_accessible(m_pWidget);
- if (!pAtkObject)
- return;
-
- AtkRelationSet *pRelationSet = atk_object_ref_relation_set(pAtkObject);
- AtkRelation *pRel = atk_object_wrapper_relation_new(rRelation);
- m_aExtraAtkRelations.push_back(pRel);
- atk_relation_set_add(pRelationSet, pRel);
- g_object_unref(pRel);
- g_object_unref(pRelationSet);
- }
-
- virtual void clear_extra_accessible_relations() override
- {
- AtkObject* pAtkObject = gtk_widget_get_accessible(m_pWidget);
- if (!pAtkObject)
- return;
-
- AtkRelationSet *pRelationSet = atk_object_ref_relation_set(pAtkObject);
- for (AtkRelation* pRel : m_aExtraAtkRelations)
- atk_relation_set_remove(pRelationSet, pRel);
- m_aExtraAtkRelations.clear();
- g_object_unref(pRelationSet);
- }
-
virtual bool get_extents_relative_to(weld::Widget& rRelative, int& x, int
&y, int& width, int &height) override
{
//for toplevel windows this is sadly futile under wayland, so we can't
tell where a dialog is in order to allow
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
