summaryrefslogtreecommitdiff
path: root/cppcanvas/source/mtfrenderer/implrenderer.cxx
diff options
context:
space:
mode:
authorIvan Safonov <insafonov@gmail.com>2017-07-24 00:05:40 +0300
committerJulien Nabet <serval2412@yahoo.fr>2017-08-12 20:51:57 +0200
commitc88d4ddfcdbf3fcaf7eddbfc56ec9e15392ecf85 (patch)
treeac8e4fd71668382cabb13edf4645459af98ed05c /cppcanvas/source/mtfrenderer/implrenderer.cxx
parent1a4dd1fa2a851f678d728ed342a59d48f8cc74ea (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/implrenderer.cxx')
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx46
1 files changed, 23 insertions, 23 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 79887c892857..19e97640264c 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -391,7 +391,7 @@ namespace cppcanvas
return false;
}
- ActionSharedPtr pPolyAction(
+ std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction(
rPolyPoly, rParms.mrCanvas, rState ) );
@@ -694,7 +694,7 @@ namespace cppcanvas
uno::UNO_QUERY);
if( aTexture.Gradient.is() )
{
- ActionSharedPtr pPolyAction(
+ std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction(
aDevicePoly,
rParms.mrCanvas,
@@ -933,7 +933,7 @@ namespace cppcanvas
}
// create the actual text action
- ActionSharedPtr pTextAction(
+ std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction(
rStartPoint,
aReliefOffset,
@@ -950,7 +950,7 @@ namespace cppcanvas
rParms.mrParms,
bSubsettableActions ) );
- ActionSharedPtr pStrikeoutTextAction;
+ std::shared_ptr<Action> pStrikeoutTextAction;
if ( rState.textStrikeoutStyle == STRIKEOUT_X || rState.textStrikeoutStyle == STRIKEOUT_SLASH )
{
@@ -1730,7 +1730,7 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon aPoly( aPath.getB2DPolyPolygon() );
aPoly.transform( rStates.getState().mapModeTransform );
- ActionSharedPtr pPolyAction(
+ std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction(
aPoly,
rCanvas,
@@ -1796,7 +1796,7 @@ namespace cppcanvas
const OutDevState& rState( rStates.getState() );
if( rState.lineColor.getLength() )
{
- ActionSharedPtr pPointAction(
+ std::shared_ptr<Action> pPointAction(
internal::PointActionFactory::createPointAction(
rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ),
@@ -1821,7 +1821,7 @@ namespace cppcanvas
const OutDevState& rState( rStates.getState() );
if( rState.lineColor.getLength() )
{
- ActionSharedPtr pPointAction(
+ std::shared_ptr<Action> pPointAction(
internal::PointActionFactory::createPointAction(
rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ),
@@ -1856,7 +1856,7 @@ namespace cppcanvas
const ::basegfx::B2DPoint aEndPoint(
rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() ));
- ActionSharedPtr pLineAction;
+ std::shared_ptr<Action> pLineAction;
if( rLineInfo.IsDefault() )
{
@@ -2042,7 +2042,7 @@ namespace cppcanvas
::basegfx::B2DPolygon aPoly( pPolyLineAct->GetPolygon().getB2DPolygon() );
aPoly.transform( rState.mapModeTransform );
- ActionSharedPtr pLineAction;
+ std::shared_ptr<Action> pLineAction;
if( rLineInfo.IsDefault() )
{
@@ -2117,7 +2117,7 @@ namespace cppcanvas
{
MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pCurrAct);
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(),
rStates.getState().mapModeTransform *
@@ -2141,7 +2141,7 @@ namespace cppcanvas
{
MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pCurrAct);
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(),
rStates.getState().mapModeTransform *
@@ -2174,7 +2174,7 @@ namespace cppcanvas
pAct->GetSrcSize() );
aBmp.Crop( aCropRect );
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
@@ -2200,7 +2200,7 @@ namespace cppcanvas
{
MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pCurrAct);
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(),
rStates.getState().mapModeTransform *
@@ -2224,7 +2224,7 @@ namespace cppcanvas
{
MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pCurrAct);
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(),
rStates.getState().mapModeTransform *
@@ -2257,7 +2257,7 @@ namespace cppcanvas
pAct->GetSrcSize() );
aBmp.Crop( aCropRect );
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
@@ -2289,7 +2289,7 @@ namespace cppcanvas
BitmapEx aBmp( createMaskBmpEx( pAct->GetBitmap(),
pAct->GetColor() ));
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
@@ -2319,7 +2319,7 @@ namespace cppcanvas
BitmapEx aBmp( createMaskBmpEx( pAct->GetBitmap(),
pAct->GetColor() ));
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
@@ -2357,7 +2357,7 @@ namespace cppcanvas
pAct->GetSrcSize() );
aBmp.Crop( aCropRect );
- ActionSharedPtr pBmpAction(
+ std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction(
aBmp,
rStates.getState().mapModeTransform *
@@ -2398,7 +2398,7 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon aPoly( pAct->GetPolyPolygon().getB2DPolyPolygon() );
aPoly.transform( rState.mapModeTransform );
- ActionSharedPtr pPolyAction(
+ std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction(
aPoly,
rCanvas,
@@ -2431,7 +2431,7 @@ namespace cppcanvas
DBG_TESTSOLARMUTEX();
- ActionSharedPtr pFloatTransAction(
+ std::shared_ptr<Action> pFloatTransAction(
internal::TransparencyGroupActionFactory::createTransparencyGroupAction(
std::move(pMtf),
std::move(pGradient),
@@ -2507,7 +2507,7 @@ namespace cppcanvas
::basegfx::B2DSize(pAct->GetWidth(),
0 ));
- ActionSharedPtr pPolyAction(
+ std::shared_ptr<Action> pPolyAction(
PolyPolyActionFactory::createPolyPolyAction(
tools::createTextLinesPolyPolygon(
rState.mapModeTransform *
@@ -2834,10 +2834,10 @@ namespace cppcanvas
// find start and end action
// =========================
o_rRangeBegin = std::lower_bound( aBegin, aEnd,
- MtfAction( ActionSharedPtr(), io_rStartIndex ),
+ MtfAction( std::shared_ptr<Action>(), io_rStartIndex ),
UpperBoundActionIndexComparator() );
o_rRangeEnd = std::lower_bound( aBegin, aEnd,
- MtfAction( ActionSharedPtr(), io_rEndIndex ),
+ MtfAction( std::shared_ptr<Action>(), io_rEndIndex ),
UpperBoundActionIndexComparator() );
return true;
}