diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-25 16:30:23 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2014-02-25 16:33:15 +0900 |
commit | 4a9347fa320d892b60fd03082925f63a1d69cfb9 (patch) | |
tree | d4cd8ab03b5cd5b70e5637acbc471c7953a8165a /svx | |
parent | 9aee4d1c9e5a0289f0d3d7b4a13046eab60e316e (diff) |
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I8e11ffe888aac8887c4c0875c41de51f343debae
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/databaseregistrationui.cxx | 4 | ||||
-rw-r--r-- | svx/source/table/tablecontroller.cxx | 5 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unopool.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 3 |
5 files changed, 11 insertions, 9 deletions
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 4e6d1b48b4d4..1b1f40d0f226 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -29,7 +29,7 @@ #include <sfx2/app.hxx> #include <svl/itemset.hxx> #include <vcl/msgbox.hxx> - +#include <boost/scoped_ptr.hpp> namespace svx { @@ -40,7 +40,7 @@ namespace svx SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 ); SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create(); - ::std::auto_ptr< SfxAbstractDialog > pDialog; + boost::scoped_ptr< SfxAbstractDialog > pDialog; if ( pDialogFactory ) pDialog.reset( pDialogFactory->CreateSfxDialog( _parentWindow, aRegistrationItems, NULL, RID_SFXPAGE_DBREGISTER ) ); if ( pDialog.get() ) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index d70e92f644fe..bd8419c3415d 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -66,6 +66,7 @@ #include "tableundo.hxx" #include "tablelayouter.hxx" #include <vcl/msgbox.hxx> +#include <boost/scoped_ptr.hpp> using ::editeng::SvxBorderLine; using namespace ::sdr::table; @@ -743,7 +744,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) aNewAttr.Put( aBoxInfoItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 ); + boost::scoped_ptr< SfxAbstractTabDialog > pDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 ); // Even Cancel Button is returning positive(101) value, if( pDlg.get() && ( pDlg->Execute() == RET_OK ) ) { @@ -1038,7 +1039,7 @@ void SvxTableController::SplitMarkedCells() getSelectedCells( aStart, aEnd ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - std::auto_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( NULL, false, 99, 99 ) : 0 ); + boost::scoped_ptr< SvxAbstractSplittTableDialog > xDlg( pFact ? pFact->CreateSvxSplittTableDialog( NULL, false, 99, 99 ) : 0 ); if( xDlg.get() && xDlg->Execute() ) { const sal_Int32 nCount = xDlg->GetCount() - 1; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 62806157d50d..8897f3115738 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -35,7 +35,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> -#include <memory> +#include <boost/scoped_ptr.hpp> #define LOGICAL_EDIT_HEIGHT 12 @@ -202,7 +202,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; - ::std::auto_ptr<FontList> aHold( new FontList( this )); + boost::scoped_ptr<FontList> aHold( new FontList( this )); _pFontList = aHold.get(); if ( !rCurrentFont.Name.isEmpty() ) diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index c8f71edcdaee..b10ef3ac1c43 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 <memory> +#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::rtl; @@ -186,7 +186,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn default: { - ::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() ); + boost::scoped_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/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 43a6a1ef63f3..96a456600f33 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -47,6 +47,7 @@ #include <svx/svdotable.hxx> #include "../table/cell.hxx" #include <svx/sdrpaintwindow.hxx> +#include <boost/scoped_ptr.hpp> using namespace ::osl; using namespace ::rtl; @@ -1030,7 +1031,7 @@ IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify) { if( aNotify && !mbNotificationsDisabled ) { - ::std::auto_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( aNotify) ); + boost::scoped_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( aNotify) ); if( aHint.get() ) Broadcast( *aHint.get() ); |