basctl/source/basicide/macrodlg.cxx | 3 ++-
vcl/source/app/salvtables.cxx | 2 ++
vcl/unx/gtk3/gtk3gtkinst.cxx | 6 ++++++
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 19116d1061b287eef600ec6b3f46c362a4abd405
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 20 10:05:48 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 20 13:41:32 2019 +0100
consistency wrt notification events for treeview cursor change
Change-Id: I4ecc13cd7163304c0fa1683e75299d03ccc06446
Reviewed-on: https://gerrit.libreoffice.org/83283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0e72f42d14c6..e84c989841fa 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3694,6 +3694,7 @@ public:
virtual void set_cursor(int pos) override
{
+ disable_notify_events();
if (pos == -1)
m_xTreeView->SetCurEntry(nullptr);
else
@@ -3701,6 +3702,7 @@ public:
SvTreeListEntry* pEntry = m_xTreeView->GetEntry(nullptr, pos);
m_xTreeView->SetCurEntry(pEntry);
}
+ enable_notify_events();
}
virtual void scroll_to_row(int pos) override
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 61ba40b9fa1c..3bc15169c01f 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8813,9 +8813,11 @@ public:
virtual void set_cursor(int pos) override
{
+ disable_notify_events();
GtkTreePath* path = gtk_tree_path_new_from_indices(pos, -1);
gtk_tree_view_set_cursor(m_pTreeView, path, nullptr, false);
gtk_tree_path_free(path);
+ enable_notify_events();
}
virtual void scroll_to_row(int pos) override
@@ -9307,11 +9309,13 @@ public:
virtual void set_cursor(const weld::TreeIter& rIter) override
{
+ disable_notify_events();
const GtkInstanceTreeIter& rGtkIter = static_cast<const
GtkInstanceTreeIter&>(rIter);
GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore);
GtkTreePath* path = gtk_tree_model_get_path(pModel,
const_cast<GtkTreeIter*>(&rGtkIter.iter));
gtk_tree_view_set_cursor(m_pTreeView, path, nullptr, false);
gtk_tree_path_free(path);
+ enable_notify_events();
}
virtual bool get_iter_first(weld::TreeIter& rIter) const override
@@ -10170,11 +10174,13 @@ public:
virtual void set_cursor(const weld::TreeIter& rIter) override
{
+ disable_notify_events();
const GtkInstanceTreeIter& rGtkIter = static_cast<const
GtkInstanceTreeIter&>(rIter);
GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore);
GtkTreePath* path = gtk_tree_model_get_path(pModel,
const_cast<GtkTreeIter*>(&rGtkIter.iter));
gtk_icon_view_set_cursor(m_pIconView, path, nullptr, false);
gtk_tree_path_free(path);
+ enable_notify_events();
}
virtual bool get_iter_first(weld::TreeIter& rIter) const override
commit eee6ef53ebc5756a974e985925550dcd990876ca
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 20 10:02:27 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 20 13:41:19 2019 +0100
Resolves: tdf#128900 can't edit initial macro with empty user profile
Change-Id: I5e28a4253b755fc3f5ed7c02c99c2611513e5bd8
Reviewed-on: https://gerrit.libreoffice.org/83282
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index 3459a5432b9f..97a45c59c03c 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -152,7 +152,8 @@ void MacroChooser::RestoreMacroDescription()
aDesc = pData->GetLastEntryDescriptor();
}
- m_xBasicBox->SetCurrentEntry( aDesc );
+ m_xBasicBox->SetCurrentEntry(aDesc);
+ BasicSelectHdl(m_xBasicBox->get_widget());
OUString aLastMacro( aDesc.GetMethodName() );
if (!aLastMacro.isEmpty())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
