[Libreoffice-commits] core.git: shell/source stoc/source svl/source svtools/source svx/source sw/source
Takeshi Abe
tabe at fixedpoint.jp
Mon Feb 24 23:34:40 PST 2014
shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx | 4 ++--
stoc/source/security/access_controller.cxx | 4 ++--
svl/source/items/stylepool.cxx | 4 ++--
svtools/source/contnr/fileview.cxx | 4 ++--
svtools/source/contnr/imivctl1.cxx | 4 ++--
svtools/source/graphic/grfcache.cxx | 4 ++--
svx/source/dialog/databaseregistrationui.cxx | 4 ++--
svx/source/table/tablecontroller.cxx | 5 +++--
svx/source/tbxctrls/tbunocontroller.cxx | 4 ++--
svx/source/unodraw/unopool.cxx | 4 ++--
svx/source/unodraw/unoshtxt.cxx | 3 ++-
sw/source/core/access/accpara.cxx | 12 +++---------
sw/source/core/bastyp/calc.cxx | 3 ++-
sw/source/core/doc/docfly.cxx | 3 ++-
sw/source/core/doc/docfmt.cxx | 5 +++--
sw/source/core/doc/tblcpy.cxx | 3 ++-
sw/source/core/docnode/ndsect.cxx | 5 ++---
sw/source/core/table/swnewtable.cxx | 4 ++--
sw/source/core/text/txttab.cxx | 10 +++-------
sw/source/core/txtnode/ndtxt.cxx | 3 ++-
20 files changed, 44 insertions(+), 48 deletions(-)
New commits:
commit 4a9347fa320d892b60fd03082925f63a1d69cfb9
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Feb 25 16:30:23 2014 +0900
Replace deprecated std::auto_ptr with boost::scoped_ptr
Change-Id: I8e11ffe888aac8887c4c0875c41de51f343debae
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 45918f5..ea02c7d 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -43,7 +43,7 @@
#if defined _MSC_VER
#pragma warning(pop)
#endif
-#include <memory>
+#include <boost/scoped_ptr.hpp>
extern HINSTANCE g_hModule;
@@ -357,7 +357,7 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage)
try
{
std::wstring fname = getShortPathName( filename_ );
- std::auto_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) );
+ boost::scoped_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) );
if (zipfile->HasContent(THUMBNAIL_CONTENT))
{
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 23f7f83..92ca750 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -19,7 +19,6 @@
#include <vector>
-#include <memory>
#include <osl/diagnose.h>
#include <osl/interlck.h>
@@ -49,6 +48,7 @@
#include "lru_cache.h"
#include "permissions.h"
+#include <boost/scoped_ptr.hpp>
#define SERVICE_NAME "com.sun.star.security.AccessController"
#define USER_CREDS "access-control.user-credentials"
@@ -593,7 +593,7 @@ inline void AccessController::clearPostPoned() SAL_THROW(())
void AccessController::checkAndClearPostPoned() SAL_THROW( (RuntimeException) )
{
// check postponed permissions
- auto_ptr< t_rec_vec > rec( reinterpret_cast< t_rec_vec * >( m_rec.getData() ) );
+ boost::scoped_ptr< t_rec_vec > rec( reinterpret_cast< t_rec_vec * >( m_rec.getData() ) );
m_rec.setData( 0 ); // takeover ownership
OSL_ASSERT( rec.get() );
if (rec.get())
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index aa933a1..ae1a01e 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -27,7 +27,7 @@
#include <svl/stylepool.hxx>
#include <svl/itemiter.hxx>
#include <svl/itempool.hxx>
-
+#include <boost/scoped_ptr.hpp>
using namespace boost;
@@ -400,7 +400,7 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
// Every SfxPoolItem in the SfxItemSet causes a step deeper into the tree,
// a complete empty SfxItemSet would stay at the root node.
// #i86923# insert ignorable items to the tree leaves.
- std::auto_ptr<SfxItemSet> pFoundIgnorableItems;
+ boost::scoped_ptr<SfxItemSet> pFoundIgnorableItems;
if ( mpIgnorableItems )
{
pFoundIgnorableItems.reset( new SfxItemSet( *mpIgnorableItems ) );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 9e525f3a..b0e0544 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -52,7 +52,6 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <algorithm>
-#include <memory>
#include <vector>
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
@@ -72,6 +71,7 @@
#include <unotools/syslocale.hxx>
#include <svl/urlfilter.hxx>
#include <boost/ptr_container/ptr_set.hpp>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
@@ -1790,7 +1790,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
m_aCurrentAsyncActionHandler = Link();
// minimum time to wait
- ::std::auto_ptr< TimeValue > pTimeout( new TimeValue );
+ boost::scoped_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 4266462..dc7b3c6 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -36,7 +36,7 @@
#include <svtools/svmedit.hxx>
#include <algorithm>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#define IMPICNVIEW_ACC_RETURN 1
#define IMPICNVIEW_ACC_ESCAPE 2
@@ -320,7 +320,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, size_t
void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator )
{
- ::std::auto_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
+ boost::scoped_ptr< MnemonicGenerator > pAutoDeleteOwnGenerator;
if ( !_pGenerator )
{
_pGenerator = new MnemonicGenerator;
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 966cea8..c1f4324 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -26,7 +26,7 @@
#include <rtl/strbuf.hxx>
#include "grfcache.hxx"
#include <rtl/crc.h>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
#define RELEASE_TIMEOUT 10000
#define MAX_BMP_EXTENT 4096
@@ -884,7 +884,7 @@ void GraphicCache::AddGraphicObject(
if( !bInserted )
{
GraphicCacheEntryList::iterator it = maGraphicCache.begin();
- ::std::auto_ptr< GraphicID > apID;
+ boost::scoped_ptr< GraphicID > apID;
if( !pID )
{
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 4e6d1b4..1b1f40d 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 d70e92f..bd8419c 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 6280615..8897f31 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 c8f71edc..b10ef3a 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 43a6a1e..96a4566 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() );
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 8570081..15a4e8d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -3492,9 +3492,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
throw (lang::IllegalArgumentException,
uno::RuntimeException)
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<SwTextMarkupHelper> pTextMarkupHelper;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<SwTextMarkupHelper> pTextMarkupHelper;
switch ( nTextMarkupType )
{
case text::TextMarkupType::TRACK_CHANGE_INSERTION:
@@ -3728,9 +3726,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
lang::IllegalArgumentException,
uno::RuntimeException)
{
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<SwTextMarkupHelper> pTextMarkupHelper;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<SwTextMarkupHelper> pTextMarkupHelper;
switch ( nTextMarkupType )
{
case text::TextMarkupType::TRACK_CHANGE_INSERTION:
@@ -3765,9 +3761,7 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
throw lang::IndexOutOfBoundsException();
}
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr<SwTextMarkupHelper> pTextMarkupHelper;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<SwTextMarkupHelper> pTextMarkupHelper;
switch ( nTextMarkupType )
{
case text::TextMarkupType::TRACK_CHANGE_INSERTION:
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index d446816..4bd0726 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -50,6 +50,7 @@
#include <unotools/useroptions.hxx>
#include <usrfld.hxx>
#include <viewsh.hxx>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -1522,7 +1523,7 @@ bool SwCalc::Str2Double( const OUString& rCommand, sal_Int32& rCommandPos,
double& rVal, SwDoc* const pDoc )
{
const SvtSysLocale aSysLocale;
- ::std::auto_ptr<const LocaleDataWrapper> pLclD;
+ boost::scoped_ptr<const LocaleDataWrapper> pLclD;
if( pDoc )
{
LanguageType eLang = GetDocAppScriptLang( *pDoc );
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 8357223..624b668 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -56,6 +56,7 @@
#include <dflyobj.hxx>
#include <undoflystrattr.hxx>
#include <switerator.hxx>
+#include <boost/scoped_ptr.hpp>
extern sal_uInt16 GetHtmlMode( const SwDocShell* );
@@ -422,7 +423,7 @@ bool SwDoc::SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet )
if( !rSet.Count() )
return false;
- ::std::auto_ptr<SwUndoFmtAttrHelper> pSaveUndo;
+ boost::scoped_ptr<SwUndoFmtAttrHelper> pSaveUndo;
if (GetIDocumentUndoRedo().DoesUndo())
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index e347ed3..a6f9607 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -66,6 +66,7 @@
#include <SwUndoFmt.hxx>
#include <UndoManager.hxx>
#include <docsh.hxx>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
@@ -376,7 +377,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
}
// #i96644#
- std::auto_ptr< SwDataChanged > pDataChanged;
+ boost::scoped_ptr< SwDataChanged > pDataChanged;
if ( bSendDataChangedEvents )
{
pDataChanged.reset( new SwDataChanged( *pPam ) );
@@ -1725,7 +1726,7 @@ static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
if ( bChangeOfListStyleAtParagraph )
{
- std::auto_ptr< SwRegHistory > pRegH;
+ boost::scoped_ptr< SwRegHistory > pRegH;
if ( pPara->pHistory )
{
pRegH.reset( new SwRegHistory( pTNd, *pTNd, pPara->pHistory ) );
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index c15520f..58e8e7c 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -41,6 +41,7 @@
#include <fmtfsize.hxx>
#include <list>
#include <boost/foreach.hpp>
+#include <boost/scoped_ptr.hpp>
static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
SwTable& rDstTbl, SwTableBox* pDstBox,
@@ -516,7 +517,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
// First copy the new content and then delete the old one.
// Do not create empty Sections, otherwise they will be deleted!
- std::auto_ptr< SwNodeRange > pRg( pCpyBox ?
+ boost::scoped_ptr< SwNodeRange > pRg( pCpyBox ?
new SwNodeRange ( *pCpyBox->GetSttNd(), 1,
*pCpyBox->GetSttNd()->EndOfSectionNode() ) : 0 );
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index bfd738f..3443050 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -53,6 +53,7 @@
// #i27138#
#include <viewsh.hxx>
#include <txtfrm.hxx>
+#include <boost/scoped_ptr.hpp>
// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
// Method now determines the previous/next on its own. Thus, it can be controlled,
@@ -1223,9 +1224,7 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
SwSectionFmt* pSectFmt = pDoc->MakeSectionFmt( 0 );
pSectFmt->CopyAttrs( *GetSection().GetFmt() );
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<SwTOXBase> pTOXBase;
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr<SwTOXBase> pTOXBase;
if (TOX_CONTENT_SECTION == GetSection().GetType())
{
OSL_ENSURE( GetSection().ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 5f6b771..65d7a4a 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -33,8 +33,8 @@
#include <vector>
#include <set>
#include <list>
-#include <memory>
#include <boost/scoped_array.hpp>
+#include <boost/scoped_ptr.hpp>
#include <editeng/boxitem.hxx>
#include <editeng/protitem.hxx>
#include <swtblfmt.hxx>
@@ -810,7 +810,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
}
CHECK_TABLE( *this )
// We have to assert a "rectangular" box selection before we start to merge
- std::auto_ptr< SwBoxSelection > pSel( CollectBoxSelection( rPam ) );
+ boost::scoped_ptr< SwBoxSelection > pSel( CollectBoxSelection( rPam ) );
if( !pSel.get() || pSel->isEmpty() )
return false;
// Now we should have a rectangle of boxes,
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 99404ea..612911e 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -35,7 +35,7 @@
#include <numrule.hxx>
// #i89179#
#include <porfld.hxx>
-
+#include <boost/scoped_ptr.hpp>
/*************************************************************************
* SwLineInfo::GetTabStop()
@@ -378,9 +378,7 @@ bool SwTabPortion::PreFormat( SwTxtFormatInfo &rInf )
// #i89179#
// tab portion representing the list tab of a list label gets the
// same font as the corresponding number portion
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< SwFontSave > pSave( 0 );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr< SwFontSave > pSave( 0 );
if ( GetLen() == 0 &&
rInf.GetLast() && rInf.GetLast()->InNumberGrp() &&
static_cast<SwNumberPortion*>(rInf.GetLast())->HasFont() )
@@ -572,9 +570,7 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const
// #i89179#
// tab portion representing the list tab of a list label gets the
// same font as the corresponding number portion
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- std::auto_ptr< SwFontSave > pSave( 0 );
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ boost::scoped_ptr< SwFontSave > pSave( 0 );
bool bAfterNumbering = false;
if ( GetLen() == 0 )
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 8cf266c..383500a 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -80,6 +80,7 @@
#include <list.hxx>
#include <switerator.hxx>
#include <attrhint.hxx>
+#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -839,7 +840,7 @@ void SwTxtNode::Update(
{
SetAutoCompleteWordDirty( true );
- ::std::auto_ptr<SwpHts> pCollector;
+ boost::scoped_ptr<SwpHts> pCollector;
const sal_Int32 nChangePos = rPos.GetIndex();
if ( HasHints() )
More information about the Libreoffice-commits
mailing list