summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-14 09:21:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-14 12:54:25 +0000
commit22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch)
treeb00f1ed362747a05d79686a8709c3408cfdee59b /cppcanvas
parentd8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff)
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/inc/action.hxx5
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx2
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx2
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx4
-rw-r--r--cppcanvas/source/wrapper/implcustomsprite.hxx4
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx4
-rw-r--r--cppcanvas/source/wrapper/implsprite.hxx4
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx8
8 files changed, 3 insertions, 30 deletions
diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index c47bb29e6c20..aa63ffce01bd 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CPPCANVAS_SOURCE_INC_ACTION_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace basegfx
{
@@ -146,7 +145,7 @@ namespace cppcanvas
virtual sal_Int32 getActionCount() const = 0;
};
- typedef ::boost::shared_ptr< Action > ActionSharedPtr;
+ typedef std::shared_ptr< Action > ActionSharedPtr;
}
}
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 6c627282d43f..dbf205ddf749 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -21,8 +21,6 @@
#define INCLUDED_CPPCANVAS_SOURCE_INC_IMPLRENDERER_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/renderer.hxx>
#include <cppcanvas/canvas.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 32cf790a5d05..08ea31f52fa0 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -22,8 +22,6 @@
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
-
-#include <boost/shared_ptr.hpp>
#include <basegfx/vector/b2dsize.hxx>
#include <cppcanvas/bitmapcanvas.hxx>
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 7a317ad60ca1..f6949b262e68 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -21,13 +21,9 @@
#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
#include <com/sun/star/uno/Sequence.hxx>
-
-#include <boost/shared_ptr.hpp>
-
#include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <cppcanvas/color.hxx>
-
/* Definition of Color class */
namespace cppcanvas
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index ba3acdb3573c..4e6674dcffbc 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -21,15 +21,11 @@
#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/canvas.hxx>
#include <cppcanvas/customsprite.hxx>
-
#include <implsprite.hxx>
#include <implspritecanvas.hxx>
-
namespace cppcanvas
{
namespace internal
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index 710cb41c6784..bb8793ca26ed 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -21,13 +21,9 @@
#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
-
#include <com/sun/star/rendering/XCanvas.hpp>
#include <cppcanvas/font.hxx>
-
namespace com { namespace sun { namespace star { namespace rendering
{
class XCanvasFont;
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 094748538524..e5aeb29c0283 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -23,13 +23,9 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <com/sun/star/rendering/XSprite.hpp>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/sprite.hxx>
-
#include <implspritecanvas.hxx>
-
namespace cppcanvas
{
namespace internal
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index b2af49deee31..51374bfcf904 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -23,15 +23,9 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-
-#include <boost/shared_ptr.hpp>
-
-
#include <cppcanvas/spritecanvas.hxx>
-
#include <implcanvas.hxx>
-
namespace cppcanvas
{
namespace internal
@@ -76,7 +70,7 @@ namespace cppcanvas
::basegfx::B2DHomMatrix maTransformation;
};
- typedef ::boost::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
+ typedef std::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
private:
ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;