mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#96099 Remove ActionSharedPtr typedef

Browse Source 
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>
This commit is contained in:
Ivan Safonov
2017-07-24 00:05:40 +03:00
committed by Julien Nabet
parent 1a4dd1fa2a
commit c88d4ddfcd
16 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cppcanvas/source/inc/action.hxx
View File

@@ -144,9 +144,6 @@ namespace cppcanvas
*/ */
virtual sal_Int32 getActionCount() const = 0; virtual sal_Int32 getActionCount() const = 0;
}; };
typedef std::shared_ptr< Action > ActionSharedPtr;
} }
} }

4
cppcanvas/source/inc/implrenderer.hxx
View File

@@ -199,14 +199,14 @@ static float GetSwapFloat( SvStream& rSt )
// public, since some functors need it, too. // public, since some functors need it, too.
struct MtfAction struct MtfAction
{ {
MtfAction( const ActionSharedPtr& rAction, MtfAction( const std::shared_ptr<Action>& rAction,
sal_Int32 nOrigIndex ) : sal_Int32 nOrigIndex ) :
mpAction( rAction ), mpAction( rAction ),
mnOrigIndex( nOrigIndex ) mnOrigIndex( nOrigIndex )
{ {
} }
ActionSharedPtr mpAction; std::shared_ptr<Action> mpAction;
sal_Int32 mnOrigIndex; sal_Int32 mnOrigIndex;
}; };

8
cppcanvas/source/mtfrenderer/bitmapaction.cxx
View File

