diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-23 13:21:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 07:57:07 +0100 |
| commit | ec02714d6cd5be67d03e333efddb42ab572cae77 (patch) | |
| tree | 9e28e8a87c823b39a334830fcb6dfb564a967a08 /sfx2/source | |
| parent | 945a119675788f7c8f0a133ac0271f9340c1653a (diff) | |
loplugin:unused-returns in drawinglayer..svx
Change-Id: I033a78cc7fe7d8e5086f1c855c4aa371cc98dc7c
Reviewed-on: https://gerrit.libreoffice.org/48400
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 4f91e64a1343..b6d5d4eb91fb 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -434,12 +434,12 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer } } -bool LinkManager::InsertFileLink( +void LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm, const OUString* pFilterNm, const OUString* pRange) { if (!(OBJECT_CLIENT_SO & rLink.GetObjType())) - return false; + return; OUStringBuffer aBuf; aBuf.append(rFileNm); @@ -455,7 +455,7 @@ bool LinkManager::InsertFileLink( } OUString aCmd = aBuf.makeStringAndClear(); - return InsertLink(&rLink, nFileType, SfxLinkUpdateMode::ONCALL, &aCmd); + InsertLink(&rLink, nFileType, SfxLinkUpdateMode::ONCALL, &aCmd); } // A transfer is aborted, so cancel all download media diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 958429f6e005..76f79fafb501 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -573,11 +573,9 @@ bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const sal_ return false; } -bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, selection_cmp_fn> &rItems, +void TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, selection_cmp_fn> &rItems, const sal_uInt16 nTargetItem) { - bool ret = true; - TemplateContainerItem *pTarget = nullptr; TemplateContainerItem *pSrc = nullptr; @@ -623,12 +621,11 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s sMsg = sMsg.replaceFirst("$1",getRegionName(nTargetRegion)); ScopedVclPtrInstance<MessageDialog>(this, sMsg.replaceFirst( "$2",pViewItem->maTitle))->Execute(); - return false; //return if any single move operation fails + return; //return if any single move operation fails } if (!mpDocTemplates->Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId)) { - ret = false; continue; } } @@ -691,10 +688,6 @@ bool TemplateLocalView::moveTemplates(const std::set<const ThumbnailViewItem*, s Invalidate(); } } - else - ret = false; - - return ret; } bool TemplateLocalView::copyFrom (TemplateContainerItem *pItem, const OUString &rPath) |