summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-27 17:11:34 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2020-06-01 15:46:33 +0200
commitf753baddc057a3bf4881ac78a15cd11fa847ee28 (patch)
treee62c5ce04a7be19c338f813392748ddecbd6f66c /vcl
parent8871f81f218dd49de27d528e54a515d1648d3554 (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 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) Change-Id: I2685e480d2d15220be0bddbc83baad3992e7d5d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95014 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/window.h1
-rw-r--r--vcl/source/app/salvtables.cxx10
-rw-r--r--vcl/source/window/window2.cxx15
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx29
4 files changed, 1 insertions, 54 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index a328abf75c0e..89c0ff8cf3b9 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -280,7 +280,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 042008200709..4231a572d81c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -546,16 +546,6 @@ public:
m_xWidget->SetAccessibleRelationLabelFor(pAtkLabeled);
}
- virtual void add_extra_accessible_relation(const css::accessibility::AccessibleRelation &rRelation) override
- {
- m_xWidget->AddExtraAccessibleRelation(rRelation);
- }
-
- virtual void clear_extra_accessible_relations() override
- {
- m_xWidget->ClearExtraAccessibleRelations();
- }
-
virtual void set_tooltip_text(const OUString& rTip) override
{
m_xWidget->SetQuickHelpText(rTip);
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 9183ded20184..aa791975e765 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1959,21 +1959,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 14be34515a50..6faad1ddf9c3 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1920,7 +1920,7 @@ private:
gulong m_nDragLeaveSignalId;
rtl::Reference<GtkDropTarget> m_xDropTarget;
- std::vector<AtkRelation*> m_aExtraAtkRelations;
+ rtl::Reference<GtkDragSource> m_xDragSource;
static void signalSizeAllocate(GtkWidget*, GdkRectangle* allocation, gpointer widget)
{
@@ -2510,33 +2510,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