sw/source/core/text/itrform2.cxx | 4 ++--
sw/source/core/text/pormulti.cxx | 5 ++---
sw/source/core/text/txttab.cxx | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 78095389594972409f93a3ea8ab807863f8e3ec2
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Sep 10 09:50:56 2015 +0200
sw: use std::unique_ptr<> in text
Change-Id: I0a4e0b5abbbbd58e7c0fc8235d88cf08a29a7c70
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index a6c7b1f..47ed32b 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -19,7 +19,7 @@
#include "hintids.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/lspcitem.hxx>
#include <dcontact.hxx>
@@ -1501,7 +1501,7 @@ sal_Int32 SwTextFormatter::FormatLine(const sal_Int32
nStartPos)
// fly positioning can make it necessary format a line several times
// for this, we have to keep a copy of our rest portion
SwLinePortion* pField = GetInfo().GetRest();
- boost::scoped_ptr<SwFieldPortion> xSaveField;
+ std::unique_ptr<SwFieldPortion> xSaveField;
if ( pField && pField->InFieldGrp() && !pField->IsFootnotePortion() )
xSaveField.reset(new SwFieldPortion(
*static_cast<SwFieldPortion*>(pField) ));
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 800f097..b3145b5 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -18,6 +18,7 @@
*/
#include <deque>
+#include <memory>
#include <hintids.hxx>
@@ -50,8 +51,6 @@
#include <swtable.hxx>
#include <fmtfsize.hxx>
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star;
// A SwMultiPortion is not a simple portion,
@@ -1640,7 +1639,7 @@ bool SwTextFormatter::BuildMultiPortion( SwTextFormatInfo
&rInf,
}
SeekAndChg( rInf );
- boost::scoped_ptr<SwFontSave> xFontSave;
+ std::unique_ptr<SwFontSave> xFontSave;
if( rMulti.IsDouble() )
{
SwFont* pTmpFnt = new SwFont( *rInf.GetFont() );
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 522e1c2..67db783 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -33,7 +33,7 @@
#include "txtfrm.hxx"
#include <numrule.hxx>
#include <porfld.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
/**
* #i24363# tab stops relative to indent
@@ -336,7 +336,7 @@ bool SwTabPortion::PreFormat( SwTextFormatInfo &rInf )
// #i89179#
// tab portion representing the list tab of a list label gets the
// same font as the corresponding number portion
- boost::scoped_ptr< SwFontSave > pSave( 0 );
+ std::unique_ptr< SwFontSave > pSave;
if ( GetLen() == 0 &&
rInf.GetLast() && rInf.GetLast()->InNumberGrp() &&
static_cast<SwNumberPortion*>(rInf.GetLast())->HasFont() )
@@ -519,7 +519,7 @@ void SwTabPortion::Paint( const SwTextPaintInfo &rInf )
const
// #i89179#
// tab portion representing the list tab of a list label gets the
// same font as the corresponding number portion
- boost::scoped_ptr< SwFontSave > pSave( 0 );
+ std::unique_ptr< SwFontSave > pSave;
bool bAfterNumbering = false;
if ( GetLen() == 0 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
