diff options
| author | Ivan Safonov <insafonov@gmail.com> | 2017-07-24 00:05:40 +0300 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-08-12 20:51:57 +0200 |
| commit | c88d4ddfcdbf3fcaf7eddbfc56ec9e15392ecf85 (patch) | |
| tree | ac8e4fd71668382cabb13edf4645459af98ed05c /cppcanvas/source/mtfrenderer/textaction.cxx | |
| parent | 1a4dd1fa2a851f678d728ed342a59d48f8cc74ea (diff) | |
tdf#96099 Remove ActionSharedPtr typedef
Replace ActionSharedPtr by its definition.
Change-Id: Iedd14c85169230d961f0707671885451875529d7
Reviewed-on: https://gerrit.libreoffice.org/40340
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'cppcanvas/source/mtfrenderer/textaction.cxx')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 073b05d4b907..3c8827ecb65d 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -1901,7 +1901,7 @@ namespace cppcanvas text, and creates a properly setup OutlineAction from it. */ - ActionSharedPtr createOutline( const ::basegfx::B2DPoint& rStartPoint, + std::shared_ptr<Action> createOutline( const ::basegfx::B2DPoint& rStartPoint, const ::basegfx::B2DSize& rReliefOffset, const ::Color& rReliefColor, const ::basegfx::B2DSize& rShadowOffset, @@ -1941,7 +1941,7 @@ namespace cppcanvas rVDev.SetFont(aOrigFont); if( !bHaveOutlines ) - return ActionSharedPtr(); + return std::shared_ptr<Action>(); // remove offsetting from mapmode transformation // (outline polygons must stay at origin, only need to @@ -2000,7 +2000,7 @@ namespace cppcanvas if( rParms.maTextTransformation.is_initialized() ) { - return ActionSharedPtr( + return std::shared_ptr<Action>( new OutlineAction( rStartPoint, rReliefOffset, @@ -2017,7 +2017,7 @@ namespace cppcanvas } else { - return ActionSharedPtr( + return std::shared_ptr<Action>( new OutlineAction( rStartPoint, rReliefOffset, @@ -2036,7 +2036,7 @@ namespace cppcanvas } // namespace - ActionSharedPtr TextActionFactory::createTextAction( const ::Point& rStartPoint, + std::shared_ptr<Action> TextActionFactory::createTextAction( const ::Point& rStartPoint, const ::Size& rReliefOffset, const ::Color& rReliefColor, const ::Size& rShadowOffset, @@ -2099,7 +2099,7 @@ namespace cppcanvas const ::Color aEmptyColor( COL_AUTO ); - ActionSharedPtr ret; + std::shared_ptr<Action> ret; // no DX array, and no need to subset - no need to store // DX array, then. @@ -2115,7 +2115,7 @@ namespace cppcanvas // nope if( rParms.maTextTransformation.is_initialized() ) { - ret = ActionSharedPtr( new TextAction( + ret = std::shared_ptr<Action>( new TextAction( aStartPoint, rText, nStartPos, @@ -2126,7 +2126,7 @@ namespace cppcanvas } else { - ret = ActionSharedPtr( new TextAction( + ret = std::shared_ptr<Action>( new TextAction( aStartPoint, rText, nStartPos, @@ -2139,7 +2139,7 @@ namespace cppcanvas { // at least one of the effects requested if( rParms.maTextTransformation.is_initialized() ) - ret = ActionSharedPtr( new EffectTextAction( + ret = std::shared_ptr<Action>( new EffectTextAction( aStartPoint, aReliefOffset, rReliefColor, @@ -2153,7 +2153,7 @@ namespace cppcanvas rState, *rParms.maTextTransformation ) ); else - ret = ActionSharedPtr( new EffectTextAction( + ret = std::shared_ptr<Action>( new EffectTextAction( aStartPoint, aReliefOffset, rReliefColor, @@ -2178,7 +2178,7 @@ namespace cppcanvas { // nope if( rParms.maTextTransformation.is_initialized() ) - ret = ActionSharedPtr( new TextArrayAction( + ret = std::shared_ptr<Action>( new TextArrayAction( aStartPoint, rText, nStartPos, @@ -2188,7 +2188,7 @@ namespace cppcanvas rState, *rParms.maTextTransformation ) ); else - ret = ActionSharedPtr( new TextArrayAction( + ret = std::shared_ptr<Action>( new TextArrayAction( aStartPoint, rText, nStartPos, @@ -2201,7 +2201,7 @@ namespace cppcanvas { // at least one of the effects requested if( rParms.maTextTransformation.is_initialized() ) - ret = ActionSharedPtr( new EffectTextArrayAction( + ret = std::shared_ptr<Action>( new EffectTextArrayAction( aStartPoint, aReliefOffset, rReliefColor, @@ -2216,7 +2216,7 @@ namespace cppcanvas rState, *rParms.maTextTransformation ) ); else - ret = ActionSharedPtr( new EffectTextArrayAction( + ret = std::shared_ptr<Action>( new EffectTextArrayAction( aStartPoint, aReliefOffset, rReliefColor, |