diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-18 10:48:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-18 10:48:16 +0200 |
| commit | 1d7a58dc98faa7c049392fc2aa15728ef8819893 (patch) | |
| tree | 9744b39465ad735285849f0678ceb3f20ab28189 /sw | |
| parent | d08ef4d26594f7bd2711615d90796e1613e82f9f (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/crsr/findattr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/crsr/findtxt.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 58a1c7eb6515..006e2106bff8 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 5a349d7b5ccc..cfc6b7cdbf40 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, |