diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-08 16:12:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-09 08:28:56 +0200 |
| commit | 719a2adfbdac8ce26a035e5fedeeaade8706832d (patch) | |
| tree | 541a185d2c60d83da75306bab6bd93527c9b4d73 /sd | |
| parent | 4763091bbecab8722a43d0ed73eafc0a1f596242 (diff) | |
remove unnecessary empty OUString fields and vars
Change-Id: I940120087a0bc6b1b0abc30a3e7727ce22b7d9a7
Reviewed-on: https://gerrit.libreoffice.org/37394
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/stlpool.hxx | 2 | ||||
| -rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 6 | ||||
| -rw-r--r-- | sd/source/core/stlpool.cxx | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 4447ee7f31af..dd412963bd84 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -124,7 +124,7 @@ public: protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets ); - void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix ); + void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, const OUString &rRenameSuffix ); virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask) override; diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 86e7fd18bfb1..cc78e33da1b0 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1643,8 +1643,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres if( pPreset.get() ) { - OUString strEmpty; - Reference< XAnimationNode > xNode( pPreset->create( strEmpty ) ); + Reference< XAnimationNode > xNode( pPreset->create( "" ) ); if( xNode.is() ) { // first, filter all only ui relevant user data @@ -1776,8 +1775,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, double fDuration /* = -1.0 */ ) { - OUString strEmpty; - replace( pEffect, pPreset, strEmpty, fDuration ); + replace( pEffect, pPreset, "", fDuration ); } void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect ) diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 64e894c97cb5..624f329ca45d 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -605,8 +605,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets) { - OUString emptyName; - CopySheets(rSourcePool, eFamily, rCreatedSheets, emptyName); + CopySheets(rSourcePool, eFamily, rCreatedSheets, ""); } namespace @@ -626,7 +625,7 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate } -void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString& rRenameSuffix) +void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, const OUString& rRenameSuffix) { std::vector< std::pair< rtl::Reference< SfxStyleSheetBase >, OUString > > aNewStyles; std::vector< std::pair< OUString, OUString > > aRenamedList; |