sc/source/ui/miscdlgs/crnrdlg.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 7ee5b165e8089a19306be14478270236b38ada01
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 16 15:38:18 2019 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 17 10:02:04 2019 +0200
Resolves: tdf#127546 crash on clicking --Column-- or --Row--
Change-Id: I59cbcdf09b679521b54aa9752bfb15db89829993
Reviewed-on: https://gerrit.libreoffice.org/79017
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx
b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 1a4414f992d4..ccd9076570a4 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -632,7 +632,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl,
weld::TreeView&, void)
while (nSelectPos != -1 && nSelectPos < nCnt &&
m_xLbRange->get_id(nSelectPos).toInt32() == nEntryDataDelim)
{ // skip Delimiter
++nMoves;
- m_xLbRange->select( ++nSelectPos );
+ ++nSelectPos;
}
OUString aRangeStr = m_xLbRange->get_selected_text();
if ( nMoves )
@@ -641,7 +641,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl,
weld::TreeView&, void)
{ // if entries exist before the " --- Row --- " Delimiter then
// do not stop at the delimiter
nSelectPos = nCnt - 2;
- m_xLbRange->select( nSelectPos );
+ m_xLbRange->select(nSelectPos);
aRangeStr = m_xLbRange->get_selected_text();
}
else if ( nSelectPos > 2 && nSelectPos < nCnt && !aRangeStr.isEmpty()
@@ -651,6 +651,8 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl,
weld::TreeView&, void)
m_xLbRange->select( nSelectPos );
aRangeStr = m_xLbRange->get_selected_text();
}
+ else
+ m_xLbRange->select(nSelectPos);
}
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
if ( itr != aRangeMap.end() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
