[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/options/treeopt.cxx |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 379d6042cd379df4988f891d068996ba8035f9da
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 31 08:57:50 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 31 11:28:25 2023 +0200

    cid#1542448 make_iterator always succeeds
    
    so (!xEntry) here doesn't happen
    
    Change-Id: I9d4d63a14220ba69bf57f1a58a6d36e270252e8e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156325
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 4af68df0171a..d514b7deeb7f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -820,7 +820,6 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ImplUpdateDataHdl, 
Timer*, void)
 
 void OfaTreeOptionsDialog::selectFirstEntry()
 {
-    std::unique_ptr<weld::TreeIter> xEntry;
     std::unique_ptr<weld::TreeIter> xTemp = xTreeLB->make_iterator();
     bool bTemp = xTreeLB->get_iter_first(*xTemp);
 
@@ -829,17 +828,7 @@ void OfaTreeOptionsDialog::selectFirstEntry()
         // select only the first child
         if (xTreeLB->get_iter_depth(*xTemp) && 
xTreeLB->get_id(*xTemp).toInt64())
         {
-            xEntry = xTreeLB->make_iterator(xTemp.get());
-
-            if (!xEntry)
-            {
-                xEntry = xTreeLB->make_iterator();
-                if (!xTreeLB->get_iter_first(*xEntry) || 
!xTreeLB->iter_next(*xEntry))
-                    xEntry.reset();
-            }
-
-            if (!xEntry)
-                return;
+            std::unique_ptr<weld::TreeIter> 
xEntry(xTreeLB->make_iterator(xTemp.get()));
 
             std::unique_ptr<weld::TreeIter> 
xParent(xTreeLB->make_iterator(xEntry.get()));
             xTreeLB->iter_parent(*xParent);