summaryrefslogtreecommitdiff
path: root/sd/source/ui/table
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-18 09:09:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-23 11:19:17 +0000
commit177ea7a2818ee64de3eaa9b587d70fe461468005 (patch)
tree60d3838c3f7daff05fc94e4bf2d7c83b2c013041 /sd/source/ui/table
parenta44e03b5d7822d026a3b2fbaf039522f085defed (diff)
boost::shared_ptr->std::shared_ptr
Change-Id: I2c6ac98f0984534894759cfbf4449eb554801cf8 Reviewed-on: https://gerrit.libreoffice.org/18678 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 'sd/source/ui/table')
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx12
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx2
-rw-r--r--sd/source/ui/table/tablefunction.cxx2
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx2
4 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 8c5c05c7f6fa..c29e590c2ca4 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -500,8 +500,8 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle )
}
}
-typedef std::vector< boost::shared_ptr< CellInfo > > CellInfoVector;
-typedef boost::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows];
+typedef std::vector< std::shared_ptr< CellInfo > > CellInfoVector;
+typedef std::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows];
struct TableStyleSettings
{
@@ -550,7 +550,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe
for( sal_Int32 nCol = 0; nCol < nPreviewColumns; ++nCol )
{
- boost::shared_ptr< CellInfo > xCellInfo;
+ std::shared_ptr< CellInfo > xCellInfo;
// first and last row win first, if used and available
if( bFirstRow )
@@ -646,7 +646,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
sal_Int32 nX = 0;
for( sal_Int32 nCol = 0; nCol < nPreviewColumns; ++nCol, nX += nCellWidth-1 )
{
- boost::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
+ std::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
Color aTextColor( COL_AUTO );
if( xCellInfo.get() )
@@ -680,7 +680,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
sal_Int32 nX = 0;
for( sal_Int32 nCol = 0; nCol < nPreviewColumns; ++nCol, nX += nCellWidth-1 )
{
- boost::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
+ std::shared_ptr< CellInfo > xCellInfo( aMatrix[nCol][nRow] );
if( xCellInfo.get() )
{
@@ -704,7 +704,7 @@ const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle,
if( (nBorderCol >= 0) && (nBorderCol < nPreviewColumns) && (nBorderRow >= 0) && (nBorderRow < nPreviewRows) )
{
// check border
- boost::shared_ptr< CellInfo > xBorderInfo( aMatrix[nBorderCol][nBorderRow] );
+ std::shared_ptr< CellInfo > xBorderInfo( aMatrix[nBorderCol][nBorderRow] );
if( xBorderInfo.get() )
{
const ::editeng::SvxBorderLine* pBorderLine2 = xBorderInfo->maBorder.GetLine(static_cast<SvxBoxItemLine>(static_cast<int>(nLine)^1));
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 419ab7cb7cc4..ecbe8931129a 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -32,7 +32,7 @@
#include <vcl/button.hxx>
#include <svx/sidebar/PanelLayout.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sd
{
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index b05d570298b3..89480fd85fbb 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -63,7 +63,7 @@
#include "sdresid.hxx"
#include "undo/undoobjects.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::sd;
using namespace sdr::table;
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 71df3dffe6eb..f13affa35425 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -50,7 +50,7 @@
#include "tableobjectbar.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace sd;
using namespace sd::ui::table;