diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-19 15:09:12 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-03-15 23:44:18 +0100 |
| commit | 4b2d899bc079240c32b7dacd139d6d4a29ab1b11 (patch) | |
| tree | bc767288813ff506b74a091472e357758f270dad /sc/source/filter | |
| parent | fd5e480eaf78c8bd2ea4315649fcbd5b8edaa3da (diff) | |
loplugin:unused-returns in sc
Change-Id: Ic1d6cbf883fcfeb013c3a82d31c177a1a14bb7c8
Reviewed-on: https://gerrit.libreoffice.org/48193
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/ftools/fapihelper.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/inc/fapihelper.hxx | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 0d09cfb5c2a5..27184bbb3cf4 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -312,12 +312,11 @@ void ScfPropSetHelper::ReadFromPropertySet( const ScfPropertySet& rPropSet ) mnNextIdx = 0; } -bool ScfPropSetHelper::ReadValue( Any& rAny ) +void ScfPropSetHelper::ReadValue( Any& rAny ) { Any* pAny = GetNextAny(); if( pAny ) rAny = *pAny; - return pAny != nullptr; } void ScfPropSetHelper::ReadValue( Color& rColor ) diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 0648da426305..8af382f16119 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -220,9 +220,9 @@ public: /** Reads the next value from the value sequence. */ template< typename Type > - bool ReadValue( Type& rValue ); + void ReadValue( Type& rValue ); /** Reads an Any from the value sequence. */ - bool ReadValue( css::uno::Any& rAny ); + void ReadValue( css::uno::Any& rAny ); /** Reads a color value from the value sequence. */ void ReadValue( Color& rColor ); /** Reads a C++ boolean value from the value sequence. */ @@ -259,10 +259,11 @@ private: }; template< typename Type > -bool ScfPropSetHelper::ReadValue( Type& rValue ) +void ScfPropSetHelper::ReadValue( Type& rValue ) { css::uno::Any* pAny = GetNextAny(); - return pAny && (*pAny >>= rValue); + if (pAny) + *pAny >>= rValue; } template< typename Type > |