[Libreoffice-commits] core.git: cppcanvas/source
Ivan Safonov
insafonov at gmail.com
Sat Aug 12 18:53:09 UTC 2017
cppcanvas/source/inc/action.hxx | 3
cppcanvas/source/inc/implrenderer.hxx | 4 -
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 8 +-
cppcanvas/source/mtfrenderer/bitmapaction.hxx | 4 -
cppcanvas/source/mtfrenderer/emfplus.cxx | 14 ++--
cppcanvas/source/mtfrenderer/implrenderer.cxx | 46 +++++++--------
cppcanvas/source/mtfrenderer/lineaction.cxx | 4 -
cppcanvas/source/mtfrenderer/lineaction.hxx | 2
cppcanvas/source/mtfrenderer/pointaction.cxx | 8 +-
cppcanvas/source/mtfrenderer/pointaction.hxx | 4 -
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 20 +++---
cppcanvas/source/mtfrenderer/polypolyaction.hxx | 10 +--
cppcanvas/source/mtfrenderer/textaction.cxx | 28 ++++-----
cppcanvas/source/mtfrenderer/textaction.hxx | 2
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 4 -
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx | 2
16 files changed, 80 insertions(+), 83 deletions(-)
New commits:
commit c88d4ddfcdbf3fcaf7eddbfc56ec9e15392ecf85
Author: Ivan Safonov <insafonov at gmail.com>
Date: Mon Jul 24 00:05:40 2017 +0300
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 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index aa63ffce01bd..ff1ccc8b6949 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -144,9 +144,6 @@ namespace cppcanvas
*/
virtual sal_Int32 getActionCount() const = 0;
};
-
- typedef std::shared_ptr< Action > ActionSharedPtr;
-
}
}
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index d8752f544139..de215e0132ca 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -199,14 +199,14 @@ static float GetSwapFloat( SvStream& rSt )
// public, since some functors need it, too.
struct MtfAction
{
- MtfAction( const ActionSharedPtr& rAction,
+ MtfAction( const std::shared_ptr<Action>& rAction,
sal_Int32 nOrigIndex ) :
mpAction( rAction ),
mnOrigIndex( nOrigIndex )
{
}
- ActionSharedPtr mpAction;
+ std::shared_ptr<Action> mpAction;
sal_Int32 mnOrigIndex;
};
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index db8c597afcba..34513fd0528e 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -197,24 +197,24 @@ namespace cppcanvas
}
}
- ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx,
+ std::shared_ptr<Action> BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx,
const ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
- return ActionSharedPtr( new BitmapAction(rBmpEx,
+ return std::shared_ptr<Action>( new BitmapAction(rBmpEx,
rDstPoint,
rCanvas,
rState ) );
}
- ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx,
+ std::shared_ptr<Action> BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
- return ActionSharedPtr( new BitmapAction(rBmpEx,
+ return std::shared_ptr<Action>( new BitmapAction(rBmpEx,
rDstPoint,
rDstSize,
rCanvas,
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index d028828c32fe..84b2cd3f4391 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -47,13 +47,13 @@ namespace cppcanvas
namespace BitmapActionFactory
{
/// Unscaled bitmap action, only references destination point
- ActionSharedPtr createBitmapAction( const ::BitmapEx&,
+ std::shared_ptr<Action> createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr&,
const OutDevState& );
/// Scaled bitmap action, dest point and dest size
- ActionSharedPtr createBitmapAction( const ::BitmapEx&,
+ std::shared_ptr<Action> createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr&,
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index f55dea3af038..171e313271b3 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -307,7 +307,7 @@ namespace cppcanvas
localPolygon.transform( rState.mapModeTransform );
- ActionSharedPtr pPolyAction;
+ std::shared_ptr<Action> pPolyAction;
if (isColor) {
SAL_INFO("cppcanvas.emf", "EMF+\t\tcolor fill:0x" << std::hex << brushIndexOrColor << std::dec);
@@ -580,7 +580,7 @@ namespace cppcanvas
bool bWasFillColorSet = rState.isFillColorSet;
rState.isFillColorSet = true;
rState.fillColor = rState.lineColor;
- ActionSharedPtr pAction2(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState));
+ std::shared_ptr<Action> pAction2(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState));
if (pAction2)
{
maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex));
@@ -590,7 +590,7 @@ namespace cppcanvas
}
else
{
- ActionSharedPtr pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState, rAttributes));
+ std::shared_ptr<Action> pAction(internal::PolyPolyActionFactory::createPolyPolyAction(aArrow, rParms.mrCanvas, rState, rAttributes));
if (pAction)
{
maActions.push_back(MtfAction(pAction, rParms.mrCurrActionIndex));
@@ -685,7 +685,7 @@ namespace cppcanvas
}
// finally render the polygon
- ActionSharedPtr pPolyAction(internal::PolyPolyActionFactory::createPolyPolyAction(aFinalPolyPolygon, rParms.mrCanvas, rState, aPolygonAttributes));
+ std::shared_ptr<Action> pPolyAction(internal::PolyPolyActionFactory::createPolyPolyAction(aFinalPolyPolygon, rParms.mrCanvas, rState, aPolygonAttributes));
if( pPolyAction )
{
maActions.push_back(MtfAction(pPolyAction, rParms.mrCurrActionIndex));
@@ -1236,7 +1236,7 @@ namespace cppcanvas
Size aSize( aBmp.GetSizePixel() );
SAL_INFO("cppcanvas.emf", "EMF+ bitmap size: " << aSize.Width() << "x" << aSize.Height());
if( aSize.Width() > 0 && aSize.Height() > 0 ) {
- ActionSharedPtr pBmpAction (
+ std::shared_ptr<Action> pBmpAction (
internal::BitmapActionFactory::createBitmapAction (
aBmp,
rState.mapModeTransform * aDstPoint,
@@ -1296,7 +1296,7 @@ namespace cppcanvas
::basegfx::B2DPoint point( Map( lx + 0.15*cellSize, ly + cellSize ) );
- ActionSharedPtr pTextAction(
+ std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction(
// position is just rough guess for now
// we should calculate it exactly from layoutRect or font
@@ -1613,7 +1613,7 @@ namespace cppcanvas
::basegfx::B2DPoint point( Map( charsPosX[0], charsPosY[0] ) );
- ActionSharedPtr pTextAction(
+ std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction(
vcl::unotools::pointFromB2DPoint ( point ),
::Size(),
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;
}
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index 5d9acd23ef05..148ee26fd4e8 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -142,12 +142,12 @@ namespace cppcanvas
}
}
- ActionSharedPtr LineActionFactory::createLineAction( const ::basegfx::B2DPoint& rStartPoint,
+ std::shared_ptr<Action> LineActionFactory::createLineAction( const ::basegfx::B2DPoint& rStartPoint,
const ::basegfx::B2DPoint& rEndPoint,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
- return ActionSharedPtr( new LineAction( rStartPoint,
+ return std::shared_ptr<Action>( new LineAction( rStartPoint,
rEndPoint,
rCanvas,
rState) );
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index 5895feafbb66..9761e4272626 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -46,7 +46,7 @@ namespace cppcanvas
namespace LineActionFactory
{
/// Plain hair line from point 1 to point 2
- ActionSharedPtr createLineAction( const ::basegfx::B2DPoint&,
+ std::shared_ptr<Action> createLineAction( const ::basegfx::B2DPoint&,
const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState& );
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 65cd910fe82c..0c279ce00649 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -155,19 +155,19 @@ namespace cppcanvas
}
}
- ActionSharedPtr PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,
+ std::shared_ptr<Action> PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
- return ActionSharedPtr( new PointAction( rPoint, rCanvas, rState ) );
+ return std::shared_ptr<Action>( new PointAction( rPoint, rCanvas, rState ) );
}
- ActionSharedPtr PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,
+ std::shared_ptr<Action> PointActionFactory::createPointAction( const ::basegfx::B2DPoint& rPoint,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState,
const ::Color& rColor )
{
- return ActionSharedPtr( new PointAction( rPoint, rCanvas, rState, rColor ) );
+ return std::shared_ptr<Action>( new PointAction( rPoint, rCanvas, rState, rColor ) );
}
}
}
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index 4881ebd0d505..af969c474ba1 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -46,12 +46,12 @@ namespace cppcanvas
namespace PointActionFactory
{
/// Point in current color
- ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
+ std::shared_ptr<Action> createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState& );
/// Point in given color
- ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&,
+ std::shared_ptr<Action> createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&,
const OutDevState&,
const ::Color& );
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index e5363a649826..a45642cb116b 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -449,55 +449,55 @@ namespace cppcanvas
}
}
- ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
+ std::shared_ptr<Action> PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet,
"PolyPolyActionFactory::createPolyPolyAction() with empty line and fill color" );
- return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState,
+ return std::shared_ptr<Action>( new PolyPolyAction( rPoly, rCanvas, rState,
rState.isFillColorSet,
rState.isLineColorSet ) );
}
- ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
+ std::shared_ptr<Action> PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState,
const rendering::Texture& rTexture )
{
- return ActionSharedPtr( new TexturedPolyPolyAction( rPoly, rCanvas, rState, rTexture ) );
+ return std::shared_ptr<Action>( new TexturedPolyPolyAction( rPoly, rCanvas, rState, rTexture ) );
}
- ActionSharedPtr PolyPolyActionFactory::createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
+ std::shared_ptr<Action> PolyPolyActionFactory::createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
OSL_ENSURE( rState.isLineColorSet,
"PolyPolyActionFactory::createLinePolyPolyAction() called with empty line color" );
- return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState,
+ return std::shared_ptr<Action>( new PolyPolyAction( rPoly, rCanvas, rState,
false,
rState.isLineColorSet ) );
}
- ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
+ std::shared_ptr<Action> PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState,
const rendering::StrokeAttributes& rStrokeAttributes )
{
OSL_ENSURE( rState.isLineColorSet,
"PolyPolyActionFactory::createPolyPolyAction() for strokes called with empty line color" );
- return ActionSharedPtr( new StrokedPolyPolyAction( rPoly, rCanvas, rState, rStrokeAttributes ) );
+ return std::shared_ptr<Action>( new StrokedPolyPolyAction( rPoly, rCanvas, rState, rStrokeAttributes ) );
}
- ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
+ std::shared_ptr<Action> PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState,
int nTransparency )
{
OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet,
"PolyPolyActionFactory::createPolyPolyAction() with empty line and fill color" );
- return ActionSharedPtr( new PolyPolyAction( rPoly, rCanvas, rState,
+ return std::shared_ptr<Action>( new PolyPolyAction( rPoly, rCanvas, rState,
rState.isFillColorSet,
rState.isLineColorSet,
nTransparency ) );
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 394dea277152..9ef7fb2bba38 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -52,29 +52,29 @@ namespace cppcanvas
namespace PolyPolyActionFactory
{
/// Create polygon, fill/stroke according to state
- ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+ std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState& );
/// Create texture-filled polygon
- ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+ std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
const css::rendering::Texture& );
/// Create line polygon (always stroked, not filled)
- ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+ std::shared_ptr<Action> createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState& );
/// Create stroked polygon
- ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+ std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
const css::rendering::StrokeAttributes& );
/// For transparent painting of the given polygon (normally, we take the colors always opaque)
- ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
+ std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&,
const OutDevState&,
int nTransparency );
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,
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index 2c0b240fc847..1760477bf79a 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -61,7 +61,7 @@ namespace cppcanvas
subsettable (Action::render( Subset ) works on
characters)
*/
- ActionSharedPtr createTextAction( const ::Point& rStartPoint,
+ std::shared_ptr<Action> createTextAction( const ::Point& rStartPoint,
const ::Size& rReliefOffset,
const ::Color& rReliefColor,
const ::Size& rShadowOffset,
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 474d22b7dfae..f8e03bf467d3 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -477,14 +477,14 @@ namespace cppcanvas
}
- ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
+ std::shared_ptr<Action> TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr& rCanvas,
const OutDevState& rState )
{
- return ActionSharedPtr( new TransparencyGroupAction(std::move(rGroupMtf),
+ return std::shared_ptr<Action>( new TransparencyGroupAction(std::move(rGroupMtf),
std::move(rAlphaGradient),
rDstPoint,
rDstSize,
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index b31ee8118a90..165fc29b31cb 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -79,7 +79,7 @@ namespace cppcanvas
Size of the transparency group object, in current
state coordinate system.
*/
- ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
+ std::shared_ptr<Action> createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient,
const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize,
More information about the Libreoffice-commits
mailing list