[Libreoffice-commits] core.git: 3 commits - svtools/inc svtools/source svx/source toolkit/source vbahelper/source vcl/qa vcl/source writerperfect/qa writerperfect/source xmloff/inc xmloff/source xmlscript/source
Caolán McNamara
caolanm at redhat.com
Wed Sep 16 07:34:57 PDT 2015
svtools/inc/table/defaultinputhandler.hxx | 4 -
svtools/inc/table/gridtablerenderer.hxx | 4 -
svtools/source/contnr/fileview.cxx | 4 -
svtools/source/contnr/imivctl1.cxx | 6 +-
svtools/source/control/calendar.cxx | 12 ++--
svtools/source/control/ruler.cxx | 5 --
svtools/source/filter/SvFilterOptionsDialog.cxx | 4 -
svtools/source/graphic/descriptor.cxx | 6 +-
svtools/source/graphic/grfcache.cxx | 4 -
svtools/source/graphic/grfmgr.cxx | 6 +-
svtools/source/graphic/provider.cxx | 8 +--
svtools/source/misc/ehdl.cxx | 6 +-
svtools/source/misc/embedhlp.cxx | 6 +-
svtools/source/misc/imap.cxx | 6 +-
svtools/source/misc/transfer.cxx | 8 +--
svtools/source/table/cellvalueconversion.cxx | 4 -
svtools/source/table/cellvalueconversion.hxx | 4 -
svtools/source/toolpanel/paneltabbar.cxx | 4 -
svtools/source/uno/wizard/wizardshell.cxx | 2
svtools/source/uno/wizard/wizardshell.hxx | 6 --
svx/source/core/extedit.cxx | 4 -
svx/source/dialog/_bmpmask.cxx | 3 -
svx/source/dialog/connctrl.cxx | 4 -
svx/source/dialog/databaseregistrationui.cxx | 4 -
svx/source/dialog/grfflt.cxx | 14 ++---
svx/source/dialog/hdft.cxx | 6 +-
svx/source/dialog/imapdlg.cxx | 6 +-
svx/source/dialog/imapwnd.cxx | 6 +-
svx/source/dialog/imapwnd.hxx | 4 -
svx/source/dialog/measctrl.cxx | 4 -
svx/source/dialog/srchdlg.cxx | 9 +--
svx/source/fmcomp/fmgridcl.cxx | 4 -
svx/source/fmcomp/gridctrl.cxx | 5 --
svx/source/form/fmscriptingenv.cxx | 8 +--
svx/source/form/fmshell.cxx | 4 -
svx/source/form/fmshimp.cxx | 8 +--
svx/source/form/fmtextcontrolshell.cxx | 6 +-
svx/source/gallery2/galbrws1.cxx | 8 +--
svx/source/gallery2/galbrws2.cxx | 4 -
svx/source/gallery2/galini.cxx | 4 -
svx/source/gallery2/gallery1.cxx | 6 +-
svx/source/gallery2/galmisc.cxx | 4 -
svx/source/gallery2/galobj.cxx | 4 -
svx/source/gallery2/galtheme.cxx | 37 +++++++--------
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 4 -
svx/source/sdr/contact/objectcontactofpageview.cxx | 4 -
svx/source/sdr/contact/viewcontactofe3dcube.cxx | 4 -
svx/source/sdr/contact/viewcontactofe3dextrude.cxx | 4 -
svx/source/sdr/contact/viewcontactofe3dlathe.cxx | 4 -
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx | 4 -
svx/source/sdr/contact/viewcontactofe3dsphere.cxx | 4 -
svx/source/sdr/overlay/overlaymanager.cxx | 4 -
svx/source/sdr/properties/e3dsceneproperties.cxx | 4 -
svx/source/sdr/properties/itemsettools.cxx | 4 -
svx/source/svdraw/svdedtv2.cxx | 4 -
svx/source/svdraw/svdedxv.cxx | 4 -
svx/source/svdraw/svdhdl.cxx | 3 -
svx/source/svdraw/svdobj.cxx | 4 -
svx/source/svdraw/svdograf.cxx | 6 +-
svx/source/svdraw/svdomedia.cxx | 2
svx/source/svdraw/svdotxln.cxx | 4 -
svx/source/svdraw/svdtext.cxx | 4 -
svx/source/table/tablertfimporter.cxx | 13 ++---
svx/source/tbxctrls/fillctrl.cxx | 6 +-
svx/source/tbxctrls/fontworkgallery.cxx | 4 -
svx/source/tbxctrls/linectrl.cxx | 6 +-
svx/source/tbxctrls/tbunocontroller.cxx | 4 -
svx/source/unodraw/UnoGraphicExporter.cxx | 12 ++--
svx/source/unodraw/UnoNameItemTable.cxx | 4 -
svx/source/unodraw/unopool.cxx | 4 -
svx/source/unodraw/unoshap2.cxx | 5 +-
svx/source/unodraw/unoshape.cxx | 8 +--
svx/source/unogallery/unogalitem.cxx | 4 -
svx/source/xml/xmleohlp.cxx | 6 +-
svx/source/xml/xmlgrhlp.cxx | 8 +--
svx/source/xml/xmlxtexp.cxx | 4 -
svx/source/xoutdev/xexch.cxx | 4 -
svx/source/xoutdev/xtabdash.cxx | 4 -
svx/source/xoutdev/xtabgrdt.cxx | 4 -
svx/source/xoutdev/xtabhtch.cxx | 4 -
svx/source/xoutdev/xtablend.cxx | 4 -
toolkit/source/controls/unocontrolcontainer.cxx | 4 -
vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 5 --
vcl/qa/cppunit/graphicfilter/data/jpg/fail/crash-1.jpg |binary
vcl/source/filter/jpeg/JpegReader.cxx | 31 ++++++------
vcl/source/filter/jpeg/JpegReader.hxx | 2
vcl/source/filter/jpeg/jpegc.cxx | 10 +++-
writerperfect/qa/unit/WPXSvStreamTest.cxx | 4 -
writerperfect/source/impress/KeynoteImportFilter.cxx | 4 -
xmloff/inc/pch/precompiled_xo.hxx | 1
xmloff/source/draw/XMLNumberStyles.cxx | 3 -
xmloff/source/draw/shapeexport.cxx | 4 -
xmloff/source/style/PageMasterImportPropMapper.cxx | 20 ++++----
xmloff/source/style/styleexp.cxx | 4 -
xmlscript/source/xmldlg_imexp/imp_share.hxx | 24 ++++-----
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 6 +-
96 files changed, 283 insertions(+), 293 deletions(-)
New commits:
commit 7aa2f8c75d7bda103748fa73766a30fd77e50c16
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 16 15:10:18 2015 +0100
don't crash with unknown out color space
Change-Id: Ib066ff1fad686d611a86510e768b1109ef7a5e75
diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/crash-1.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/crash-1.jpg
new file mode 100644
index 0000000..e783bd3
Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/crash-1.jpg differ
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 8ced5ab..c8f27b9 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -103,7 +103,13 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
else if ( cinfo.jpeg_color_space == JCS_YCCK )
cinfo.out_color_space = JCS_CMYK;
- OSL_ASSERT(cinfo.out_color_space == JCS_CMYK || cinfo.out_color_space == JCS_GRAYSCALE || cinfo.out_color_space == JCS_RGB);
+ if (cinfo.out_color_space != JCS_CMYK &&
+ cinfo.out_color_space != JCS_GRAYSCALE &&
+ cinfo.out_color_space != JCS_RGB)
+ {
+ SAL_WARN("vcl.filter", "jpg with unknown out color space, forcing to rgb");
+ cinfo.out_color_space = JCS_RGB;
+ }
/* change scale for preview import */
long nPreviewWidth = previewSize.Width();
commit 42468f9f979d0d21ad406af8ddc4135380fff63d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 16 15:03:24 2015 +0100
pointer->reference
Change-Id: I9d76750d907968d54d5ab99304080a75452c0420
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 6ada56b..66c9457 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -191,8 +191,7 @@ JPEGReader::JPEGReader( SvStream& rStream, void* /*pCallData*/, bool bSetLogSize
JPEGReader::~JPEGReader()
{
- if( mpBuffer )
- delete[] mpBuffer;
+ delete[] mpBuffer;
if( mpAcc )
Bitmap::ReleaseAccess( mpAcc );
@@ -201,16 +200,16 @@ JPEGReader::~JPEGReader()
Bitmap::ReleaseAccess( mpAcc1 );
}
-unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
+unsigned char * JPEGReader::CreateBitmap(JPEGCreateBitmapParam& rParam)
{
- if (pParam->nWidth > SAL_MAX_INT32 / 8 || pParam->nHeight > SAL_MAX_INT32 / 8)
+ if (rParam.nWidth > SAL_MAX_INT32 / 8 || rParam.nHeight > SAL_MAX_INT32 / 8)
return NULL; // avoid overflows later
- if (pParam->nWidth == 0 || pParam->nHeight == 0)
+ if (rParam.nWidth == 0 || rParam.nHeight == 0)
return NULL;
- Size aSize( pParam->nWidth, pParam->nHeight );
- bool bGray = pParam->bGray != 0;
+ Size aSize(rParam.nWidth, rParam.nHeight );
+ bool bGray = rParam.bGray != 0;
unsigned char * pBmpBuf = NULL;
@@ -253,13 +252,13 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
if ( mbSetLogSize )
{
- unsigned long nUnit = pParam->density_unit;
+ unsigned long nUnit = rParam.density_unit;
- if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && pParam->X_density && pParam->Y_density )
+ if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && rParam.X_density && rParam.Y_density )
{
Point aEmptyPoint;
- Fraction aFractX( 1, pParam->X_density );
- Fraction aFractY( 1, pParam->Y_density );
+ Fraction aFractX( 1, rParam.X_density );
+ Fraction aFractY( 1, rParam.Y_density );
MapMode aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint, aFractX, aFractY );
Size aPrefSize = OutputDevice::LogicToLogic( aSize, aMapMode, MAP_100TH_MM );
@@ -280,14 +279,14 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam )
)
{
pBmpBuf = mpAcc->GetBuffer();
- pParam->nAlignedWidth = mpAcc->GetScanlineSize();
- pParam->bTopDown = mpAcc->IsTopDown();
+ rParam.nAlignedWidth = mpAcc->GetScanlineSize();
+ rParam.bTopDown = mpAcc->IsTopDown();
}
else
{
- pParam->nAlignedWidth = AlignedWidth4Bytes( aSize.Width() * ( bGray ? 8 : 24 ) );
- pParam->bTopDown = true;
- pBmpBuf = mpBuffer = new unsigned char[pParam->nAlignedWidth * aSize.Height()];
+ rParam.nAlignedWidth = AlignedWidth4Bytes( aSize.Width() * ( bGray ? 8 : 24 ) );
+ rParam.bTopDown = true;
+ pBmpBuf = mpBuffer = new unsigned char[rParam.nAlignedWidth * aSize.Height()];
}
}
diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx
index 978317a..c45b697 100644
--- a/vcl/source/filter/jpeg/JpegReader.hxx
+++ b/vcl/source/filter/jpeg/JpegReader.hxx
@@ -67,7 +67,7 @@ public:
virtual ~JPEGReader();
ReadState Read( Graphic& rGraphic );
- unsigned char * CreateBitmap( JPEGCreateBitmapParam* param );
+ unsigned char * CreateBitmap( JPEGCreateBitmapParam& param );
};
#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGREADER_HXX
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 4945e75..8ced5ab 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -154,7 +154,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
aCreateBitmapParam.X_density = cinfo.X_density;
aCreateBitmapParam.Y_density = cinfo.Y_density;
aCreateBitmapParam.bGray = long(cinfo.output_components == 1);
- pDIB = pJPEGReader->CreateBitmap( &aCreateBitmapParam );
+ pDIB = pJPEGReader->CreateBitmap(aCreateBitmapParam);
nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
aRangeLimit = cinfo.sample_range_limit;
commit 31ebd9f475f94fb4f05bbeaa8077122a2635d528
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 15 15:35:44 2015 +0100
boost->std
Change-Id: Ic18be8b86727dd1179a7e39c70493d088ed00557
diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx
index af4f668..b9b96bb 100644
--- a/svtools/inc/table/defaultinputhandler.hxx
+++ b/svtools/inc/table/defaultinputhandler.hxx
@@ -23,7 +23,7 @@
#include <svtools/table/tableinputhandler.hxx>
#include <svtools/table/tabletypes.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svt { namespace table
@@ -38,7 +38,7 @@ namespace svt { namespace table
class DefaultInputHandler : public ITableInputHandler
{
private:
- ::boost::scoped_ptr< DefaultInputHandler_Impl > m_pImpl;
+ ::std::unique_ptr< DefaultInputHandler_Impl > m_pImpl;
public:
DefaultInputHandler();
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx
index e3f14cd..1fb1ce4 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -22,7 +22,7 @@
#include <svtools/table/tablemodel.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svt { namespace table
@@ -42,7 +42,7 @@ namespace svt { namespace table
class GridTableRenderer : public ITableRenderer
{
private:
- ::boost::scoped_ptr< GridTableRenderer_Impl > m_pImpl;
+ ::std::unique_ptr< GridTableRenderer_Impl > m_pImpl;
public:
/** creates a table renderer associated with the given model
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2f4ef7b..e2b8d5b 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -72,8 +72,8 @@
#include <unotools/intlwrapper.hxx>
#include <unotools/syslocale.hxx>
#include <svl/urlfilter.hxx>
-#include <boost/scoped_ptr.hpp>
#include <o3tl/typed_flags_set.hxx>
+#include <memory>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
@@ -1600,7 +1600,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
m_aCurrentAsyncActionHandler = Link<void*,void>();
// minimum time to wait
- boost::scoped_ptr< TimeValue > pTimeout( new TimeValue );
+ std::unique_ptr< TimeValue > pTimeout( new TimeValue );
sal_Int32 nMinTimeout = pAsyncDescriptor->nMinTimeout;
OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: invalid minimum timeout!" );
if ( nMinTimeout <= 0 )
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index fa7b37d..d04a3e6 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -36,7 +36,7 @@
#include <svtools/svmedit.hxx>
#include <algorithm>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <vcl/idle.hxx>
#define IMPICNVIEW_ACC_RETURN 1
@@ -302,7 +302,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t
void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator )
{
- boost::scoped_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
+ std::unique_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
if ( !_pGenerator )
{
_pGenerator = new MnemonicGenerator;
@@ -661,7 +661,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rec
rRenderContext.SetClipRegion(vcl::Region(rRect));
SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new SvxIconChoiceCtrlEntryList_impl();
- boost::scoped_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl());
+ std::unique_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl());
size_t nPos = 0;
while(nCount)
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 414ed85..8f080bc 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -36,7 +36,7 @@
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
#include <svtools/calendar.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define DAY_OFFX 4
#define DAY_OFFY 2
@@ -1056,7 +1056,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld )
void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
bool bMove, bool bExpand, bool bExtended )
{
- boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
+ std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
Date aOldDate = maCurDate;
Date aTempDate = rDate;
@@ -1307,7 +1307,7 @@ void Calendar::ImplEndTracking( bool bCancel )
if ( !bSpinDown )
{
- boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
+ std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
Date aOldDate = maCurDate;
maCurDate = maOldCurDate;
*mpSelectTable = *mpOldSelectTable;
@@ -1519,7 +1519,7 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
{
if ( bMultiSel && bExpand )
{
- boost::scoped_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
+ std::unique_ptr<IntDateSet> pOldSel(new IntDateSet( *mpSelectTable ));
Date aOldAnchorDate = maAnchorDate;
mbSelLeft = aNewDate < maAnchorDate;
if ( !bExtended )
@@ -1707,7 +1707,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect )
if ( !rDate.IsValidAndGregorian() )
return;
- boost::scoped_ptr<IntDateSet> pOldSel;
+ std::unique_ptr<IntDateSet> pOldSel;
if ( !mbInSelChange )
pOldSel.reset(new IntDateSet( *mpSelectTable ));
@@ -1720,7 +1720,7 @@ void Calendar::SelectDate( const Date& rDate, bool bSelect )
void Calendar::SetNoSelection()
{
- boost::scoped_ptr<IntDateSet> pOldSel;
+ std::unique_ptr<IntDateSet> pOldSel;
if ( !mbInSelChange )
pOldSel.reset(new IntDateSet( *mpSelectTable ));
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 7ad59d4..c428286 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -29,8 +29,7 @@
#include <svtools/svtools.hrc>
#include <svtools/colorcfg.hxx>
-#include <boost/scoped_ptr.hpp>
-
+#include <memory>
#include <vector>
using namespace std;
@@ -2024,7 +2023,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt )
}
else
{
- boost::scoped_ptr<RulerSelection> pHitTest(new RulerSelection);
+ std::unique_ptr<RulerSelection> pHitTest(new RulerSelection);
bool bHitTestResult = ImplHitTest(aMousePos, pHitTest.get());
if ( nMouseClicks == 1 )
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 8c054a5..ffd5818 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -46,7 +46,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -250,7 +250,7 @@ sal_Int16 SvFilterOptionsDialog::execute()
FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, meFieldUnit );
aFltCallDlgPara.aFilterData = maFilterDataSequence;
- boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
+ std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ));
aFltCallDlgPara.pResMgr = pResMgr.get();
aFltCallDlgPara.aFilterExt = aGraphicFilter.GetExportFormatShortName( nFormat );
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index f002061..6db1ffa 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -33,7 +33,7 @@
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define UNOGRAPHIC_GRAPHICTYPE 1
#define UNOGRAPHIC_MIMETYPE 2
@@ -75,7 +75,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic )
void GraphicDescriptor::init( const OUString& rURL )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL, StreamMode::READ ));
if( pIStm )
implCreate( *pIStm, &rURL );
@@ -83,7 +83,7 @@ void GraphicDescriptor::init( const OUString& rURL )
void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rxIStm ));
if( pIStm )
implCreate( *pIStm, &rURL );
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 2e29e31..1aa1ecb 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -30,7 +30,7 @@
#include <rtl/strbuf.hxx>
#include "grfcache.hxx"
#include <rtl/crc.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define MAX_BMP_EXTENT 4096
@@ -865,7 +865,7 @@ void GraphicCache::AddGraphicObject(
if( !bInserted )
{
GraphicCacheEntryList::iterator it = maGraphicCache.begin();
- boost::scoped_ptr< GraphicID > apID;
+ std::unique_ptr< GraphicID > apID;
if( !pID )
{
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 54e54f5..e6fbd3f 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using com::sun::star::uno::Reference;
using com::sun::star::uno::XInterface;
@@ -238,7 +238,7 @@ void GraphicObject::ImplAutoSwapIn()
if( osl::FileBase::getFileURLFromSystemPath( GetLink(), aURLStr ) == osl::FileBase::E_None )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURLStr, StreamMode::READ ));
if( pIStm )
{
@@ -1141,7 +1141,7 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL )
Graphic aGraphic;
if ( !aURL.isEmpty() )
{
- boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ ));
+ std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READ ));
if( pStream )
GraphicConverter::Import( *pStream, aGraphic );
}
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index afca9bc..d5b0a1d 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -45,7 +45,7 @@
#include <svtools/grfmgr.hxx>
#include "provider.hxx"
#include <vcl/dibtools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -239,7 +239,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
OString aResMgrName(OUStringToOString(
rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US));
- boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ));
+ std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aResMgrName.getStr(), Application::GetSettings().GetUILanguageTag() ));
if( pResMgr )
{
@@ -384,7 +384,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
{
uno::Reference< ::graphic::XGraphic > xRet;
OUString aPath;
- boost::scoped_ptr<SvStream> pIStm;
+ std::unique_ptr<SvStream> pIStm;
uno::Reference< io::XInputStream > xIStm;
uno::Reference< awt::XBitmap >xBtm;
@@ -727,7 +727,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG
{
SolarMutexGuard g;
- boost::scoped_ptr<SvStream> pOStm;
+ std::unique_ptr<SvStream> pOStm;
OUString aPath;
sal_Int32 i;
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 397ba40..5cd02f8 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -28,7 +28,7 @@
#include <svtools/svtresid.hxx>
#include <svtools/svtools.hrc>
#include <svtools/sfxecode.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
static sal_uInt16 aWndFunc(
@@ -275,7 +275,7 @@ bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
{
bool bRet = false;
- boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ));
+ std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ));
if( pResMgr )
{
ResId aId(RID_ERRHDL, *pResMgr );
@@ -302,7 +302,7 @@ bool SfxErrorHandler::GetMessageString(
{
bool bRet = false;
- boost::scoped_ptr<ResId> pResId(new ResId(nId, *pMgr));
+ std::unique_ptr<ResId> pResId(new ResId(nId, *pMgr));
ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId);
if(aEr)
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index b25c988..9813721 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -50,7 +50,7 @@
#include <cppuhelper/implbase.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -434,7 +434,7 @@ void EmbeddedObjectRef::GetReplacement( bool bUpdate )
return;
}
- boost::scoped_ptr<SvStream> pGraphicStream(GetGraphicStream( bUpdate ));
+ std::unique_ptr<SvStream> pGraphicStream(GetGraphicStream( bUpdate ));
if ( pGraphicStream )
{
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
@@ -532,7 +532,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream
mpImpl->aMediaType = rMediaType;
mpImpl->mnGraphicVersion++;
- boost::scoped_ptr<SvStream> pGraphicStream(::utl::UcbStreamHelper::CreateStream( xInGrStream ));
+ std::unique_ptr<SvStream> pGraphicStream(::utl::UcbStreamHelper::CreateStream( xInGrStream ));
if ( pGraphicStream )
{
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 2b7ff4b..63aa45b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -33,7 +33,7 @@
#include <string.h>
#include <math.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \
@@ -81,7 +81,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
rOStm.WriteBool( bActive );
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding);
- boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE ));
+ std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rOStm, StreamMode::WRITE ));
WriteIMapObject( rOStm );
aEventList.Write( rOStm ); // V4
@@ -110,7 +110,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
// make URL absolute
aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
- boost::scoped_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
+ std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
ReadIMapObject( rIStm );
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 6170242..8145532 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -59,7 +59,7 @@
#include <vcl/dibtools.hxx>
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// - Namespaces -
@@ -333,7 +333,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
if( maAny >>= aSeq )
{
- boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
+ std::unique_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
GDIMetaFile aMtf;
ReadGDIMetaFile( *pSrcStm, aMtf );
@@ -363,7 +363,7 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co
if( maAny >>= aSeq )
{
- boost::scoped_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
+ std::unique_ptr<SvMemoryStream> pSrcStm(new SvMemoryStream( aSeq.getArray(), aSeq.getLength(), StreamMode::WRITE | StreamMode::TRUNC ));
GDIMetaFile aMtf;
ReadGDIMetaFile( *pSrcStm, aMtf );
@@ -1988,7 +1988,7 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf
if( ( aDesc.getLength() > 4 ) && aDesc.copy(aDesc.getLength() - 4).equalsIgnoreAsciiCase(".URL") )
{
- boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
+ std::unique_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( INetURLObject( OStringToOUString(aDesc, eTextEncoding) ).GetMainURL( INetURLObject::NO_DECODE ),
STREAM_STD_READ ));
if( !pStream || pStream->GetError() )
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index d634b5c..32315c2 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -35,7 +35,7 @@
#include <unotools/syslocale.hxx>
#include <comphelper/processfactory.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <unordered_map>
namespace svt
@@ -96,7 +96,7 @@ namespace svt
virtual ::sal_Int32 getFormatKey() const = 0;
};
- typedef ::boost::shared_ptr< IValueNormalization > PValueNormalization;
+ typedef std::shared_ptr< IValueNormalization > PValueNormalization;
typedef std::unordered_map< OUString, PValueNormalization, OUStringHash > NormalizerCache;
diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx
index 23091bd..59b91af 100644
--- a/svtools/source/table/cellvalueconversion.hxx
+++ b/svtools/source/table/cellvalueconversion.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svt
@@ -43,7 +43,7 @@ namespace svt
OUString convertToString( const ::com::sun::star::uno::Any& i_cellValue );
private:
- ::boost::scoped_ptr< CellValueConversion_Data > m_pData;
+ ::std::unique_ptr< CellValueConversion_Data > m_pData;
};
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 583ebed..4d916d1 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -33,7 +33,7 @@
#include <vcl/settings.hxx>
#include <tools/diagnose_ex.h>
-#include <boost/optional.hpp>
+#include <memory>
#include <vector>
// space around an item
@@ -97,7 +97,7 @@ namespace svt
protected:
~ITabBarRenderer() {}
};
- typedef ::boost::shared_ptr< ITabBarRenderer > PTabBarRenderer;
+ typedef std::shared_ptr< ITabBarRenderer > PTabBarRenderer;
//= VCLItemRenderer - declaration
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index b3504d9..c8388b9 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -186,7 +186,7 @@ namespace svt { namespace uno
{
ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL );
- ::boost::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
+ std::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
VclPtr<TabPage> pPage = pController->getTabPage();
OSL_ENSURE( pPage, "WizardShell::createPage: illegal tab page!" );
if ( !pPage )
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index 68650dd..fcdc7d1 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -22,11 +22,9 @@
#include <com/sun/star/ui/dialogs/XWizardController.hpp>
#include <com/sun/star/ui/dialogs/XWizard.hpp>
-
#include <svtools/roadmapwizard.hxx>
-
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
namespace svt { namespace uno
@@ -34,7 +32,7 @@ namespace svt { namespace uno
class WizardPageController;
- typedef ::boost::shared_ptr< WizardPageController > PWizardPageController;
+ typedef std::shared_ptr< WizardPageController > PWizardPageController;
//= WizardShell
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index c705784..cbc1fac 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -30,7 +30,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <boost/bind.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
@@ -51,7 +51,7 @@ void ExternalToolEdit::HandleCloseEvent(ExternalToolEdit* pData)
Graphic newGraphic;
//import the temp file image stream into the newGraphic
- boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(pData->m_aFileName, StreamMode::READ));
+ std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(pData->m_aFileName, StreamMode::READ));
if(pStream)
{
GraphicConverter::Import(*pStream, newGraphic);
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index bbe0d96..739c1c7 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -31,7 +31,6 @@
#include <bmpmask.hrc>
#include <svx/svxids.hrc>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include "helpid.hrc"
#define BMP_RESID(nId) ResId(nId, DIALOG_MGR())
@@ -148,7 +147,7 @@ void MaskSet::KeyInput( const KeyEvent& rKEvt )
void MaskSet::onEditColor()
{
- boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParent() ));
+ std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParent() ));
pColorDlg->SetColor(GetItemColor(1));
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 64ad486..1775f97 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -34,7 +34,7 @@
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle)
: Control(pParent, nStyle)
@@ -269,7 +269,7 @@ void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
MapMode aMapMode = GetMapMode();
Fraction aXFrac = aMapMode.GetScaleX();
Fraction aYFrac = aMapMode.GetScaleY();
- boost::scoped_ptr<Fraction> pMultFrac;
+ std::unique_ptr<Fraction> pMultFrac;
if( bZoomIn )
{
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index c575882..3fbe9d3 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -25,7 +25,7 @@
#include <sfx2/app.hxx>
#include <svl/itemset.hxx>
#include <vcl/msgbox.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svx
{
@@ -36,7 +36,7 @@ namespace svx
SfxItemSet aRegistrationItems( SfxGetpApp()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr< SfxAbstractDialog > pDialog;
+ std::unique_ptr< SfxAbstractDialog > pDialog;
if ( pDialogFactory )
pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) );
if ( pDialog.get() )
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 2842ae8..8848995 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -27,7 +27,7 @@
#include <svx/grfflt.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// - SvxGraphicFilter -
@@ -77,7 +77,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSmooth(pWindow, rGraphic, 0.7));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSmooth(pWindow, rGraphic, 0.7));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -165,7 +165,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -178,7 +178,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RP_MM));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterEmboss(pWindow, rGraphic, RP_MM));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -191,7 +191,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterPoster(pWindow, rGraphic, 16));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -229,7 +229,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSepia(pWindow, rGraphic, 10));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -242,7 +242,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false));
+ std::unique_ptr<AbstractGraphicFilterDialog> aDlg(pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 427eb4c..f66382d 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -44,7 +44,7 @@
#include <editeng/boxitem.hxx>
#include <svx/svxdlg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//UUUU
#include <svx/xdef.hxx>
@@ -95,7 +95,7 @@ namespace svx {
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, bEnableBackgroundSelector ));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, bEnableBackgroundSelector ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
{
@@ -285,7 +285,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet )
aSet.Put( SfxBoolItem( nWSharedFirst, m_pCntSharedFirstBox->IsChecked() ) );
if(m_pDynSpacingCB->IsVisible() && SFX_WHICH_MAX > nWDynSpacing)
{
- boost::scoped_ptr<SfxBoolItem> pBoolItem(static_cast<SfxBoolItem*>(pPool->GetDefaultItem(nWDynSpacing).Clone()));
+ std::unique_ptr<SfxBoolItem> pBoolItem(static_cast<SfxBoolItem*>(pPool->GetDefaultItem(nWDynSpacing).Clone()));
pBoolItem->SetValue(m_pDynSpacingCB->IsChecked());
aSet.Put(*pBoolItem);
}
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3442f0d..68beba5 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -54,7 +54,7 @@
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include "dlgunit.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define SELF_TARGET "_self"
#define IMAP_ALL_FILTER OUString("<Alle>")
@@ -471,7 +471,7 @@ void SvxIMapDlg::DoOpen()
{
INetURLObject aURL( aDlg.GetPath() );
DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm )
{
@@ -546,7 +546,7 @@ bool SvxIMapDlg::DoSave()
if( aURL.getExtension().isEmpty() )
aURL.setExtension( aExt );
- boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
+ std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
if( pOStm )
{
pIMapWnd->GetImageMap().Write( *pOStm, nFormat, "" );
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 5525ebe..4ce3c79 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -48,7 +48,7 @@
#include <svx/svxdlg.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
using ::com::sun::star::frame::XFrame;
@@ -660,7 +660,7 @@ void IMapWindow::DoMacroAssign()
aSet.Put( aMacroItem, SID_ATTR_MACROITEM );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, mxDocumentFrame, SID_EVENTCONFIG ));
+ std::unique_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet, mxDocumentFrame, SID_EVENTCONFIG ));
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK )
{
@@ -682,7 +682,7 @@ void IMapWindow::DoPropertyDialog()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractURLDlg> aDlg(pFact->CreateURLDialog( this, pIMapObj->GetURL(), pIMapObj->GetAltText(), pIMapObj->GetDesc(),
+ std::unique_ptr<AbstractURLDlg> aDlg(pFact->CreateURLDialog( this, pIMapObj->GetURL(), pIMapObj->GetAltText(), pIMapObj->GetDesc(),
pIMapObj->GetTarget(), pIMapObj->GetName(), aTargetList ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if ( aDlg->Execute() == RET_OK )
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 63bef58..fd584a0 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -59,11 +59,11 @@ const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+
sal_uInt32('P') * 0x01000000;
-typedef boost::shared_ptr< IMapObject > IMapObjectPtr;
+typedef std::shared_ptr< IMapObject > IMapObjectPtr;
class IMapUserData : public SdrObjUserData
{
- // #i98386# use boost::shared_ptr here due to cloning possibilities
+ // #i98386# use std::shared_ptr here due to cloning possibilities
IMapObjectPtr mpObj;
public:
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 3c551c2..a341d72 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -25,7 +25,7 @@
#include "svx/dlgutil.hxx"
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SvxXMeasurePreview::SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle)
: Control(pParent, nStyle)
@@ -118,7 +118,7 @@ void SvxXMeasurePreview::MouseButtonDown(const MouseEvent& rMEvt)
MapMode aMapMode = GetMapMode();
Fraction aXFrac = aMapMode.GetScaleX();
Fraction aYFrac = aMapMode.GetScaleY();
- boost::scoped_ptr<Fraction> pMultFrac;
+ std::unique_ptr<Fraction> pMultFrac;
if (bZoomIn)
{
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 3dd2321..a904015 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -69,7 +69,6 @@
#include <svx/svxdlg.hxx>
#include <vcl/toolbox.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star::i18n;
using namespace com::sun::star::uno;
@@ -1335,7 +1334,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractSvxSearchSimilarityDialog> pDlg(pFact->CreateSvxSearchSimilarityDialog( this,
+ std::unique_ptr<AbstractSvxSearchSimilarityDialog> pDlg(pFact->CreateSvxSearchSimilarityDialog( this,
pSearchItem->IsLEVRelaxed(),
pSearchItem->GetLEVOther(),
pSearchItem->GetLEVShorter(),
@@ -1358,7 +1357,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet,
+ std::unique_ptr<AbstractSvxJSearchOptionsDialog> aDlg(pFact->CreateSvxJSearchOptionsDialog( this, aSet,
pSearchItem->GetTransliterationFlags() ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
int nRet = aDlg->Execute();
@@ -1935,7 +1934,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(this, aSet));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabItemDialog(this, aSet));
DBG_ASSERT(pDlg, "Dialog creation failed!");
aTxt = pDlg->GetText() + aTxt;
pDlg->SetText( aTxt );
@@ -2019,7 +2018,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSvxSearchAttributeDialog( this, *pSearchList, pImpl->pRanges ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 7fba848..946ea5d 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -71,7 +71,7 @@
#include <vcl/settings.hxx>
#include <math.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::view;
@@ -866,7 +866,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL));
+ std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(NULL));
DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->SetColumns(xCols);
pDlg->Execute();
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9900c42..f7a190f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -57,11 +57,10 @@
#include <comphelper/property.hxx>
#include <cppuhelper/implbase.hxx>
-#include <boost/scoped_ptr.hpp>
-
#include <algorithm>
#include <cstdlib>
#include <map>
+#include <memory>
using namespace ::dbtools;
using namespace ::dbtools::DBTypeConversion;
@@ -3568,7 +3567,7 @@ void DbGridControl::FieldValueChanged(sal_uInt16 _nId, const PropertyChangeEvent
DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL;
if (pColumn)
{
- boost::scoped_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard;
+ std::unique_ptr<vcl::SolarMutexTryAndBuyGuard> pGuard;
while (!m_bWantDestruction && (!pGuard || !pGuard->isAcquired()))
pGuard.reset(new vcl::SolarMutexTryAndBuyGuard);
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index fbc8b84..8541ac6 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -40,12 +40,12 @@
#include <basic/basmgr.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/assign/list_of.hpp>
-#include <utility>
-using std::pair;
+#include <memory>
#include <set>
+#include <utility>
+using std::pair;
namespace svxform
{
@@ -858,7 +858,7 @@ namespace svxform
virtual ~IScript() { }
};
- typedef ::boost::shared_ptr< IScript > PScript;
+ typedef std::shared_ptr< IScript > PScript;
class NewStyleUNOScript : public IScript
{
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 2dfc518..c73236b 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -88,7 +88,7 @@
#include <comphelper/property.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// wird fuer Invalidate verwendet -> mitpflegen
// aufsteigend sortieren !!!!!!
@@ -753,7 +753,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
DBG_ASSERT( pFact, "no dialog factory!" );
if ( pFact )
{
- boost::scoped_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
+ std::unique_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) );
DBG_ASSERT( dlg.get(), "Dialog creation failed!" );
dlg->SetValue( rController->getCursor()->getRow() );
if ( dlg->Execute() == RET_OK )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 26eb927..1e664d2 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -99,8 +99,8 @@
#include <algorithm>
#include <functional>
#include <map>
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
// wird fuer Invalidate verwendet -> mitpflegen
static const sal_uInt16 DatabaseSlotMap[] =
@@ -285,7 +285,7 @@ namespace
{
SdrObject* pCurrent = _rMarkList.GetMark( i )->GetMarkedSdrObj();
- boost::scoped_ptr<SdrObjListIter> pGroupIterator;
+ std::unique_ptr<SdrObjListIter> pGroupIterator;
if ( pCurrent->IsGroupObject() )
{
pGroupIterator.reset(new SdrObjListIter( *pCurrent->GetSubList() ));
@@ -1568,7 +1568,7 @@ void FmXFormShell::ExecuteSearch()
// ausgeraeumt sind, sollte hier ein SM_USETHREAD rein, denn die Suche in einem eigenen Thread ist doch etwas fluessiger
// sollte allerdings irgendwie von dem unterliegenden Cursor abhaengig gemacht werden, DAO zum Beispiel ist nicht thread-sicher
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractFmSearchDialog> pDialog;
+ std::unique_ptr<AbstractFmSearchDialog> pDialog;
if ( pFact )
pDialog.reset(pFact->CreateFmSearchDialog( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow(), strInitialText, aContextNames, nInitialContext, LINK( this, FmXFormShell, OnSearchContextRequest ) ));
DBG_ASSERT( pDialog, "FmXFormShell::ExecuteSearch: could not create the search dialog!" );
@@ -4068,7 +4068,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
{
// We can't simply re-insert the item because we have a clear order for all the our items.
// So first we have to determine the position of the item to insert.
- boost::scoped_ptr<PopupMenu> pSource(FmXFormShell::GetConversionMenu());
+ std::unique_ptr<PopupMenu> pSource(FmXFormShell::GetConversionMenu());
sal_uInt16 nSourcePos = pSource->GetItemPos(nSID);
DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !");
sal_uInt16 nPrevInSource = nSourcePos;
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index affd7bf..f3f24a5 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -63,7 +63,7 @@
#include <vcl/outdev.hxx>
#include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace svx
@@ -644,10 +644,10 @@ namespace svx
SfxItemPool* pPool = EditEngine::CreatePool();
pPool->FreezeIdRanges();
- boost::scoped_ptr< SfxItemSet > xPureItems( new SfxItemSet( *pPool ) );
+ std::unique_ptr< SfxItemSet > xPureItems( new SfxItemSet( *pPool ) );
// put the current states of the items into the set
- boost::scoped_ptr<SfxAllItemSet> xCurrentItems( new SfxAllItemSet( *xPureItems ) );
+ std::unique_ptr<SfxAllItemSet> xCurrentItems( new SfxAllItemSet( *xPureItems ) );
transferFeatureStatesToItemSet( m_aControlFeatures, *xCurrentItems );
// additional items, which we are not responsible for at the SfxShell level,
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index f96dd58..5999300 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -38,7 +38,7 @@
#include <svx/dialmgr.hxx>
#include <svx/svxdlg.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// - Namespaces -
@@ -358,7 +358,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<VclAbstractRefreshableDialog> aActualizeProgress(pFact->CreateActualizeProgressDialog( this, pTheme ));
+ std::unique_ptr<VclAbstractRefreshableDialog> aActualizeProgress(pFact->CreateActualizeProgressDialog( this, pTheme ));
DBG_ASSERT(aActualizeProgress, "Dialog creation failed!");
aActualizeProgress->Update();
@@ -382,7 +382,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldName ));
+ std::unique_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldName ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
@@ -418,7 +418,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog( this, pTheme ));
+ std::unique_ptr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog( this, pTheme ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index f54a934..be60b09 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -57,7 +57,7 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/style/GraphicLocation.hpp>
#include <map>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <cppuhelper/implbase.hxx>
#undef GALLERY_USE_CLIPBOARD
@@ -1177,7 +1177,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldTitle ));
+ std::unique_ptr<AbstractTitleDialog> aDlg(pFact->CreateTitleDialog( this, aOldTitle ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
if( aDlg->Execute() == RET_OK )
{
diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx
index 0fbe1ba..e0d1a78 100644
--- a/svx/source/gallery2/galini.cxx
+++ b/svx/source/gallery2/galini.cxx
@@ -23,11 +23,11 @@
#include <unotools/syslocale.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName )
{
- boost::scoped_ptr<SvStream> pStrm(::utl::UcbStreamHelper::CreateStream(
+ std::unique_ptr<SvStream> pStrm(::utl::UcbStreamHelper::CreateStream(
GetStrURL().GetMainURL( INetURLObject::NO_DECODE ),
StreamMode::READ ));
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 157da50..3feb548 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -43,7 +43,7 @@
#include "svx/gallery1.hxx"
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// - Namespaces -
@@ -260,7 +260,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
OUString aTestFile( "cdefghij.klm" );
aTestURL.Append( aTestFile );
- boost::scoped_ptr<SvStream> pTestStm(::utl::UcbStreamHelper::CreateStream( aTestURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
+ std::unique_ptr<SvStream> pTestStm(::utl::UcbStreamHelper::CreateStream( aTestURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
if( pTestStm )
{
@@ -620,7 +620,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
if( FileExists( aURL ) )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm )
{
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index a602f8a..37f23a0 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -96,7 +96,7 @@ GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic
if( pIStm )
{
GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
- boost::scoped_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL);
+ std::unique_ptr<GalleryProgress> pProgress(bShowProgress ? new GalleryProgress( &rGraphicFilter ) : NULL);
sal_uInt16 nFormat;
if( !rGraphicFilter.ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 8a62689..7d7770b 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -39,7 +39,7 @@
#include <vcl/settings.hxx>
#include <vcl/dibtools.hxx>
#include "gallerydrawmodel.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -229,7 +229,7 @@ const OUString SgaObject::GetTitle() const
!aResourceName.isEmpty() && ( nResId > 0 ) && ( nResId < 0x10000 ) )
{
OString aMgrName(OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8));
- boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aMgrName.getStr(),
+ std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( aMgrName.getStr(),
Application::GetSettings().GetUILanguageTag() ));
if ( pResMgr )
{
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index e1ad481..315449f 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -56,7 +56,6 @@
#include <vcl/lstbox.hxx>
#include "gallerydrawmodel.hxx"
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -110,7 +109,7 @@ void GalleryTheme::ImplCreateSvDrawStorage()
bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry )
{
- boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
+ std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
bool bRet = false;
if( pOStm )
@@ -154,7 +153,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
if( pEntry )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm )
{
@@ -206,9 +205,9 @@ void GalleryTheme::ImplWrite()
if( FileExists( aPathURL ) || CreateDir( aPathURL ) )
{
#ifdef UNX
- boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::COPY_ON_SYMLINK | StreamMode::TRUNC ));
+ std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::COPY_ON_SYMLINK | StreamMode::TRUNC ));
#else
- boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
+ std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( GetThmURL().GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
#endif
if( pOStm )
@@ -257,7 +256,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat
// read next possible number
if( FileExists( aInfoFileURL ) )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm )
{
@@ -322,7 +321,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat
while( bExists );
// write updated number
- boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
+ std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aInfoFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE ));
if( pOStm )
{
@@ -389,7 +388,7 @@ bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
// update title of new object if necessary
if (rObj.GetTitle().isEmpty())
{
- boost::scoped_ptr<SgaObject> pOldObj(ImplReadSgaObject(pFoundEntry));
+ std::unique_ptr<SgaObject> pOldObj(ImplReadSgaObject(pFoundEntry));
if (pOldObj)
{
@@ -555,7 +554,7 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr
if ( GalleryGraphicImport( aURL, aGraphic, aFormat ) != GalleryGraphicImportRet::IMPORT_NONE )
{
- boost::scoped_ptr<SgaObject> pNewObj;
+ std::unique_ptr<SgaObject> pNewObj;
if ( SGA_OBJ_INET == pEntry->eObjKind )
pNewObj.reset(static_cast<SgaObject*>(new SgaObjectINet( aGraphic, aURL, aFormat )));
@@ -617,15 +616,15 @@ void GalleryTheme::Actualize( const Link<>& rActualizeLink, GalleryProgress* pPr
DBG_ASSERT( aInURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
DBG_ASSERT( aTmpURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
- boost::scoped_ptr<SvStream> pTmpStm(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pTmpStm(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
if( pIStm && pTmpStm )
{
for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
{
pEntry = aObjectList[ i ];
- boost::scoped_ptr<SgaObject> pObj;
+ std::unique_ptr<SgaObject> pObj;
switch( pEntry->eObjKind )
{
@@ -697,7 +696,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
if( FileExists( rURL ) )
{
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( rURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm )
{
@@ -736,7 +735,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
if( nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) &&
nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) )
{
- boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( *pIStm, StreamMode::READ ));
+ std::unique_ptr<VersionCompat> pCompat(new VersionCompat( *pIStm, StreamMode::READ ));
pIStm->ReadUInt32( nThemeId );
@@ -892,7 +891,7 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPo
}
const INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_BMP, nExportFormat ) );
- boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
+ std::unique_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
if( pOStm )
{
@@ -1104,7 +1103,7 @@ bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos
{
Graphic aGraphic;
OUString aFormat;
- boost::scoped_ptr<SgaObject> pNewObj;
+ std::unique_ptr<SgaObject> pNewObj;
const GalleryGraphicImportRet nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
bool bRet = false;
@@ -1183,7 +1182,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
if( rxTransferable.is() )
{
TransferableDataHelper aDataHelper( rxTransferable );
- boost::scoped_ptr<Graphic> pGraphic;
+ std::unique_ptr<Graphic> pGraphic;
if( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) )
{
@@ -1356,7 +1355,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
rOStm.WriteUInt32( COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) ).WriteUInt32( COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) );
const long nReservePos = rOStm.Tell();
- boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 ));
+ std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rOStm, StreamMode::WRITE, 2 ));
rOStm.WriteUInt32( GetId() ).WriteBool( IsThemeNameFromResource() ); // From version 2 and up
@@ -1486,7 +1485,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) &&
nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) )
{
- boost::scoped_ptr<VersionCompat> pCompat(new VersionCompat( rIStm, StreamMode::READ ));
+ std::unique_ptr<VersionCompat> pCompat(new VersionCompat( rIStm, StreamMode::READ ));
sal_uInt32 nTemp32;
bool bThemeNameFromResource = false;
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 63cfbd5..1e35fd3 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -27,7 +27,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
#include <svx/unoapi.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr { namespace contact {
@@ -116,7 +116,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo)
// if there is something to show, use a vclProcessor to render it
if(xPrimitiveSequence.hasElements())
{
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
*pTargetDevice,
getViewInformation2D()));
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 555b06b..05c6ab4 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -37,7 +37,7 @@
#include <svx/unoapi.hxx>
#include "eventhandler.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -292,7 +292,7 @@ namespace sdr
pOutDev->SetLayoutMode(TEXT_LAYOUT_DEFAULT); // reset, default is no BiDi/RTL
// create renderer
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rTargetOutDev, getViewInformation2D()));
diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
index a12bcf8..6ace072 100644
--- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx
@@ -24,7 +24,7 @@
#include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/range/b3drange.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr
@@ -71,7 +71,7 @@ namespace sdr
aWorldTransform.translate(aCubeRange.getMinX(), aCubeRange.getMinY(), aCubeRange.getMinZ());
// get 3D Object Attributes
- boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
+ std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size to get a perfect mapping for
// the front/back sides
diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
index cf4132e..51d6e6d7 100644
--- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx
@@ -24,7 +24,7 @@
#include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr
@@ -51,7 +51,7 @@ namespace sdr
const basegfx::B2DPolyPolygon aPolyPolygon(GetE3dExtrudeObj().GetExtrudePolygon());
// get 3D Object Attributes
- boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
+ std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size; use size of top/bottom cap to get a perfect mapping
// for the caps. The in-between geometry will get a stretched size with a
diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
index 1f22774..4554ffc 100644
--- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx
@@ -24,7 +24,7 @@
#include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr
@@ -51,7 +51,7 @@ namespace sdr
const basegfx::B2DPolyPolygon aPolyPolygon(GetE3dLatheObj().GetPolyPoly2D());
// get 3D Object Attributes
- boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
+ std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size. Use the polygon length of the longest polygon for
// height and the rotated radius for width (using polygon center) to get a good
diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
index 88fd9a6..c9710dd 100644
--- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx
@@ -25,7 +25,7 @@
#include <sdr/primitive3d/sdrattributecreator3d.hxx>
#include <basegfx/polygon/b3dpolygon.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr
@@ -99,7 +99,7 @@ namespace sdr
}
// get 3D Object Attributes
- boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
+ std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// calculate texture size
basegfx::B2DVector aTextureSize(1.0, 1.0);
diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
index 96c286b..b5f1271 100644
--- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
+++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx
@@ -23,7 +23,7 @@
#include <drawinglayer/primitive3d/sdrsphereprimitive3d.hxx>
#include <svx/sdr/primitive2d/sdrattributecreator.hxx>
#include <sdr/primitive3d/sdrattributecreator3d.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr
@@ -57,7 +57,7 @@ namespace sdr
aWorldTransform.translate(aSpherePosition.getX(), aSpherePosition.getY(), aSpherePosition.getZ());
// get 3D Object Attributes
- boost::scoped_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
+ std::unique_ptr<drawinglayer::attribute::Sdr3DObjectAttribute> pSdr3DObjectAttribute(drawinglayer::primitive2d::createNewSdr3DObjectAttribute(rItemSet));
// get segment count
const sal_uInt32 nHorizontalSegments(GetE3dSphereObj().GetHorizontalSegments());
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 6fa4e02..d32e4d6 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -26,7 +26,7 @@
#include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace com::sun::star;
@@ -47,7 +47,7 @@ namespace sdr
const bool bIsAntiAliasing(getDrawinglayerOpt().IsAntiAliasing());
// create processor
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rDestinationDevice,
getCurrentViewInformation2D()));
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index f8c2928..25c9ff6 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -23,7 +23,7 @@
#include <svx/svddef.hxx>
#include <svx/scene3d.hxx>
#include <svx/svditer.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sdr
@@ -121,7 +121,7 @@ namespace sdr
{
// Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
// #i50808# Leak fix, Clone produces a new instance and we get ownership here
- boost::scoped_ptr<SfxItemSet> pNewSet(rSet.Clone(true));
+ std::unique_ptr<SfxItemSet> pNewSet(rSet.Clone(true));
DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx
index b7b4940..77ca0bd 100644
--- a/svx/source/sdr/properties/itemsettools.cxx
+++ b/svx/source/sdr/properties/itemsettools.cxx
@@ -26,7 +26,7 @@
#include <svx/svditer.hxx>
#include <vcl/region.hxx>
#include <vcl/outdev.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// class to remember broadcast start positions
@@ -115,7 +115,7 @@ namespace sdr
{
if(pItem->HasMetrics())
{
- boost::scoped_ptr<SfxPoolItem> pNewItem(pItem->Clone());
+ std::unique_ptr<SfxPoolItem> pNewItem(pItem->Clone());
pNewItem->ScaleMetrics(nMul, nDiv);
rSet.Put(*pNewItem);
}
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 770c610..3f327a0 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -42,7 +42,7 @@
#include <svx/dialogs.hrc>
#include <svx/svdoashp.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <vector>
using ::std::vector;
using namespace com::sun::star;
@@ -770,7 +770,7 @@ void SdrEditView::DistributeMarkedObjects()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(NULL, aNewAttr));
+ std::unique_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(NULL, aNewAttr));
DBG_ASSERT(pDlg, "Dialog creation failed!");
sal_uInt16 nResult = pDlg->Execute();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 29b1b9b..ea6ae00 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -61,8 +61,6 @@
#include <svx/sdr/table/tablecontroller.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
-#include <boost/scoped_ptr.hpp>
-
#include <memory>
@@ -358,7 +356,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
{
// completely reworked to use primitives; this ensures same look and functionality
const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> xProcessor(drawinglayer::processor2d::createProcessor2DFromOutputDevice(
rTargetDevice,
aViewInformation2D));
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index f63d759..6e1cdf8 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -66,7 +66,6 @@
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
// #i15222#
@@ -1045,7 +1044,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
aRetval.Erase(aCol);
// get write access
- boost::scoped_ptr<BitmapWriteAccess> pWrite(aRetval.AcquireWriteAccess());
+ std::unique_ptr<BitmapWriteAccess> pWrite(aRetval.AcquireWriteAccess());
DBG_ASSERT(pWrite, "Got NO write access to a new Bitmap!");
if(pWrite)
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6b8c00d..7a80781 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -135,9 +135,9 @@
#include <svdobjplusdata.hxx>
#include <svdobjuserdatalist.hxx>
-#include <boost/scoped_ptr.hpp>
#include <boost/optional.hpp>
#include <libxml/xmlwriter.h>
+#include <memory>
using namespace ::com::sun::star;
@@ -3163,7 +3163,7 @@ SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNe
SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel )
{
- boost::scoped_ptr<SdrObjFactory> pFact(new SdrObjFactory(nInventor, nIdentifier, pPage, pModel));
+ std::unique_ptr<SdrObjFactory> pFact(new SdrObjFactory(nInventor, nIdentifier, pPage, pModel));
SdrLinkList& rLL = ImpGetUserMakeObjHdl();
unsigned n = rLL.GetLinkCount();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 17bc544..b80011e 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -61,7 +61,7 @@
#include <osl/thread.hxx>
#include <drawinglayer/processor2d/objectinfoextractor2d.hxx>
#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1315,7 +1315,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* )
uno::Reference<io::XInputStream> const xStream(
pModel->GetDocumentStream(aUserData, proxy));
- ::boost::scoped_ptr<SvStream> const pStream( (xStream.is())
+ std::unique_ptr<SvStream> const pStream( (xStream.is())
? ::utl::UcbStreamHelper::CreateStream(xStream)
: 0 );
@@ -1323,7 +1323,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* )
{
Graphic aGraphic;
- boost::scoped_ptr<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > pFilterData;
+ std::unique_ptr<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > pFilterData;
if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true))
{
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 074d2fa..9735c48 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -72,7 +72,7 @@ struct MediaTempFile
struct SdrMediaObj::Impl
{
::avmedia::MediaItem m_MediaProperties;
- ::boost::shared_ptr< MediaTempFile > m_pTempFile;
+ std::shared_ptr< MediaTempFile > m_pTempFile;
uno::Reference< graphic::XGraphic > m_xCachedSnapshot;
OUString m_LastFailedPkgURL;
};
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index dccb9cd..a004ad0 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -33,7 +33,7 @@
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
#include <tools/tenccvt.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
class ImpSdrObjTextLink: public ::sfx2::SvBaseLink
{
@@ -220,7 +220,7 @@ bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterNa
DBG_ASSERT( aFileURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
- boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
+ std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
if( pIStm )
{
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 5563bf3..b9d53d9 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -25,7 +25,7 @@
#include "editeng/fhgtitem.hxx"
#include <editeng/eeitem.hxx>
#include <svl/itemset.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ )
: mpOutlinerParaObject( pOutlinerParaObject )
@@ -173,7 +173,7 @@ void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode )
{
if( mpModel && !mpOutlinerParaObject )
{
- boost::scoped_ptr<Outliner> pOutliner(SdrMakeOutliner(nOutlMode, *mpModel));
+ std::unique_ptr<Outliner> pOutliner(SdrMakeOutliner(nOutlMode, *mpModel));
if( pOutliner )
{
Outliner& aDrawOutliner = mpModel->GetDrawOutliner();
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 3a4d6dc..3974b36 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -18,9 +18,8 @@
*/
+#include <memory>
#include <vector>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/table/XTable.hpp>
@@ -58,7 +57,7 @@ struct RTFCellDefault
explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {}
};
-typedef std::vector< boost::shared_ptr< RTFCellDefault > > RTFCellDefaultVector;
+typedef std::vector< std::shared_ptr< RTFCellDefault > > RTFCellDefaultVector;
struct RTFCellInfo
{
@@ -70,10 +69,10 @@ struct RTFCellInfo
explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0), mnParaCount(0), mnColSpan(0) {}
};
-typedef boost::shared_ptr< RTFCellInfo > RTFCellInfoPtr;
+typedef std::shared_ptr< RTFCellInfo > RTFCellInfoPtr;
typedef std::vector< RTFCellInfoPtr > RTFColumnVector;
-typedef boost::shared_ptr< RTFColumnVector > RTFColumnVectorPtr;
+typedef std::shared_ptr< RTFColumnVector > RTFColumnVectorPtr;
class SdrTableRTFParser
{
@@ -274,7 +273,7 @@ void SdrTableRTFParser::FillTable()
if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,false,&pPoolItem)==SfxItemState::SET)
xCell->SetMergedItem( *pPoolItem );
- boost::scoped_ptr<OutlinerParaObject> pTextObject(mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount ));
+ std::unique_ptr<OutlinerParaObject> pTextObject(mpOutliner->CreateParaObject( xCellInfo->mnStartPara, xCellInfo->mnParaCount ));
if( pTextObject )
{
SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
@@ -361,7 +360,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
{
mbNewDef = true;
mpInsDefault->mnCol = mnColCnt;
- maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) );
+ maDefaultList.push_back( std::shared_ptr< RTFCellDefault >( mpInsDefault ) );
if( (sal_Int32)maColumnEdges.size() <= mnColCnt )
maColumnEdges.resize( mnColCnt + 1 );
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 92b89a3..650ef07 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -38,7 +38,7 @@
#include <svx/itemwin.hxx>
#include <svx/dialmgr.hxx>
#include "helpid.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -376,7 +376,7 @@ void SvxFillToolBoxControl::Update()
}
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
- boost::scoped_ptr<XGradientEntry> pEntry(new XGradientEntry(mpFillGradientItem->GetGradientValue(), aTmpStr));
+ std::unique_ptr<XGradientEntry> pEntry(new XGradientEntry(mpFillGradientItem->GetGradientValue(), aTmpStr));
XGradientList aGradientList( "", ""/*TODO?*/ );
aGradientList.Insert( pEntry.get() );
aGradientList.SetDirty( false );
@@ -501,7 +501,7 @@ void SvxFillToolBoxControl::Update()
}
aTmpStr = TMP_STR_BEGIN + aString + TMP_STR_END;
- boost::scoped_ptr<XBitmapEntry> pEntry(new XBitmapEntry(mpBitmapItem->GetGraphicObject(), aTmpStr));
+ std::unique_ptr<XBitmapEntry> pEntry(new XBitmapEntry(mpBitmapItem->GetGraphicObject(), aTmpStr));
XBitmapListRef xBitmapList =
XPropertyList::AsBitmapList(
XPropertyList::CreatePropertyList(
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index a7f6172..a299100 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -51,7 +51,7 @@
#include "coreservices.hxx"
#include <algorithm>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "helpid.hrc"
@@ -201,7 +201,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
if( nItemId > 0 )
{
- boost::scoped_ptr<FmFormModel> pModel(new FmFormModel());
+ std::unique_ptr<FmFormModel> pModel(new FmFormModel());
pModel->GetItemPool().FreezeIdRanges();
if( GalleryExplorer::GetSdrObj( mnThemeId, nItemId-1, pModel.get() ) )
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index b6a7574..bbaec33 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -34,7 +34,7 @@
#include <svx/itemwin.hxx>
#include <svx/dialmgr.hxx>
#include <svx/unoapi.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -333,8 +333,8 @@ void SvxLineEndWindow::dispose()
IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void)
{
- boost::scoped_ptr<XLineEndItem> pLineEndItem;
- boost::scoped_ptr<XLineStartItem> pLineStartItem;
+ std::unique_ptr<XLineEndItem> pLineEndItem;
+ std::unique_ptr<XLineStartItem> pLineStartItem;
sal_uInt16 nId = aLineEndSet->GetSelectItemId();
if( nId == 1 )
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 2cca8bd..42bb4ce 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -36,7 +36,7 @@
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -195,7 +195,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto
// Sizes-Liste auff"ullen
sal_Int64 nOldVal = GetValue(); // alten Wert merken
const FontList* _pFontList = NULL;
- boost::scoped_ptr<FontList> aHold( new FontList( this ));
+ std::unique_ptr<FontList> aHold( new FontList( this ));
_pFontList = aHold.get();
if ( !rCurrentFont.Name.isEmpty() )
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index f77c801..f5cff76 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -66,10 +66,8 @@
#include <editeng/eeitem.hxx>
#include <svx/svdoutl.hxx>
#include <editeng/flditem.hxx>
-
-#include <boost/scoped_ptr.hpp>
-
#include <UnoGraphicExporter.hxx>
+#include <memory>
#define MAX_EXT_PIX 2048
@@ -437,7 +435,7 @@ VclPtr<VirtualDevice> GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntP
if(bSuccess)
{
- boost::scoped_ptr<SdrView> pView(new SdrView(mpDoc, pVDev));
+ std::unique_ptr<SdrView> pView(new SdrView(mpDoc, pVDev));
pView->SetPageVisible( false );
pView->SetBordVisible( false );
pView->SetGridVisible( false );
@@ -699,7 +697,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
}
}
- boost::scoped_ptr< SdrView > pLocalView;
+ std::unique_ptr< SdrView > pLocalView;
if( PTR_CAST( FmFormModel, mpDoc ) )
{
pLocalView.reset( new FmFormView( PTR_CAST( FmFormModel, mpDoc ), aVDev ) );
@@ -732,7 +730,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
Size aNewSize;
// create a view
- boost::scoped_ptr< SdrView > pView;
+ std::unique_ptr< SdrView > pView;
if( PTR_CAST( FmFormModel, mpDoc ) )
{
pView.reset(new FmFormView( PTR_CAST( FmFormModel, mpDoc ), aVDev ));
@@ -861,7 +859,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
Rectangle aScrollRectangle;
Rectangle aPaintRectangle;
- const boost::scoped_ptr< GDIMetaFile > pMtf(
+ const std::unique_ptr< GDIMetaFile > pMtf(
static_cast<SdrTextObj*>(pObj)->GetTextScrollMetaFileAndRectangle(
aScrollRectangle, aPaintRectangle ) );
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 224cc0f..7ef71b9 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -30,7 +30,7 @@
#include <vcl/svapp.hxx>
#include "svx/unoapi.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::cppu;
@@ -87,7 +87,7 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
SfxItemSet* mpInSet = new SfxItemSet( *mpModelPool, mnWhich, mnWhich );
maItemSetVector.push_back( mpInSet );
- boost::scoped_ptr<NameOrIndex> pNewItem(createItem());
+ std::unique_ptr<NameOrIndex> pNewItem(createItem());
pNewItem->SetName( aName );
pNewItem->PutValue( aElement, mnMemberId );
mpInSet->Put( *pNewItem, mnWhich );
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index dccdbad..949df3e 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -38,7 +38,7 @@
#include <editeng/editeng.hxx>
#include "svx/unoapi.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::cppu;
@@ -185,7 +185,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
default:
{
- boost::scoped_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
+ std::unique_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 63b29ea..ae70d17 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -34,7 +34,6 @@
#include <vcl/fltcall.hxx>
#include <vcl/graphicfilter.hxx>
-#include <boost/scoped_ptr.hpp>
#include <svx/svdpool.hxx>
#include <editeng/unoprnms.hxx>
@@ -58,6 +57,8 @@
#include <comphelper/servicehelper.hxx>
#include <vcl/wmf.hxx>
+#include <memory>
+
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -1866,7 +1867,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
bool bNeedsMirrorX = static_cast<SdrObjCustomShape*>(pObject)->IsMirroredX() != bMirroredX;
bool bNeedsMirrorY = static_cast<SdrObjCustomShape*>(pObject)->IsMirroredY() != bMirroredY;
- boost::scoped_ptr< SdrGluePointList > pListCopy;
+ std::unique_ptr< SdrGluePointList > pListCopy;
if( bNeedsMirrorX || bNeedsMirrorY )
{
const SdrGluePointList* pList = pObject->GetGluePointList();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 667d687..225e420 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -87,14 +87,14 @@
#include "shapeimpl.hxx"
#include <sal/log.hxx>
-#include <vector>
-
#include "svx/lathe3d.hxx"
#include "svx/extrud3d.hxx"
-#include <boost/scoped_ptr.hpp>
#include <vcl/wmf.hxx>
+#include <memory>
+#include <vector>
+
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -675,7 +675,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
SdrModel* pModel = mpObj->GetModel();
SdrPage* pPage = mpObj->GetPage();
- boost::scoped_ptr<E3dView> pView(new E3dView( pModel, pVDev.get() ));
+ std::unique_ptr<E3dView> pView(new E3dView( pModel, pVDev.get() ));
pView->hideMarkHandles();
SdrPageView* pPageView = pView->ShowSdrPage(pPage);
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 8e55ea4..7681941 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/gallery/GalleryItemType.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define UNOGALLERY_GALLERYITEMTYPE 1
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list