summaryrefslogtreecommitdiffstats
path: root/comphelper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-23 16:45:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-25 13:51:24 +0100
commit0f28c8612f4269cec95688b53d182c7c0169236d (patch)
treed840fa85243c10376fc4fb60b4972c028953483a /comphelper
parentooxmlimport: support inherited listid (diff)
downloadcore-0f28c8612f4269cec95688b53d182c7c0169236d.tar.gz
core-0f28c8612f4269cec95688b53d182c7c0169236d.zip
loplugin:unused-returns in basegfx..cppcanvas
Change-Id: I32dc8c92871c8349651d2f4204a332d387e6e1b2 Reviewed-on: https://gerrit.libreoffice.org/48428 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx19
-rw-r--r--comphelper/source/misc/backupfilehelper.cxx24
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx6
3 files changed, 13 insertions, 36 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 49d033b54007..539a8c3795c0 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -833,7 +833,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
return xResult;
}
-bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName )
+void EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName )
{
// get the object name before(!) it is assigned to a new storage
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
@@ -891,18 +891,14 @@ bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc,
// rSrc.RemoveGraphicStream( aName );
}
-
- return bRet;
}
// #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+
-bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, bool bKeepToTempStorage )
+void EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, bool bKeepToTempStorage )
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( rName );
if ( xObj.is() )
- return RemoveEmbeddedObject( xObj, bKeepToTempStorage );
- else
- return false;
+ RemoveEmbeddedObject( xObj, bKeepToTempStorage );
}
bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt )
@@ -1066,7 +1062,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed
return true;
}
-bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj )
+void EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj )
{
// disconnect the object from the container and close it if possible
@@ -1097,8 +1093,6 @@ bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed:
// TODO/LATER: what if the object can not be closed?
}
}
-
- return bFound;
}
uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType )
@@ -1200,7 +1194,7 @@ bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const css::uno::Refer
}
-bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
+void EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
{
try
{
@@ -1209,10 +1203,7 @@ bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
}
catch (const uno::Exception&)
{
- return false;
}
-
- return true;
}
namespace {
void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor,
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index 64a8cea73929..9b8003edf161 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -1834,10 +1834,8 @@ namespace comphelper
}
}
- bool BackupFileHelper::tryPush()
+ void BackupFileHelper::tryPush()
{
- bool bDidPush(false);
-
// no push when SafeModeDir exists, it may be Office's exit after SafeMode
// where SafeMode flag is already deleted, but SafeModeDir cleanup is not
// done yet (is done at next startup)
@@ -1851,21 +1849,17 @@ namespace comphelper
// process all files in question recursively
if (!maDirs.empty() || !maFiles.empty())
{
- bDidPush = tryPush_Files(
+ tryPush_Files(
maDirs,
maFiles,
maUserConfigWorkURL,
aPackURL);
}
}
-
- return bDidPush;
}
- bool BackupFileHelper::tryPushExtensionInfo()
+ void BackupFileHelper::tryPushExtensionInfo()
{
- bool bDidPush(false);
-
// no push when SafeModeDir exists, it may be Office's exit after SafeMode
// where SafeMode flag is already deleted, but SafeModeDir cleanup is not
// done yet (is done at next startup)
@@ -1873,10 +1867,8 @@ namespace comphelper
{
const OUString aPackURL(getPackURL());
- bDidPush = tryPush_extensionInfo(aPackURL);
+ tryPush_extensionInfo(aPackURL);
}
-
- return bDidPush;
}
bool BackupFileHelper::isPopPossible()
@@ -1904,7 +1896,7 @@ namespace comphelper
return bPopPossible;
}
- bool BackupFileHelper::tryPop()
+ void BackupFileHelper::tryPop()
{
bool bDidPop(false);
@@ -1931,8 +1923,6 @@ namespace comphelper
osl::Directory::remove(aPackURL);
}
}
-
- return bDidPop;
}
bool BackupFileHelper::isPopPossibleExtensionInfo() const
@@ -1949,7 +1939,7 @@ namespace comphelper
return bPopPossible;
}
- bool BackupFileHelper::tryPopExtensionInfo()
+ void BackupFileHelper::tryPopExtensionInfo()
{
bool bDidPop(false);
@@ -1965,8 +1955,6 @@ namespace comphelper
osl::Directory::remove(aPackURL);
}
}
-
- return bDidPop;
}
bool BackupFileHelper::isTryDisableAllExtensionsPossible()
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index d70853b849f0..c906c0d22b39 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -357,7 +357,7 @@ bool OPropertyContainerHelper::convertFastPropertyValue(
}
-bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue)
+void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const Any& _rValue)
{
// get the property somebody is asking for
PropertiesIterator aPos = searchHandle(_nHandle);
@@ -366,7 +366,7 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An
OSL_FAIL( "OPropertyContainerHelper::setFastPropertyValue: unknown handle!" );
// should not happen if the derived class has built a correct property set info helper to be used by
// our base class OPropertySetHelper
- return false;
+ return;
}
bool bSuccess = true;
@@ -395,8 +395,6 @@ bool OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An
break;
}
-
- return bSuccess;
}
void OPropertyContainerHelper::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const