[Libreoffice-commits] core.git: 2 commits - sc/source ucb/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/miscdlgs/acredlin.cxx |    6 ++++--
 ucb/source/ucp/file/filtask.cxx    |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6568ee89f4087172839698cdce453978854e4ff7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 11:06:14 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 19 00:01:07 2019 +0200

    cid#1448437 Unchecked return value
    
    Change-Id: I2dec7a66f5609b1e34d9b337f8c562440d3f5132
    Reviewed-on: https://gerrit.libreoffice.org/75891
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 3c54c50b8ed4..dd19b6edc7c3 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -1167,8 +1167,8 @@ TaskManager::move( sal_Int32 CommandId,
 
             osl::FileStatus aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL);
             osl::DirectoryItem aItem;
-            osl::DirectoryItem::get(dstUnqPath,aItem);
-            aItem.getFileStatus(aStatus);
+            (void)osl::DirectoryItem::get(dstUnqPath,aItem);
+            (void)aItem.getFileStatus(aStatus);
 
             if( aStatus.isValid(osl_FileStatus_Mask_Type)          &&
                 aStatus.isValid(osl_FileStatus_Mask_LinkTargetURL) &&
commit 7037fe070ba81fb3dd8dfc03a7ddeb5090b2288f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 10:29:55 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 19 00:00:54 2019 +0200

    cid#1448287 Unchecked return value
    
    Change-Id: Ifd6bd0f4218805ad52a256fad82a4d2455c6afa9
    Reviewed-on: https://gerrit.libreoffice.org/75871
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 44d89d2669be..3b381cd51e36 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1397,14 +1397,14 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* pChanges,sal_uLong nStar
 void ScAcceptChgDlg::RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction)
 {
     weld::TreeView& rTreeView = pTheView->GetWidget();
-    rTreeView.freeze();
 
     ScRedlinData *pEntryData=nullptr;
     std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator());
     if (rTreeView.get_cursor(xEntry.get()))
         pEntryData = reinterpret_cast<ScRedlinData*>(rTreeView.get_id(*xEntry).toInt64());
 
-    rTreeView.get_iter_first(*xEntry);
+    if (!rTreeView.get_iter_first(*xEntry))
+        return;
 
     sal_uLong nAction=0;
     if (pEntryData)
@@ -1428,6 +1428,8 @@ void ScAcceptChgDlg::RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction)
     }
     while (rTreeView.iter_next(*xEntry));
 
+    rTreeView.freeze();
+
     // MUST do it backwards, don't delete parents before children and GPF
     for (auto it = aIdsToRemove.rbegin(); it != aIdsToRemove.rend(); ++it)
         rTreeView.remove_id(*it);