summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-11-25 19:52:09 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-11-25 20:35:57 +0100
commit4ac2f1799f1d6d428c06e5699c246184dd8590ad (patch)
treeb96b61a7a037074d3155b63f30c01fbf276c491f /sfx2
parent1bc269504bc16b188f77204f53f1c34541750da9 (diff)
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: I2ae298f49ceba8059cd7236431db9a4d9a46b125 Reviewed-on: https://gerrit.libreoffice.org/63992 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/linkmgr2.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 05c817ab7855..b2d9d8a37b61 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -471,14 +471,15 @@ void LinkManager::InsertFileLink(
void LinkManager::CancelTransfers()
{
SvFileObject* pFileObj;
- sfx2::SvBaseLink* pLnk;
const sfx2::SvBaseLinks& rLnks = GetLinks();
for( size_t n = rLnks.size(); n; )
- if( nullptr != ( pLnk = &(*rLnks[ --n ])) &&
- OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
- nullptr != ( pFileObj = static_cast<SvFileObject*>(pLnk->GetObj()) ) )
+ {
+ const sfx2::SvBaseLink& rLnk = *rLnks[--n];
+ if (OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & rLnk.GetObjType())
+ && nullptr != (pFileObj = static_cast<SvFileObject*>(rLnk.GetObj())))
pFileObj->CancelTransfers();
+ }
}
// For the purpose of sending Status information from the file object to