From 25a76ef7910275360ef1e783d4ecd84bf329db86 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Oct 2014 16:15:04 +0200 Subject: sw: std::auto_ptr -> std::unique_ptr Change-Id: I60ac3706b9be335c31039ed0997cb8215808ddaa --- sw/source/core/unocore/unoredline.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sw/source/core/unocore/unoredline.cxx') diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 48f4e17066db..3575381b0b7c 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include + #include #include @@ -157,11 +161,9 @@ uno::Reference SwXRedlineText::createEnumeration(void) SolarMutexGuard aGuard; SwPaM aPam(aNodeIndex); aPam.Move(fnMoveForward, fnGoNode); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pUnoCursor( + ::std::unique_ptr pUnoCursor( GetDoc()->CreateUnoCrsr(*aPam.Start(), false)); - SAL_WNODEPRECATED_DECLARATIONS_POP - return new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE); + return new SwXParagraphEnumeration(this, std::move(pUnoCursor), CURSOR_REDLINE); } uno::Type SwXRedlineText::getElementType( ) throw(uno::RuntimeException, std::exception) @@ -554,11 +556,9 @@ uno::Reference< container::XEnumeration > SwXRedline::createEnumeration(void) t { SwPaM aPam(*pNodeIndex); aPam.Move(fnMoveForward, fnGoNode); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr pUnoCursor( + ::std::unique_ptr pUnoCursor( GetDoc()->CreateUnoCrsr(*aPam.Start(), false)); - SAL_WNODEPRECATED_DECLARATIONS_POP - xRet = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_REDLINE); + xRet = new SwXParagraphEnumeration(this, std::move(pUnoCursor), CURSOR_REDLINE); } return xRet; } -- cgit v1.2.3