summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-27 17:38:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-28 14:40:35 +0200
commit51b40687d41aab9576dd4e2620c3cd5231732d58 (patch)
tree148121e4f1dc67e3bbae33c02f49b0a9da52ccb8 /sd/source
parent3e78c8b75c2a170b13395e86d6978946a1acbe7c (diff)
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 <caolanm@redhat.com> (cherry picked from commit 0b94169d820482434dc98a37c3c1633ca46fd0dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95012
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx9
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx112
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx7
-rw-r--r--sd/source/ui/inc/AccessibleDrawDocumentView.hxx6
-rw-r--r--sd/source/ui/view/Outliner.cxx10
5 files changed, 1 insertions, 143 deletions
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 );