diff options
Diffstat (limited to 'slideshow/source/engine/shapes')
| -rw-r--r-- | slideshow/source/engine/shapes/drawshape.cxx | 15 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/drawshapesubsetting.cxx | 16 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/gdimtftools.cxx | 3 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewshape.cxx | 2 |
4 files changed, 16 insertions, 20 deletions
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index b0f4a1fa8011..c7ca1f8d4ffe 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -869,17 +869,15 @@ namespace slideshow maHyperlinkIndices.pop_back(); maHyperlinkRegions.pop_back(); } - maHyperlinkIndices.push_back( - HyperlinkIndexPair( nIndex + 1, - -1 /* to be filled below */ ) ); - maHyperlinkRegions.push_back( - HyperlinkRegion( + maHyperlinkIndices.emplace_back( nIndex + 1, + -1 /* to be filled below */ ); + maHyperlinkRegions.emplace_back( basegfx::B2DRectangle(), OUString( reinterpret_cast<sal_Unicode const*>( pAct->GetData()), pAct->GetDataSize() / sizeof(sal_Unicode) ) - ) ); + ); } else if (pAct->GetComment().equalsIgnoreAsciiCase("FIELD_SEQ_END") && // pending end is expected: @@ -977,12 +975,11 @@ namespace slideshow for( const auto& cp : maHyperlinkRegions ) { basegfx::B2DRange const& relRegion( cp.first ); - aTranslatedRegions.push_back( - std::make_pair( + aTranslatedRegions.emplace_back( basegfx::B2DRange( relRegion.getMinimum() + rOffset, relRegion.getMaximum() + rOffset), - cp.second) ); + cp.second ); } return aTranslatedRegions; diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index b94624681233..1de7934719d9 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -185,19 +185,19 @@ namespace slideshow { // non-subsetted node, with some child subsets // that subtract from it - maCurrentSubsets.push_back( DocTreeNode( 0, - mnMinSubsetActionIndex ) ); - maCurrentSubsets.push_back( DocTreeNode( mnMaxSubsetActionIndex, - maActionClassVector.size() ) ); + maCurrentSubsets.emplace_back( 0, + mnMinSubsetActionIndex ); + maCurrentSubsets.emplace_back( mnMaxSubsetActionIndex, + maActionClassVector.size() ); } else { // subsetted node, from which some further child // subsets subtract content - maCurrentSubsets.push_back( DocTreeNode( maSubset.getStartIndex(), - mnMinSubsetActionIndex ) ); - maCurrentSubsets.push_back( DocTreeNode( mnMaxSubsetActionIndex, - maSubset.getEndIndex() ) ); + maCurrentSubsets.emplace_back( maSubset.getStartIndex(), + mnMinSubsetActionIndex ); + maCurrentSubsets.emplace_back( mnMaxSubsetActionIndex, + maSubset.getEndIndex() ); } } else diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index fb12c9853392..1901011a18ac 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -387,8 +387,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, if( nWaitTime100thSeconds == 0 ) nWaitTime100thSeconds = 10; - o_rFrames.push_back( MtfAnimationFrame( pMtf, - nWaitTime100thSeconds / 100.0 ) ); + o_rFrames.emplace_back( pMtf, nWaitTime100thSeconds / 100.0 ); } return !o_rFrames.empty(); diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 449f18116e02..c88d4e85617f 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -755,7 +755,7 @@ namespace slideshow // not yet in cache - add default-constructed cache // entry, to have something to return - maRenderers.push_back( RendererCacheEntry() ); + maRenderers.emplace_back( ); aIter = maRenderers.end()-1; } |