diff options
Diffstat (limited to 'editeng/source')
-rw-r--r-- | editeng/source/editeng/editdoc.hxx | 6 | ||||
-rw-r--r-- | editeng/source/editeng/editobj2.hxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 | ||||
-rw-r--r-- | editeng/source/misc/splwrap.cxx | 8 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 4 |
5 files changed, 13 insertions, 15 deletions
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 38065faf968f..f712abd8d309 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -31,12 +31,12 @@ #include <svl/languageoptions.hxx> #include <tools/lineend.hxx> -#include <vector> #include <deque> +#include <memory> +#include <vector> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> class ImpEditEngine; class SvxTabStop; @@ -242,7 +242,7 @@ private: OUString maString; ContentAttribs aContentAttribs; CharAttribList aCharAttribList; - boost::scoped_ptr<WrongList> mpWrongList; + std::unique_ptr<WrongList> mpWrongList; void UnExpandPosition( sal_Int32 &rStartPos, bool bBiasStart ); diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index dc4d677f0d40..2d59974db893 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -30,7 +30,7 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/noncopyable.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> namespace editeng { @@ -136,7 +136,7 @@ private: XEditAttributesType aAttribs; SfxStyleFamily eFamily; SfxItemSet aParaAttribs; - boost::scoped_ptr<WrongList> mpWrongs; + std::unique_ptr<WrongList> mpWrongs; ContentInfo( SfxItemPool& rPool ); ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index f158d148273b..264ad00859bb 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -63,10 +63,8 @@ #include <sot/formats.hxx> #include <unicode/ubidi.h> -#include <memory> -#include <boost/scoped_ptr.hpp> - #include <algorithm> +#include <memory> using namespace ::com::sun::star; @@ -2934,7 +2932,7 @@ bool ImpEditEngine::UpdateFields() if (rAttr.Which() == EE_FEATURE_FIELD) { EditCharAttribField& rField = static_cast<EditCharAttribField&>(rAttr); - boost::scoped_ptr<EditCharAttribField> pCurrent(new EditCharAttribField(rField)); + std::unique_ptr<EditCharAttribField> pCurrent(new EditCharAttribField(rField)); rField.Reset(); if ( aStatus.MarkFields() ) diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 6ddafdf6b09b..62ec29ddb7aa 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -28,8 +28,6 @@ #include <linguistic/lngprops.hxx> #include <com/sun/star/frame/XStorable.hpp> -#include <map> - #include <editeng/svxenum.hxx> #include <editeng/splwrap.hxx> #include <editeng/edtdlg.hxx> @@ -37,7 +35,9 @@ #include <editeng/editrids.hrc> #include <editeng/editids.hrc> #include <editeng/editerr.hxx> -#include <boost/scoped_ptr.hpp> + +#include <map> +#include <memory> #define WAIT_ON() if(pWin != nullptr) { pWin->EnterWait(); } @@ -309,7 +309,7 @@ void SvxSpellWrapper::SpellDocument( ) if (xHyphWord.is()) { EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractHyphenWordDialog> pDlg(pFact->CreateHyphenWordDialog( pWin, + std::unique_ptr<AbstractHyphenWordDialog> pDlg(pFact->CreateHyphenWordDialog( pWin, xHyphWord->getWord(), LanguageTag( xHyphWord->getLocale() ).getLanguageType(), xHyph, this )); diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 8ff68cac078b..c009171a62a2 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -49,7 +49,7 @@ #include "editeng/unonames.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::cppu; using namespace ::com::sun::star; @@ -1937,7 +1937,7 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe if (!bAbsorb) aSel.Start = aSel.End; - boost::scoped_ptr<SvxFieldData> pFieldData(SvxFieldData::Create(xContent)); + std::unique_ptr<SvxFieldData> pFieldData(SvxFieldData::Create(xContent)); if (!pFieldData) throw lang::IllegalArgumentException(); |