diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-03 14:08:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-04 07:17:23 +0100 |
| commit | 21e0d8162a0e683558c4d042ce688fc9a6833809 (patch) | |
| tree | 8c93a0158d7669b1e92a43c65b6b4a7a7eeca685 /oox | |
| parent | 5de151f0fd7b590ae13560086b46ea84e4d9cf9c (diff) | |
loplugin:unusedfields
fix the ReturnStmt check
Change-Id: I95076076bd1313d23798c4615ea12910c86ed9a8
Reviewed-on: https://gerrit.libreoffice.org/47309
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ppt/pptimport.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 3b622792282e..9af79983d28f 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -205,20 +205,15 @@ sal_Int32 PowerPointImport::getSchemeColor( sal_Int32 nToken ) const pClrMapPtr->getColorMap( nToken ); } } - oox::drawingml::ClrSchemePtr pClrSchemePtr( mpActualSlidePersist->getClrScheme() ); - if ( pClrSchemePtr ) - pClrSchemePtr->getColor( nToken, nColor ); + + ::oox::drawingml::ThemePtr pTheme = mpActualSlidePersist->getTheme(); + if( pTheme ) + { + pTheme->getClrScheme().getColor( nToken, nColor ); + } else { - ::oox::drawingml::ThemePtr pTheme = mpActualSlidePersist->getTheme(); - if( pTheme ) - { - pTheme->getClrScheme().getColor( nToken, nColor ); - } - else - { - SAL_WARN("oox", "OOX: PowerPointImport::mpThemePtr is NULL"); - } + SAL_WARN("oox", "OOX: PowerPointImport::mpThemePtr is NULL"); } } return nColor; |