sw/source/core/crsr/findattr.cxx | 2 +-
sw/source/core/crsr/findtxt.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1d7a58dc98faa7c049392fc2aa15728ef8819893
Author: Noel Grandin <n...@peralex.com>
Date: Fri Oct 18 10:48:16 2013 +0200
convert std::unique_ptr to boost::scoped_ptr
I used this during my String->OUString conversion changes, but
apparently it's a C++11ism
Change-Id: Iff727a92d6d0c3e418275d2850ce70cbd2d2546a
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 58a1c7e..006e210 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1129,7 +1129,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove,
const SwPaM* pRegion,
((Ring*)pRegion)->MoveRingTo( &rCursor );
}
- ::std::unique_ptr<OUString> pRepl( (bRegExp) ?
+ boost::scoped_ptr<OUString> pRepl( (bRegExp) ?
ReplaceBackReferences( *pSearchOpt, pCrsr ) : 0 );
rCursor.GetDoc()->ReplaceRange( *pCrsr,
(pRepl.get()) ? *pRepl : pSearchOpt->replaceString,
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 5a349d7..cfc6b7c 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -584,7 +584,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
((Ring*)pRegion)->MoveRingTo( &rCursor );
}
- ::std::unique_ptr<OUString> pRepl( (bRegExp)
+ boost::scoped_ptr<OUString> pRepl( (bRegExp)
? ReplaceBackReferences( rSearchOpt, pCrsr ) : 0 );
rCursor.GetDoc()->ReplaceRange( *pCrsr,
(pRepl.get()) ? *pRepl : rSearchOpt.replaceString,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