@@ -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 ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) const OutDevState& rState )
{ {
return ActionSharedPtr( new BitmapAction(rBmpEx, return std::shared_ptr<Action>( new BitmapAction(rBmpEx,
rDstPoint, rDstPoint,
rCanvas, rCanvas,
rState ) ); rState ) );
} }
ActionSharedPtr BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx, std::shared_ptr<Action> BitmapActionFactory::createBitmapAction( const ::BitmapEx& rBmpEx,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize, const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) const OutDevState& rState )
{ {
return ActionSharedPtr( new BitmapAction(rBmpEx, return std::shared_ptr<Action>( new BitmapAction(rBmpEx,
rDstPoint, rDstPoint,
rDstSize, rDstSize,
rCanvas, rCanvas,

4
cppcanvas/source/mtfrenderer/bitmapaction.hxx
View File

@@ -47,13 +47,13 @@ namespace cppcanvas
namespace BitmapActionFactory namespace BitmapActionFactory
{ {
/// Unscaled bitmap action, only references destination point /// Unscaled bitmap action, only references destination point
ActionSharedPtr createBitmapAction( const ::BitmapEx&, std::shared_ptr<Action> createBitmapAction( const ::BitmapEx&,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Scaled bitmap action, dest point and dest size /// 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::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize, const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr&, const CanvasSharedPtr&,

14
cppcanvas/source/mtfrenderer/emfplus.cxx
View File

@@ -307,7 +307,7 @@ namespace cppcanvas
localPolygon.transform( rState.mapModeTransform ); localPolygon.transform( rState.mapModeTransform );
ActionSharedPtr pPolyAction; std::shared_ptr<Action> pPolyAction;
if (isColor) { if (isColor) {
SAL_INFO("cppcanvas.emf", "EMF+\t\tcolor fill:0x" << std::hex << brushIndexOrColor << std::dec); SAL_INFO("cppcanvas.emf", "EMF+\t\tcolor fill:0x" << std::hex << brushIndexOrColor << std::dec);
@@ -580,7 +580,7 @@ namespace cppcanvas
bool bWasFillColorSet = rState.isFillColorSet; bool bWasFillColorSet = rState.isFillColorSet;
rState.isFillColorSet = true; rState.isFillColorSet = true;
rState.fillColor = rState.lineColor; 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) if (pAction2)
{ {
maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex)); maActions.push_back(MtfAction(pAction2, rParms.mrCurrActionIndex));
@@ -590,7 +590,7 @@ namespace cppcanvas
} }
else 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) if (pAction)
{ {
maActions.push_back(MtfAction(pAction, rParms.mrCurrActionIndex)); maActions.push_back(MtfAction(pAction, rParms.mrCurrActionIndex));
@@ -685,7 +685,7 @@ namespace cppcanvas
} }
// finally render the polygon // 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 ) if( pPolyAction )
{ {
maActions.push_back(MtfAction(pPolyAction, rParms.mrCurrActionIndex)); maActions.push_back(MtfAction(pPolyAction, rParms.mrCurrActionIndex));
@@ -1236,7 +1236,7 @@ namespace cppcanvas
Size aSize( aBmp.GetSizePixel() ); Size aSize( aBmp.GetSizePixel() );
SAL_INFO("cppcanvas.emf", "EMF+ bitmap size: " << aSize.Width() << "x" << aSize.Height()); SAL_INFO("cppcanvas.emf", "EMF+ bitmap size: " << aSize.Width() << "x" << aSize.Height());
if( aSize.Width() > 0 && aSize.Height() > 0 ) { if( aSize.Width() > 0 && aSize.Height() > 0 ) {
ActionSharedPtr pBmpAction ( std::shared_ptr<Action> pBmpAction (
internal::BitmapActionFactory::createBitmapAction ( internal::BitmapActionFactory::createBitmapAction (
aBmp, aBmp,
rState.mapModeTransform * aDstPoint, rState.mapModeTransform * aDstPoint,
@@ -1296,7 +1296,7 @@ namespace cppcanvas
::basegfx::B2DPoint point( Map( lx + 0.15*cellSize, ly + cellSize ) ); ::basegfx::B2DPoint point( Map( lx + 0.15*cellSize, ly + cellSize ) );
ActionSharedPtr pTextAction( std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction( TextActionFactory::createTextAction(
// position is just rough guess for now // position is just rough guess for now
// we should calculate it exactly from layoutRect or font // we should calculate it exactly from layoutRect or font
@@ -1613,7 +1613,7 @@ namespace cppcanvas
::basegfx::B2DPoint point( Map( charsPosX[0], charsPosY[0] ) ); ::basegfx::B2DPoint point( Map( charsPosX[0], charsPosY[0] ) );
ActionSharedPtr pTextAction( std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction( TextActionFactory::createTextAction(
vcl::unotools::pointFromB2DPoint ( point ), vcl::unotools::pointFromB2DPoint ( point ),
::Size(), ::Size(),

46
cppcanvas/source/mtfrenderer/implrenderer.cxx
View File

@@ -391,7 +391,7 @@ namespace cppcanvas
return false; return false;
} }
ActionSharedPtr pPolyAction( std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction( internal::PolyPolyActionFactory::createPolyPolyAction(
rPolyPoly, rParms.mrCanvas, rState ) ); rPolyPoly, rParms.mrCanvas, rState ) );
@@ -694,7 +694,7 @@ namespace cppcanvas
uno::UNO_QUERY); uno::UNO_QUERY);
if( aTexture.Gradient.is() ) if( aTexture.Gradient.is() )
{ {
ActionSharedPtr pPolyAction( std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction( internal::PolyPolyActionFactory::createPolyPolyAction(
aDevicePoly, aDevicePoly,
rParms.mrCanvas, rParms.mrCanvas,
@@ -933,7 +933,7 @@ namespace cppcanvas
} }
// create the actual text action // create the actual text action
ActionSharedPtr pTextAction( std::shared_ptr<Action> pTextAction(
TextActionFactory::createTextAction( TextActionFactory::createTextAction(
rStartPoint, rStartPoint,
aReliefOffset, aReliefOffset,
@@ -950,7 +950,7 @@ namespace cppcanvas
rParms.mrParms, rParms.mrParms,
bSubsettableActions ) ); bSubsettableActions ) );
ActionSharedPtr pStrikeoutTextAction; std::shared_ptr<Action> pStrikeoutTextAction;
if ( rState.textStrikeoutStyle == STRIKEOUT_X || rState.textStrikeoutStyle == STRIKEOUT_SLASH ) if ( rState.textStrikeoutStyle == STRIKEOUT_X || rState.textStrikeoutStyle == STRIKEOUT_SLASH )
{ {
@@ -1730,7 +1730,7 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon aPoly( aPath.getB2DPolyPolygon() ); ::basegfx::B2DPolyPolygon aPoly( aPath.getB2DPolyPolygon() );
aPoly.transform( rStates.getState().mapModeTransform ); aPoly.transform( rStates.getState().mapModeTransform );
ActionSharedPtr pPolyAction( std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction( internal::PolyPolyActionFactory::createPolyPolyAction(
aPoly, aPoly,
rCanvas, rCanvas,
@@ -1796,7 +1796,7 @@ namespace cppcanvas
const OutDevState& rState( rStates.getState() ); const OutDevState& rState( rStates.getState() );
if( rState.lineColor.getLength() ) if( rState.lineColor.getLength() )
{ {
ActionSharedPtr pPointAction( std::shared_ptr<Action> pPointAction(
internal::PointActionFactory::createPointAction( internal::PointActionFactory::createPointAction(
rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ), static_cast<MetaPointAction*>(pCurrAct)->GetPoint() ),
@@ -1821,7 +1821,7 @@ namespace cppcanvas
const OutDevState& rState( rStates.getState() ); const OutDevState& rState( rStates.getState() );
if( rState.lineColor.getLength() ) if( rState.lineColor.getLength() )
{ {
ActionSharedPtr pPointAction( std::shared_ptr<Action> pPointAction(
internal::PointActionFactory::createPointAction( internal::PointActionFactory::createPointAction(
rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( rState.mapModeTransform * vcl::unotools::b2DPointFromPoint(
static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ), static_cast<MetaPixelAction*>(pCurrAct)->GetPoint() ),
@@ -1856,7 +1856,7 @@ namespace cppcanvas
const ::basegfx::B2DPoint aEndPoint( const ::basegfx::B2DPoint aEndPoint(
rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() )); rState.mapModeTransform * vcl::unotools::b2DPointFromPoint( pLineAct->GetEndPoint() ));
ActionSharedPtr pLineAction; std::shared_ptr<Action> pLineAction;
if( rLineInfo.IsDefault() ) if( rLineInfo.IsDefault() )
{ {
@@ -2042,7 +2042,7 @@ namespace cppcanvas
::basegfx::B2DPolygon aPoly( pPolyLineAct->GetPolygon().getB2DPolygon() ); ::basegfx::B2DPolygon aPoly( pPolyLineAct->GetPolygon().getB2DPolygon() );
aPoly.transform( rState.mapModeTransform ); aPoly.transform( rState.mapModeTransform );
ActionSharedPtr pLineAction; std::shared_ptr<Action> pLineAction;
if( rLineInfo.IsDefault() ) if( rLineInfo.IsDefault() )
{ {
@@ -2117,7 +2117,7 @@ namespace cppcanvas
{ {
MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pCurrAct); MetaBmpAction* pAct = static_cast<MetaBmpAction*>(pCurrAct);
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(), pAct->GetBitmap(),
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2141,7 +2141,7 @@ namespace cppcanvas
{ {
MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pCurrAct); MetaBmpScaleAction* pAct = static_cast<MetaBmpScaleAction*>(pCurrAct);
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmap(), pAct->GetBitmap(),
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2174,7 +2174,7 @@ namespace cppcanvas
pAct->GetSrcSize() ); pAct->GetSrcSize() );
aBmp.Crop( aCropRect ); aBmp.Crop( aCropRect );
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
aBmp, aBmp,
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2200,7 +2200,7 @@ namespace cppcanvas
{ {
MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pCurrAct); MetaBmpExAction* pAct = static_cast<MetaBmpExAction*>(pCurrAct);
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(), pAct->GetBitmapEx(),
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2224,7 +2224,7 @@ namespace cppcanvas
{ {
MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pCurrAct); MetaBmpExScaleAction* pAct = static_cast<MetaBmpExScaleAction*>(pCurrAct);
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
pAct->GetBitmapEx(), pAct->GetBitmapEx(),
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2257,7 +2257,7 @@ namespace cppcanvas
pAct->GetSrcSize() ); pAct->GetSrcSize() );
aBmp.Crop( aCropRect ); aBmp.Crop( aCropRect );
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
aBmp, aBmp,
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2289,7 +2289,7 @@ namespace cppcanvas
BitmapEx aBmp( createMaskBmpEx( pAct->GetBitmap(), BitmapEx aBmp( createMaskBmpEx( pAct->GetBitmap(),
pAct->GetColor() )); pAct->GetColor() ));
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
aBmp, aBmp,
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2319,7 +2319,7 @@ namespace cppcanvas
BitmapEx aBmp( createMaskBmpEx( pAct->GetBitmap(), BitmapEx aBmp( createMaskBmpEx( pAct->GetBitmap(),
pAct->GetColor() )); pAct->GetColor() ));
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
aBmp, aBmp,
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2357,7 +2357,7 @@ namespace cppcanvas
pAct->GetSrcSize() ); pAct->GetSrcSize() );
aBmp.Crop( aCropRect ); aBmp.Crop( aCropRect );
ActionSharedPtr pBmpAction( std::shared_ptr<Action> pBmpAction(
internal::BitmapActionFactory::createBitmapAction( internal::BitmapActionFactory::createBitmapAction(
aBmp, aBmp,
rStates.getState().mapModeTransform * rStates.getState().mapModeTransform *
@@ -2398,7 +2398,7 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon aPoly( pAct->GetPolyPolygon().getB2DPolyPolygon() ); ::basegfx::B2DPolyPolygon aPoly( pAct->GetPolyPolygon().getB2DPolyPolygon() );
aPoly.transform( rState.mapModeTransform ); aPoly.transform( rState.mapModeTransform );
ActionSharedPtr pPolyAction( std::shared_ptr<Action> pPolyAction(
internal::PolyPolyActionFactory::createPolyPolyAction( internal::PolyPolyActionFactory::createPolyPolyAction(
aPoly, aPoly,
rCanvas, rCanvas,
@@ -2431,7 +2431,7 @@ namespace cppcanvas
DBG_TESTSOLARMUTEX(); DBG_TESTSOLARMUTEX();
ActionSharedPtr pFloatTransAction( std::shared_ptr<Action> pFloatTransAction(
internal::TransparencyGroupActionFactory::createTransparencyGroupAction( internal::TransparencyGroupActionFactory::createTransparencyGroupAction(
std::move(pMtf), std::move(pMtf),
std::move(pGradient), std::move(pGradient),
@@ -2507,7 +2507,7 @@ namespace cppcanvas
::basegfx::B2DSize(pAct->GetWidth(), ::basegfx::B2DSize(pAct->GetWidth(),
0 )); 0 ));
ActionSharedPtr pPolyAction( std::shared_ptr<Action> pPolyAction(
PolyPolyActionFactory::createPolyPolyAction( PolyPolyActionFactory::createPolyPolyAction(
tools::createTextLinesPolyPolygon( tools::createTextLinesPolyPolygon(
rState.mapModeTransform * rState.mapModeTransform *
@@ -2834,10 +2834,10 @@ namespace cppcanvas
// find start and end action // find start and end action
// ========================= // =========================
o_rRangeBegin = std::lower_bound( aBegin, aEnd, o_rRangeBegin = std::lower_bound( aBegin, aEnd,
MtfAction( ActionSharedPtr(), io_rStartIndex ), MtfAction( std::shared_ptr<Action>(), io_rStartIndex ),
UpperBoundActionIndexComparator() ); UpperBoundActionIndexComparator() );
o_rRangeEnd = std::lower_bound( aBegin, aEnd, o_rRangeEnd = std::lower_bound( aBegin, aEnd,
MtfAction( ActionSharedPtr(), io_rEndIndex ), MtfAction( std::shared_ptr<Action>(), io_rEndIndex ),
UpperBoundActionIndexComparator() ); UpperBoundActionIndexComparator() );
return true; return true;
} }

4
cppcanvas/source/mtfrenderer/lineaction.cxx
View File

@@ -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 ::basegfx::B2DPoint& rEndPoint,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) const OutDevState& rState )
{ {
return ActionSharedPtr( new LineAction( rStartPoint, return std::shared_ptr<Action>( new LineAction( rStartPoint,
rEndPoint, rEndPoint,
rCanvas, rCanvas,
rState) ); rState) );

2
cppcanvas/source/mtfrenderer/lineaction.hxx
View File

@@ -46,7 +46,7 @@ namespace cppcanvas
namespace LineActionFactory namespace LineActionFactory
{ {
/// Plain hair line from point 1 to point 2 /// 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 ::basegfx::B2DPoint&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );

8
cppcanvas/source/mtfrenderer/pointaction.cxx
View File

@@ -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 CanvasSharedPtr& rCanvas,
const OutDevState& rState ) 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 CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const ::Color& rColor ) const ::Color& rColor )
{ {
return ActionSharedPtr( new PointAction( rPoint, rCanvas, rState, rColor ) ); return std::shared_ptr<Action>( new PointAction( rPoint, rCanvas, rState, rColor ) );
} }
} }
} }

4
cppcanvas/source/mtfrenderer/pointaction.hxx
View File

@@ -46,12 +46,12 @@ namespace cppcanvas
namespace PointActionFactory namespace PointActionFactory
{ {
/// Point in current color /// Point in current color
ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&, std::shared_ptr<Action> createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Point in given color /// Point in given color
ActionSharedPtr createPointAction( const ::basegfx::B2DPoint&, std::shared_ptr<Action> createPointAction( const ::basegfx::B2DPoint&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const ::Color& ); const ::Color& );

20
cppcanvas/source/mtfrenderer/polypolyaction.cxx
View File

@@ -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 CanvasSharedPtr& rCanvas,
const OutDevState& rState ) const OutDevState& rState )
{ {
OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet, OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet,
"PolyPolyActionFactory::createPolyPolyAction() with empty line and fill color" ); "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.isFillColorSet,
rState.isLineColorSet ) ); rState.isLineColorSet ) );
} }
ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly, std::shared_ptr<Action> PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const rendering::Texture& rTexture ) 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 CanvasSharedPtr& rCanvas,
const OutDevState& rState ) const OutDevState& rState )
{ {
OSL_ENSURE( rState.isLineColorSet, OSL_ENSURE( rState.isLineColorSet,
"PolyPolyActionFactory::createLinePolyPolyAction() called with empty line color" ); "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, false,
rState.isLineColorSet ) ); rState.isLineColorSet ) );
} }
ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly, std::shared_ptr<Action> PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
const rendering::StrokeAttributes& rStrokeAttributes ) const rendering::StrokeAttributes& rStrokeAttributes )
{ {
OSL_ENSURE( rState.isLineColorSet, OSL_ENSURE( rState.isLineColorSet,
"PolyPolyActionFactory::createPolyPolyAction() for strokes called with empty line color" ); "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 CanvasSharedPtr& rCanvas,
const OutDevState& rState, const OutDevState& rState,
int nTransparency ) int nTransparency )
{ {
OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet, OSL_ENSURE( rState.isLineColorSet || rState.isFillColorSet,
"PolyPolyActionFactory::createPolyPolyAction() with empty line and fill color" ); "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.isFillColorSet,
rState.isLineColorSet, rState.isLineColorSet,
nTransparency ) ); nTransparency ) );

10
cppcanvas/source/mtfrenderer/polypolyaction.hxx
View File

@@ -52,29 +52,29 @@ namespace cppcanvas
namespace PolyPolyActionFactory namespace PolyPolyActionFactory
{ {
/// Create polygon, fill/stroke according to state /// Create polygon, fill/stroke according to state
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Create texture-filled polygon /// Create texture-filled polygon
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const css::rendering::Texture& ); const css::rendering::Texture& );
/// Create line polygon (always stroked, not filled) /// Create line polygon (always stroked, not filled)
ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&, std::shared_ptr<Action> createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState& ); const OutDevState& );
/// Create stroked polygon /// Create stroked polygon
ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&, std::shared_ptr<Action> createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
const CanvasSharedPtr&, const CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
const css::rendering::StrokeAttributes& ); const css::rendering::StrokeAttributes& );
/// For transparent painting of the given polygon (normally, we take the colors always opaque) /// 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 CanvasSharedPtr&,
const OutDevState&, const OutDevState&,
int nTransparency ); int nTransparency );

28
cppcanvas/source/mtfrenderer/textaction.cxx
View File

@@ -1901,7 +1901,7 @@ namespace cppcanvas
text, and creates a properly setup OutlineAction from text, and creates a properly setup OutlineAction from
it. it.
*/ */
ActionSharedPtr createOutline( const ::basegfx::B2DPoint& rStartPoint, std::shared_ptr<Action> createOutline( const ::basegfx::B2DPoint& rStartPoint,
const ::basegfx::B2DSize& rReliefOffset, const ::basegfx::B2DSize& rReliefOffset,
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::basegfx::B2DSize& rShadowOffset, const ::basegfx::B2DSize& rShadowOffset,
@@ -1941,7 +1941,7 @@ namespace cppcanvas
rVDev.SetFont(aOrigFont); rVDev.SetFont(aOrigFont);
if( !bHaveOutlines ) if( !bHaveOutlines )
return ActionSharedPtr(); return std::shared_ptr<Action>();
// remove offsetting from mapmode transformation // remove offsetting from mapmode transformation
// (outline polygons must stay at origin, only need to // (outline polygons must stay at origin, only need to
@@ -2000,7 +2000,7 @@ namespace cppcanvas
if( rParms.maTextTransformation.is_initialized() ) if( rParms.maTextTransformation.is_initialized() )
{ {
return ActionSharedPtr( return std::shared_ptr<Action>(
new OutlineAction( new OutlineAction(
rStartPoint, rStartPoint,
rReliefOffset, rReliefOffset,
@@ -2017,7 +2017,7 @@ namespace cppcanvas
} }
else else
{ {
return ActionSharedPtr( return std::shared_ptr<Action>(
new OutlineAction( new OutlineAction(
rStartPoint, rStartPoint,
rReliefOffset, rReliefOffset,
@@ -2036,7 +2036,7 @@ namespace cppcanvas
} // namespace } // namespace
ActionSharedPtr TextActionFactory::createTextAction( const ::Point& rStartPoint, std::shared_ptr<Action> TextActionFactory::createTextAction( const ::Point& rStartPoint,
const ::Size& rReliefOffset, const ::Size& rReliefOffset,
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::Size& rShadowOffset, const ::Size& rShadowOffset,
@@ -2099,7 +2099,7 @@ namespace cppcanvas
const ::Color aEmptyColor( COL_AUTO ); const ::Color aEmptyColor( COL_AUTO );
ActionSharedPtr ret; std::shared_ptr<Action> ret;
// no DX array, and no need to subset - no need to store // no DX array, and no need to subset - no need to store
// DX array, then. // DX array, then.
@@ -2115,7 +2115,7 @@ namespace cppcanvas
// nope // nope
if( rParms.maTextTransformation.is_initialized() ) if( rParms.maTextTransformation.is_initialized() )
{ {
ret = ActionSharedPtr( new TextAction( ret = std::shared_ptr<Action>( new TextAction(
aStartPoint, aStartPoint,
rText, rText,
nStartPos, nStartPos,
@@ -2126,7 +2126,7 @@ namespace cppcanvas
} }
else else
{ {
ret = ActionSharedPtr( new TextAction( ret = std::shared_ptr<Action>( new TextAction(
aStartPoint, aStartPoint,
rText, rText,
nStartPos, nStartPos,
@@ -2139,7 +2139,7 @@ namespace cppcanvas
{ {
// at least one of the effects requested // at least one of the effects requested
if( rParms.maTextTransformation.is_initialized() ) if( rParms.maTextTransformation.is_initialized() )
ret = ActionSharedPtr( new EffectTextAction( ret = std::shared_ptr<Action>( new EffectTextAction(
aStartPoint, aStartPoint,
aReliefOffset, aReliefOffset,
rReliefColor, rReliefColor,
@@ -2153,7 +2153,7 @@ namespace cppcanvas
rState, rState,
*rParms.maTextTransformation ) ); *rParms.maTextTransformation ) );
else else
ret = ActionSharedPtr( new EffectTextAction( ret = std::shared_ptr<Action>( new EffectTextAction(
aStartPoint, aStartPoint,
aReliefOffset, aReliefOffset,
rReliefColor, rReliefColor,
@@ -2178,7 +2178,7 @@ namespace cppcanvas
{ {
// nope // nope
if( rParms.maTextTransformation.is_initialized() ) if( rParms.maTextTransformation.is_initialized() )
ret = ActionSharedPtr( new TextArrayAction( ret = std::shared_ptr<Action>( new TextArrayAction(
aStartPoint, aStartPoint,
rText, rText,
nStartPos, nStartPos,
@@ -2188,7 +2188,7 @@ namespace cppcanvas
rState, rState,
*rParms.maTextTransformation ) ); *rParms.maTextTransformation ) );
else else
ret = ActionSharedPtr( new TextArrayAction( ret = std::shared_ptr<Action>( new TextArrayAction(
aStartPoint, aStartPoint,
rText, rText,
nStartPos, nStartPos,
@@ -2201,7 +2201,7 @@ namespace cppcanvas
{ {
// at least one of the effects requested // at least one of the effects requested
if( rParms.maTextTransformation.is_initialized() ) if( rParms.maTextTransformation.is_initialized() )
ret = ActionSharedPtr( new EffectTextArrayAction( ret = std::shared_ptr<Action>( new EffectTextArrayAction(
aStartPoint, aStartPoint,
aReliefOffset, aReliefOffset,
rReliefColor, rReliefColor,
@@ -2216,7 +2216,7 @@ namespace cppcanvas
rState, rState,
*rParms.maTextTransformation ) ); *rParms.maTextTransformation ) );
else else
ret = ActionSharedPtr( new EffectTextArrayAction( ret = std::shared_ptr<Action>( new EffectTextArrayAction(
aStartPoint, aStartPoint,
aReliefOffset, aReliefOffset,
rReliefColor, rReliefColor,

2
cppcanvas/source/mtfrenderer/textaction.hxx
View File

@@ -61,7 +61,7 @@ namespace cppcanvas
subsettable (Action::render( Subset ) works on subsettable (Action::render( Subset ) works on
characters) characters)
*/ */
ActionSharedPtr createTextAction( const ::Point& rStartPoint, std::shared_ptr<Action> createTextAction( const ::Point& rStartPoint,
const ::Size& rReliefOffset, const ::Size& rReliefOffset,
const ::Color& rReliefColor, const ::Color& rReliefColor,
const ::Size& rShadowOffset, const ::Size& rShadowOffset,

4
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
View File

@@ -477,14 +477,14 @@ namespace cppcanvas
} }
ActionSharedPtr TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf, std::shared_ptr<Action> TransparencyGroupActionFactory::createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient, GradientAutoPtr&& rAlphaGradient,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize, const ::basegfx::B2DVector& rDstSize,
const CanvasSharedPtr& rCanvas, const CanvasSharedPtr& rCanvas,
const OutDevState& rState ) const OutDevState& rState )
{ {
return ActionSharedPtr( new TransparencyGroupAction(std::move(rGroupMtf), return std::shared_ptr<Action>( new TransparencyGroupAction(std::move(rGroupMtf),
std::move(rAlphaGradient), std::move(rAlphaGradient),
rDstPoint, rDstPoint,
rDstSize, rDstSize,

2
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
View File

@@ -79,7 +79,7 @@ namespace cppcanvas
Size of the transparency group object, in current Size of the transparency group object, in current
state coordinate system. state coordinate system.
*/ */
ActionSharedPtr createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf, std::shared_ptr<Action> createTransparencyGroupAction( MtfAutoPtr&& rGroupMtf,
GradientAutoPtr&& rAlphaGradient, GradientAutoPtr&& rAlphaGradient,
const ::basegfx::B2DPoint& rDstPoint, const ::basegfx::B2DPoint& rDstPoint,
const ::basegfx::B2DVector& rDstSize, const ::basegfx::B2DVector& rDstSize,