summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-08-07 12:49:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-08-07 15:40:29 +0200
commit6e2bd11251afbe64f9889ede36b28b00f47aaff5 (patch)
treec83ca0998b71323c7a87744a7956820f3d2344f3 /vcl/source/app
parent42a32f375a2641e6e82ee685efa3573c0dcaf001 (diff)
tdf#150291 Revert "Fix crash when no valid EntryDescriptor found"
This reverts commit 499ecbf3a36990c29dc7e1fb9b0ecb1d297c2848 because it causes the dialog not to start with the default selected macro auto-expanded like it used to. Possibly the other fix for tdf#150291 solves the original problem. Change-Id: Ic91410de073fe87d4edebde18b60ffcc1ad324a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137923 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/salvtables.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1cc12d47a12c..02394ac9176c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4900,8 +4900,6 @@ void SalInstanceTreeView::set_text(const weld::TreeIter& rIter, const OUString&
OUString SalInstanceTreeView::get_id(const weld::TreeIter& rIter) const
{
const SalInstanceTreeIter& rVclIter = static_cast<const SalInstanceTreeIter&>(rIter);
- if (!rVclIter.iter)
- return OUString();
const OUString* pStr = static_cast<const OUString*>(rVclIter.iter->GetUserData());
if (pStr)
return *pStr;