summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-03-22 20:26:39 +0900
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-03-22 20:50:52 +0900
commit74c21e709495b16787f5d6598cebf322416ce455 (patch)
tree870b9ae58284f00f08e360bccaec3662e65034ba /svx
parent647b968191a6b452d1d8f704200e0d604c721991 (diff)
LinePropertyPanel - scoped_ptr -> unique_ptr
Change-Id: I52708b6ca13f76391355b1c0eefc1dcf22dcc273
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx12
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.hxx9
2 files changed, 10 insertions, 11 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index f7a91e709f8a..052e16e7f47b 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -166,8 +166,8 @@ LinePropertyPanel::LinePropertyPanel(
mnTrans(0),
meMapUnit(SFX_MAPUNIT_MM),
mnWidthCoreValue(0),
- mpStartItem(0),
- mpEndItem(0),
+ mpStartItem(),
+ mpEndItem(),
maLineWidthPopup(this, ::boost::bind(&LinePropertyPanel::CreateLineWidthPopupControl, this, _1)),
maIMGNone(SVX_RES(IMG_NONE_ICON)),
mpIMGWidthIcon(),
@@ -637,7 +637,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG)
sal_Int32 nPos = mpLBStart->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() )
{
- boost::scoped_ptr<XLineStartItem> pItem;
+ std::unique_ptr<XLineStartItem> pItem;
if( nPos == 0 )
pItem.reset(new XLineStartItem());
else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) )
@@ -652,7 +652,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG)
sal_Int32 nPos = mpLBEnd->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() )
{
- boost::scoped_ptr<XLineEndItem> pItem;
+ std::unique_ptr<XLineEndItem> pItem;
if( nPos == 0 )
pItem.reset(new XLineEndItem());
else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) )
@@ -668,7 +668,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG)
if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBEdgeStyle->IsValueChangedFromSaved())
{
- boost::scoped_ptr<XLineJointItem> pItem;
+ std::unique_ptr<XLineJointItem> pItem;
switch(nPos)
{
@@ -705,7 +705,7 @@ IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG)
if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBCapStyle->IsValueChangedFromSaved())
{
- boost::scoped_ptr<XLineCapItem> pItem;
+ std::unique_ptr<XLineCapItem> pItem;
switch(nPos)
{
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index e9836837221b..586573f506ed 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -25,7 +25,6 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp>
#include <svx/sidebar/PanelLayout.hxx>
#include <svx/xtable.hxx>
@@ -111,16 +110,16 @@ private:
sfx2::sidebar::ControllerItem maEdgeStyle;
sfx2::sidebar::ControllerItem maCapStyle;
- boost::scoped_ptr<XLineStyleItem> mpStyleItem;
- boost::scoped_ptr<XLineDashItem> mpDashItem;
+ std::unique_ptr<XLineStyleItem> mpStyleItem;
+ std::unique_ptr<XLineDashItem> mpDashItem;
sal_uInt16 mnTrans;
SfxMapUnit meMapUnit;
sal_Int32 mnWidthCoreValue;
XLineEndListRef mxLineEndList;
XDashListRef mxLineStyleList;
- boost::scoped_ptr<XLineStartItem> mpStartItem;
- boost::scoped_ptr<XLineEndItem> mpEndItem;
+ std::unique_ptr<XLineStartItem> mpStartItem;
+ std::unique_ptr<XLineEndItem> mpEndItem;
//popup windows
LineWidthPopup maLineWidthPopup;