diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-17 15:45:17 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-26 00:51:08 +0200 |
| commit | 63536161c82c21d5574fc98e0d374517fbb1205b (patch) | |
| tree | 42c7fc752ff6f885c62c49f8b3bbe0e2df8c05b7 /sw/source/core/unocore/unotext.cxx | |
| parent | c419091a0aff5e2c4ebf3ebfd8f44a365d159d71 (diff) | |
use new unocrsrs in SwXParagraphEnumeration
Change-Id: Ia57a04e617b1d7301d098524ebb55acd1d0e60b3
Diffstat (limited to 'sw/source/core/unocore/unotext.cxx')
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index bd677a25a5de..5b4d7b34ac15 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2564,12 +2564,9 @@ throw (uno::RuntimeException, std::exception) SwNode& rNode = GetDoc()->GetNodes().GetEndOfContent(); SwPosition aPos(rNode); - ::std::unique_ptr<SwUnoCrsr> pUnoCursor( - GetDoc()->CreateUnoCrsr(aPos, false)); + auto pUnoCursor(GetDoc()->CreateUnoCrsr2(aPos, false)); pUnoCursor->Move(fnMoveBackward, fnGoDoc); - const uno::Reference< container::XEnumeration > xRet - = new SwXParagraphEnumeration(this, std::move(pUnoCursor), CURSOR_BODY); - return xRet; + return new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_BODY); } uno::Type SAL_CALL @@ -2829,13 +2826,10 @@ throw (uno::RuntimeException, std::exception) const SwFormatContent& rFlyContent = rHeadFootFormat.GetContent(); const SwNode& rNode = rFlyContent.GetContentIdx()->GetNode(); SwPosition aPos(rNode); - ::std::unique_ptr<SwUnoCrsr> pUnoCursor( - GetDoc()->CreateUnoCrsr(aPos, false)); + auto pUnoCursor(GetDoc()->CreateUnoCrsr2(aPos, false)); pUnoCursor->Move(fnMoveForward, fnGoNode); - aRef = new SwXParagraphEnumeration(this, std::move(pUnoCursor), + return new SwXParagraphEnumeration(this, pUnoCursor, (m_pImpl->m_bIsHeader) ? CURSOR_HEADER : CURSOR_FOOTER); - - return aRef; } uno::Type SAL_CALL |