summaryrefslogtreecommitdiff
path: root/sd/source/ui/table
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-17 15:41:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-17 17:01:14 +0100
commit6f495a195b794257e8b1302d384148be43c04cee (patch)
treec0ef4b8eeed1b1bb2e8da0deffac0a74b2eb5467 /sd/source/ui/table
parent74efa4f0e87e2b5fe7a577fa4673cb947c947c74 (diff)
boost->std
Change-Id: I1e6a7fd66f90e6acd803c6cd464f1d73252f7bcb
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.cxx4
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx4
4 files changed, 11 insertions, 11 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..e2129cc80373 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;
@@ -128,7 +128,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
if( (nColumns == 0) || (nRows == 0) )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SvxAbstractNewTableDialog> pDlg( pFact ? pFact->CreateSvxNewTableDialog( NULL ) : 0);
+ std::unique_ptr<SvxAbstractNewTableDialog> pDlg( pFact ? pFact->CreateSvxNewTableDialog( NULL ) : 0);
if( !pDlg.get() || (pDlg->Execute() != RET_OK) )
break;
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 71df3dffe6eb..3fe246a6ab63 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;
@@ -140,7 +140,7 @@ void TableObjectBar::Execute( SfxRequest& rReq )
case SID_TABLE_INSERT_COL_DLG:
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0);
+ std::unique_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0);
if( pDlg.get() && (pDlg->Execute() == 1) )
{