summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/IDocumentExternalData.hxx4
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx6
-rw-r--r--sw/inc/IMark.hxx18
-rw-r--r--sw/inc/flypos.hxx8
-rw-r--r--sw/inc/fmtmeta.hxx11
-rw-r--r--sw/inc/ndgrf.hxx7
-rw-r--r--sw/inc/numrule.hxx2
-rw-r--r--sw/inc/pch/precompiled_msword.hxx1
-rw-r--r--sw/inc/pch/precompiled_sw.hxx2
-rw-r--r--sw/inc/pch/precompiled_swui.hxx1
-rw-r--r--sw/inc/pch/precompiled_vbaswobj.hxx1
-rw-r--r--sw/inc/txtfld.hxx4
-rw-r--r--sw/inc/undobj.hxx4
-rw-r--r--sw/inc/viewsh.hxx4
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx2
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx2
-rw-r--r--sw/source/core/doc/docbasic.cxx6
-rw-r--r--sw/source/core/doc/docbm.cxx31
-rw-r--r--sw/source/core/doc/docdesc.cxx2
-rw-r--r--sw/source/core/doc/docfly.cxx6
-rw-r--r--sw/source/core/doc/docglbl.cxx4
-rw-r--r--sw/source/core/doc/docnew.cxx2
-rw-r--r--sw/source/core/doc/tblcpy.cxx4
-rw-r--r--sw/source/core/docnode/observablethread.cxx6
-rw-r--r--sw/source/core/docnode/retrievedinputstreamdata.cxx4
-rw-r--r--sw/source/core/docnode/threadmanager.cxx2
-rw-r--r--sw/source/core/edit/autofmt.cxx6
-rw-r--r--sw/source/core/edit/eddel.cxx6
-rw-r--r--sw/source/core/frmedt/fecopy.cxx4
-rw-r--r--sw/source/core/inc/MarkManager.hxx2
-rw-r--r--sw/source/core/inc/UndoManager.hxx6
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx1
-rw-r--r--sw/source/core/inc/observablethread.hxx7
-rw-r--r--sw/source/core/inc/retrievedinputstreamdata.hxx9
-rw-r--r--sw/source/core/inc/threadmanager.hxx7
-rw-r--r--sw/source/core/txtnode/atrfld.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx14
-rw-r--r--sw/source/core/undo/docundo.cxx2
-rw-r--r--sw/source/core/undo/untblk.cxx2
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/core/unocore/unoportenum.cxx10
-rw-r--r--sw/source/core/unocore/unorefmk.cxx6
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx1
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx1
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx1
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx1
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx1
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx1
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx8
-rw-r--r--sw/source/ui/envelp/envfmt.cxx3
-rw-r--r--sw/source/ui/envelp/envprt.cxx1
-rw-r--r--sw/source/ui/envelp/labfmt.cxx1
-rw-r--r--sw/source/ui/envelp/labprt.cxx1
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx4
-rw-r--r--sw/source/ui/fldui/fldedt.cxx4
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx6
-rw-r--r--sw/source/ui/index/cnttab.cxx1
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx1
-rw-r--r--sw/source/ui/misc/docfnote.cxx6
-rw-r--r--sw/source/ui/misc/glossary.cxx6
-rw-r--r--sw/source/ui/misc/insfnote.cxx4
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx4
-rw-r--r--sw/source/ui/misc/srtdlg.cxx4
-rw-r--r--sw/source/ui/table/convert.cxx4
-rw-r--r--sw/source/ui/table/instable.cxx4
-rw-r--r--sw/source/ui/table/tautofmt.cxx1
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx14
-rw-r--r--sw/source/uibase/app/appenv.cxx4
-rw-r--r--sw/source/uibase/app/applab.cxx8
-rw-r--r--sw/source/uibase/app/docsh2.cxx10
-rw-r--r--sw/source/uibase/app/docshini.cxx4
-rw-r--r--sw/source/uibase/app/swdllimpl.hxx4
-rw-r--r--sw/source/uibase/app/swmodul1.cxx4
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx10
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx10
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx8
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx25
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx6
-rw-r--r--sw/source/uibase/docvw/DashedLine.cxx4
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx6
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx3
-rw-r--r--sw/source/uibase/lingu/hyp.cxx4
-rw-r--r--sw/source/uibase/misc/glosdoc.cxx6
-rw-r--r--sw/source/uibase/misc/glshell.cxx4
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx4
-rw-r--r--sw/source/uibase/shells/annotsh.cxx10
-rw-r--r--sw/source/uibase/shells/basesh.cxx22
-rw-r--r--sw/source/uibase/shells/drawdlg.cxx8
-rw-r--r--sw/source/uibase/shells/drawsh.cxx1
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx10
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx6
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx6
-rw-r--r--sw/source/uibase/shells/frmsh.cxx8
-rw-r--r--sw/source/uibase/shells/grfsh.cxx4
-rw-r--r--sw/source/uibase/shells/langhelper.cxx4
-rw-r--r--sw/source/uibase/shells/mediash.cxx6
-rw-r--r--sw/source/uibase/shells/tabsh.cxx20
-rw-r--r--sw/source/uibase/shells/textfld.cxx10
-rw-r--r--sw/source/uibase/shells/textidx.cxx10
-rw-r--r--sw/source/uibase/shells/textsh1.cxx18
-rw-r--r--sw/source/uibase/shells/textsh2.cxx4
-rw-r--r--sw/source/uibase/shells/txtattr.cxx4
-rw-r--r--sw/source/uibase/shells/txtnum.cxx4
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.hxx13
-rw-r--r--sw/source/uibase/sidebar/WrapPropertyPanel.hxx1
-rw-r--r--sw/source/uibase/table/tablemgr.cxx4
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/view0.cxx8
-rw-r--r--sw/source/uibase/uiview/view2.cxx12
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx6
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx4
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx6
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx28
-rw-r--r--sw/source/uibase/uno/unomailmerge.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx4
-rw-r--r--sw/source/uibase/utlui/content.cxx4
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx16
-rw-r--r--sw/source/uibase/utlui/navipi.cxx6
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx4
127 files changed, 353 insertions, 393 deletions
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index 6f985f6bc4f0..7ed3dfafb279 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
#define INCLUDED_SW_INC_IDOCUMENTEXTERNALDATA_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <unordered_map>
namespace sw
@@ -39,7 +39,7 @@ public:
virtual ~ExternalData() {}
};
-typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer;
+typedef std::shared_ptr<ExternalData> tExternalDataPointer;
}
class IDocumentExternalData
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 7de0f2ffd5ae..4d8f984eff54 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <IMark.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SwPaM;
struct SwPosition;
@@ -50,7 +50,7 @@ class IDocumentMarkAccess
NAVIGATOR_REMINDER
};
- typedef ::boost::shared_ptr< ::sw::mark::IMark> pMark_t;
+ typedef std::shared_ptr< ::sw::mark::IMark> pMark_t;
typedef ::std::vector< pMark_t > container_t;
typedef container_t::iterator iterator_t;
typedef container_t::const_iterator const_iterator_t;
@@ -179,7 +179,7 @@ class IDocumentMarkAccess
@param ppMark
[in] an iterator pointing to the Mark to be deleted.
*/
- virtual ::boost::shared_ptr<ILazyDeleter>
+ virtual std::shared_ptr<ILazyDeleter>
deleteMark(const IDocumentMarkAccess::const_iterator_t& ppMark) =0;
/** Deletes a mark.
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 56850f8601c8..b72ec6c365ea 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -23,8 +23,8 @@
#include <calbck.hxx>
#include <pam.hxx>
#include <boost/operators.hpp>
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
#include <swdllapi.h>
struct SwPosition;
@@ -133,18 +133,18 @@ namespace sw { namespace mark
struct CompareIMarkStartsAfter
{
bool operator()(SwPosition const& rPos,
- boost::shared_ptr<sw::mark::IMark> const& pMark)
+ std::shared_ptr<sw::mark::IMark> const& pMark)
{
return pMark->StartsAfter(rPos);
}
#ifdef DBG_UTIL
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark,
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
SwPosition const& rPos)
{
return pMark->StartsBefore(rPos);
}
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark1,
- boost::shared_ptr<sw::mark::IMark> const& pMark2)
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
+ std::shared_ptr<sw::mark::IMark> const& pMark2)
{
return (*pMark1) < (*pMark2);
}
@@ -155,19 +155,19 @@ namespace sw { namespace mark
// so it needs 3 overloads...
struct CompareIMarkStartsBefore
{
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark,
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
SwPosition const& rPos)
{
return pMark->StartsBefore(rPos);
}
#ifdef DBG_UTIL
bool operator()(SwPosition const& rPos,
- boost::shared_ptr<sw::mark::IMark> const& pMark)
+ std::shared_ptr<sw::mark::IMark> const& pMark)
{
return pMark->StartsAfter(rPos);
}
- bool operator()(boost::shared_ptr<sw::mark::IMark> const& pMark1,
- boost::shared_ptr<sw::mark::IMark> const& pMark2)
+ bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
+ std::shared_ptr<sw::mark::IMark> const& pMark2)
{
return (*pMark1) < (*pMark2);
}
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index 0a912d06ce2f..a92552445691 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_INC_FLYPOS_HXX
#include <swdllapi.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <set>
class SwFrameFormat;
@@ -45,10 +45,10 @@ public:
// SwPosFlyFrms can be handled by value (as return value), only refcounts to
// contained SwPosFlyFrm* will be copied. When releasing the last SwPosFlyFrmPtr
// instance the allocated instance will be freed. The array is sorted by
-// GetNdIndex by using a ::std::set container.
-typedef ::boost::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
+// GetNdIndex by using a std::set container.
+typedef std::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; };
-typedef ::std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
+typedef std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
#endif // INCLUDED_SW_INC_FLYPOS_HXX
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index ac4747a7b5ff..1ce349367e5c 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -26,9 +26,8 @@
#include <sfx2/Metadatable.hxx>
#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include <vector>
namespace com { namespace sun { namespace star {
@@ -91,7 +90,7 @@ private:
friend class SwTextMeta; ///< needs SetTextAttr, DoCopy
friend class ::sw::Meta; ///< needs m_pTextAttr
- ::boost::shared_ptr< ::sw::Meta > m_pMeta;
+ std::shared_ptr< ::sw::Meta > m_pMeta;
SwTextMeta * m_pTextAttr;
SwTextMeta * GetTextAttr() { return m_pTextAttr; }
@@ -105,7 +104,7 @@ private:
public:
/// takes ownership
- explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+ explicit SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta,
const sal_uInt16 i_nWhich );
virtual ~SwFormatMeta();
@@ -198,12 +197,12 @@ class MetaFieldManager
: private ::boost::noncopyable
{
private:
- typedef ::std::vector< ::boost::weak_ptr<MetaField> > MetaFieldList_t;
+ typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t;
MetaFieldList_t m_MetaFields;
public:
MetaFieldManager();
- ::boost::shared_ptr<MetaField> makeMetaField(
+ std::shared_ptr<MetaField> makeMetaField(
SwFormatMeta * const i_pFormat = 0,
const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
const bool bIsFixedLanguage = false );
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 65da31e73a87..bef476592e34 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -23,8 +23,7 @@
#include <svtools/grfmgr.hxx>
#include <ndnotxt.hxx>
#include <com/sun/star/embed/XStorage.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
class SwAsyncRetrieveInputStreamThreadConsumer;
class SwGrfFormatColl;
@@ -49,7 +48,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
- boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
+ std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
bool mbLinkedInputStreamReady;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
bool mbIsStreamReadOnly;
@@ -193,7 +192,7 @@ public:
/// Returns the with our graphic attributes filled Graphic-Attr-Structure.
GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
- boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
+ std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;}
void TriggerAsyncRetrieveInputStream();
void ApplyInputStream(
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 79aa6fe3711f..ad2283d08aa6 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -141,7 +141,7 @@ private:
const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode;
OUString msDefaultListId;
- boost::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
+ std::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
public:
/// add parameter <eDefaultNumberFormatPositionAndSpaceMode>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 935cb971dd3b..861b4b214692 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -20,7 +20,6 @@
#include <basic/basmgr.hxx>
#include <boost/noncopyable.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 0ace20ad75fb..245458c34aec 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -48,8 +48,6 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/optional.hpp>
#include <memory>
-#include <boost/scoped_ptr.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
#include <cassert>
#include <cctype>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 8ee8cc4820ea..b16d1ef82243 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -18,7 +18,6 @@
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index fbdfc6f31e42..15c2d2c98f42 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -15,7 +15,6 @@
*/
#include <basic/sbuno.hxx>
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index d4189ed6f8cd..92a6d7cb2b39 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -23,7 +23,7 @@
#include <rtl/ustring.hxx>
#include <osl/diagnose.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class SwPaM;
class SwTextNode;
@@ -70,7 +70,7 @@ public:
// return text selection for the given field
static void GetPamForTextField( const SwTextField& rTextField,
- boost::shared_ptr< SwPaM >& rPamForTextField );
+ std::shared_ptr< SwPaM >& rPamForTextField );
};
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 34cea59ecfc0..400d1d7a6040 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -22,8 +22,6 @@
#include <vector>
#include <memory>
-#include <boost/shared_ptr.hpp>
-
#include <svl/undo.hxx>
#include <SwRewriter.hxx>
@@ -223,7 +221,7 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
{
SwTextFormatColl *pTextFormatColl, *pLastNdColl;
std::vector<SwFrameFormat*>* pFrameFormats;
- ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
+ ::std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
SwRedlineData* pRedlData;
bool bSttWasTextNd;
protected:
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 2ae2a2b19a94..1c4d944ff193 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -26,7 +26,7 @@
#include <swtypes.hxx>
#include <ring.hxx>
#include <swrect.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <stack>
#include <vcl/mapmod.hxx>
#include <vcl/print.hxx>
@@ -90,7 +90,7 @@ namespace vcl
// Currently the Preview flag is needed for DrawPage.
#define VSHELLFLAG_ISPREVIEW ((long)0x1)
#define VSHELLFLAG_SHARELAYOUT ((long)0x2)
-typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr;
+typedef std::shared_ptr<SwRootFrm> SwRootFrmPtr;
class SwViewShell;
class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index adf21ba7177b..c404e462508b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -668,7 +668,7 @@ protected:
// Read the XML stream we're interested in.
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), url);
uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(rStreamName), uno::UNO_QUERY);
- boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+ std::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
xmlDocPtr pXmlDoc = parseXmlStream(pStream.get());
pXmlDoc->name = reinterpret_cast<char *>(xmlStrdup(reinterpret_cast<xmlChar const *>(OUStringToOString(maTempFile.GetURL(), RTL_TEXTENCODING_UTF8).getStr())));
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 752343b850ba..d9c67b958f5b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -440,7 +440,7 @@ void SwUiWriterTest::testExportRTF()
pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, /*bBasicCall=*/false);
// Create the clipboard document.
- boost::shared_ptr<SwDoc> pClpDoc(new SwDoc());
+ std::shared_ptr<SwDoc> pClpDoc(new SwDoc());
pClpDoc->SetClipBoard(true);
pWrtShell->Copy(pClpDoc.get());
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 48c92bb71d9d..f6daa8ebd4a2 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -31,7 +31,7 @@
#include <doc.hxx>
#include <docsh.hxx>
#include <swevent.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
@@ -99,7 +99,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pArgs )
break;
case EXTENDED_STYPE:
{
- boost::scoped_ptr<Sequence<Any> > pUnoArgs;
+ std::unique_ptr<Sequence<Any> > pUnoArgs;
if( pArgs )
{
// better to rename the local function to lcl_translateBasic2Uno and
@@ -212,7 +212,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
}
else if( EXTENDED_STYPE == rMacro.GetScriptType() )
{
- boost::scoped_ptr<Sequence<Any> > pUnoArgs;
+ std::unique_ptr<Sequence<Any> > pUnoArgs;
if( pArgs )
{
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ff66dbf21f6f..916323e0b4e2 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -53,7 +53,6 @@
#include <edimp.hxx>
#include <tools/datetimeutils.hxx>
-using namespace ::boost;
using namespace ::sw::mark;
namespace
@@ -385,31 +384,31 @@ namespace sw { namespace mark
switch(eType)
{
case IDocumentMarkAccess::MarkType::TEXT_FIELDMARK:
- pMark = boost::shared_ptr<IMark>(new TextFieldmark(rPaM));
+ pMark = std::shared_ptr<IMark>(new TextFieldmark(rPaM));
break;
case IDocumentMarkAccess::MarkType::CHECKBOX_FIELDMARK:
- pMark = boost::shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
+ pMark = std::shared_ptr<IMark>(new CheckboxFieldmark(rPaM));
break;
case IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER:
- pMark = boost::shared_ptr<IMark>(new NavigatorReminder(rPaM));
+ pMark = std::shared_ptr<IMark>(new NavigatorReminder(rPaM));
break;
case IDocumentMarkAccess::MarkType::BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::MarkType::DDE_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new DdeBookmark(rPaM));
+ pMark = std::shared_ptr<IMark>(new DdeBookmark(rPaM));
break;
case IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::MarkType::CROSSREF_NUMITEM_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
+ pMark = std::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
break;
case IDocumentMarkAccess::MarkType::UNO_BOOKMARK:
- pMark = boost::shared_ptr<IMark>(new UnoMark(rPaM));
+ pMark = std::shared_ptr<IMark>(new UnoMark(rPaM));
break;
case IDocumentMarkAccess::MarkType::ANNOTATIONMARK:
- pMark = boost::shared_ptr<IMark>(new AnnotationMark( rPaM, rName ));
+ pMark = std::shared_ptr<IMark>(new AnnotationMark( rPaM, rName ));
break;
}
assert(pMark.get() &&
@@ -801,7 +800,7 @@ namespace sw { namespace mark
// fdo#61016 delay the deletion of the fieldmark characters
// to prevent that from deleting the marks on that position
// which would invalidate the iterators in vMarksToDelete
- std::vector< ::boost::shared_ptr<ILazyDeleter> > vDelay;
+ std::vector< std::shared_ptr<ILazyDeleter> > vDelay;
vDelay.reserve(vMarksToDelete.size());
// If needed, sort mark containers containing subsets of the marks
@@ -837,10 +836,10 @@ namespace sw { namespace mark
struct LazyFieldmarkDeleter : public IDocumentMarkAccess::ILazyDeleter
{
- ::boost::shared_ptr<IMark> const m_pFieldmark;
+ std::shared_ptr<IMark> const m_pFieldmark;
SwDoc *const m_pDoc;
LazyFieldmarkDeleter(
- ::boost::shared_ptr<IMark> const& pMark, SwDoc *const pDoc)
+ std::shared_ptr<IMark> const& pMark, SwDoc *const pDoc)
: m_pFieldmark(pMark), m_pDoc(pDoc)
{ }
virtual ~LazyFieldmarkDeleter()
@@ -852,10 +851,10 @@ namespace sw { namespace mark
}
};
- ::boost::shared_ptr<IDocumentMarkAccess::ILazyDeleter>
+ std::shared_ptr<IDocumentMarkAccess::ILazyDeleter>
MarkManager::deleteMark(const const_iterator_t& ppMark)
{
- ::boost::shared_ptr<ILazyDeleter> ret;
+ std::shared_ptr<ILazyDeleter> ret;
if (ppMark == m_vAllMarks.end()) return ret;
switch(IDocumentMarkAccess::GetType(**ppMark))
@@ -1034,7 +1033,7 @@ namespace sw { namespace mark
for (IDocumentMarkAccess::const_iterator_t aI = m_vFieldmarks.begin(),
aEnd = m_vFieldmarks.end(); aI != aEnd; ++aI)
{
- boost::shared_ptr<IMark> xI = *aI;
+ std::shared_ptr<IMark> xI = *aI;
const SwPosition &rStart = xI->GetMarkPos();
if (!rPaM.ContainsPosition(rStart))
continue;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 420478edb7ea..1463650810e8 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -59,8 +59,6 @@
#include <unotools/configmgr.hxx>
#include <unotools/syslocale.hxx>
-#include <boost/scoped_ptr.hpp>
-
using namespace com::sun::star;
static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId,
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 0a89b4f93fde..380dbfcd666e 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -60,7 +60,7 @@
#include <dflyobj.hxx>
#include <undoflystrattr.hxx>
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//UUUU
#include <svx/xbtmpit.hxx>
@@ -509,7 +509,7 @@ bool SwDoc::SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet )
if( !rSet.Count() )
return false;
- boost::scoped_ptr<SwUndoFormatAttrHelper> pSaveUndo;
+ std::unique_ptr<SwUndoFormatAttrHelper> pSaveUndo;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -726,7 +726,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
// anchored object the complete <SwPosition> is kept, because the
// anchor index position could be moved, if the object again is
// anchored as character.
- boost::scoped_ptr<const SwPosition> xOldAsCharAnchorPos;
+ std::unique_ptr<const SwPosition> xOldAsCharAnchorPos;
const RndStdIds eOldAnchorType = pContact->GetAnchorId();
if ( !_bSameOnly && eOldAnchorType == FLY_AS_CHAR )
{
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index b6991e44ad30..a16d4d056694 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -47,7 +47,7 @@
#include <doctxm.hxx>
#include <poolfmt.hxx>
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
@@ -162,7 +162,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
sal_uInt16 nOutl = 0;
SwOutlineNodes* pOutlNds = const_cast<SwOutlineNodes*>(&GetNodes().GetOutLineNds());
- boost::scoped_ptr<SwOutlineNodes> xTmpOutlNds;
+ std::unique_ptr<SwOutlineNodes> xTmpOutlNds;
SwNodePtr pStartNd;
if ( !bOutline) {
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index af5bd1f35f07..d65ef4a2b97e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -209,7 +209,7 @@ SwDoc::SwDoc()
m_pDocumentRedlineManager( new ::sw::DocumentRedlineManager( *this ) ),
m_pDocumentStateManager( new ::sw::DocumentStateManager( *this ) ),
m_pUndoManager(new ::sw::UndoManager(
- boost::shared_ptr<SwNodes>(new SwNodes(this)), *m_pDocumentDrawModelManager, *m_pDocumentRedlineManager, *m_pDocumentStateManager)),
+ std::shared_ptr<SwNodes>(new SwNodes(this)), *m_pDocumentDrawModelManager, *m_pDocumentRedlineManager, *m_pDocumentStateManager)),
m_pDocumentSettingManager(new ::sw::DocumentSettingManager(*this)),
m_pDocumentChartDataProviderManager( new sw::DocumentChartDataProviderManager( *this ) ),
m_pDeviceAccess( new ::sw::DocumentDeviceManager( *this ) ),
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 08fd897109fc..3d3b1103bf7a 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -45,7 +45,7 @@
#include <redline.hxx>
#include <fmtfsize.hxx>
#include <list>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
SwTable& rDstTable, SwTableBox* pDstBox,
@@ -517,7 +517,7 @@ static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox,
// First copy the new content and then delete the old one.
// Do not create empty Sections, otherwise they will be deleted!
- boost::scoped_ptr< SwNodeRange > pRg( pCpyBox ?
+ std::unique_ptr< SwNodeRange > pRg( pCpyBox ?
new SwNodeRange ( *pCpyBox->GetSttNd(), 1,
*pCpyBox->GetSttNd()->EndOfSectionNode() ) : 0 );
diff --git a/sw/source/core/docnode/observablethread.cxx b/sw/source/core/docnode/observablethread.cxx
index b509f67460be..dbc72dfd3d5e 100644
--- a/sw/source/core/docnode/observablethread.cxx
+++ b/sw/source/core/docnode/observablethread.cxx
@@ -18,7 +18,7 @@
*/
#include <observablethread.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* class for an observable thread
@@ -34,7 +34,7 @@ ObservableThread::~ObservableThread()
{
}
-void ObservableThread::SetListener( boost::weak_ptr< IFinishedThreadListener > pThreadListener,
+void ObservableThread::SetListener( std::weak_ptr< IFinishedThreadListener > pThreadListener,
const oslInterlockedCount nThreadID )
{
mpThreadListener = pThreadListener;
@@ -51,7 +51,7 @@ void SAL_CALL ObservableThread::run()
void SAL_CALL ObservableThread::onTerminated()
{
// notify observer
- boost::shared_ptr< IFinishedThreadListener > pThreadListener = mpThreadListener.lock();
+ std::shared_ptr< IFinishedThreadListener > pThreadListener = mpThreadListener.lock();
if ( pThreadListener )
{
pThreadListener->NotifyAboutFinishedThread( mnThreadID );
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 1bbba464d1f9..4631ef8866a1 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -39,7 +39,7 @@ SwRetrievedInputStreamDataManager& SwRetrievedInputStreamDataManager::GetManager
}
SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::ReserveData(
- boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
+ std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
{
osl::MutexGuard aGuard(maMutex);
@@ -139,7 +139,7 @@ IMPL_LINK_TYPED( SwRetrievedInputStreamDataManager,
SwRetrievedInputStreamDataManager::tData aInputStreamData;
if ( rDataManager.PopData( *pDataKey, aInputStreamData ) )
{
- boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer =
+ std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer =
aInputStreamData.mpThreadConsumer.lock();
if ( pThreadConsumer )
{
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index daa12c3cbeb8..786dd763b9f3 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -56,7 +56,7 @@ ThreadManager::~ThreadManager()
maStartedThreads.clear();
}
-boost::weak_ptr< IFinishedThreadListener > ThreadManager::GetThreadListenerWeakRef()
+std::weak_ptr< IFinishedThreadListener > ThreadManager::GetThreadListenerWeakRef()
{
return mpThreadListener;
}
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 8f5c30892665..2371e0dccbb4 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -67,7 +67,7 @@
#include <comcore.hrc>
#include <numrule.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -100,7 +100,7 @@ class SwAutoFormat
SwTextNode* m_pCurTextNd; // the current TextNode
SwTextFrm* m_pCurTextFrm; // frame of the current TextNode
sal_uLong m_nEndNdIdx; // for the percentage-display
- mutable boost::scoped_ptr<CharClass> m_pCharClass; // Character classification
+ mutable std::unique_ptr<CharClass> m_pCharClass; // Character classification
mutable LanguageType m_eCharClassLang;
sal_uInt16 m_nLastHeadLvl, m_nLastCalcHeadLvl;
@@ -2515,7 +2515,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags& rFlags,
void SwEditShell::AutoFormat( const SvxSwAutoFormatFlags* pAFlags )
{
- boost::scoped_ptr<SwWait> pWait;
+ std::unique_ptr<SwWait> pWait;
SET_CURR_SHELL( this );
StartAllAction();
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 04c68f5e0447..e0d4eadcfb07 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -152,12 +152,12 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
SET_CURR_SHELL( pDestShell );
// List of insert positions for smart insert of block selections
- std::list< boost::shared_ptr<SwPosition> > aInsertList;
+ std::list< std::shared_ptr<SwPosition> > aInsertList;
// Fill list of insert positions
{
SwPosition * pPos = 0;
- boost::shared_ptr<SwPosition> pInsertPos;
+ std::shared_ptr<SwPosition> pInsertPos;
sal_uInt16 nMove = 0;
for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
{
@@ -204,7 +204,7 @@ bool SwEditShell::Copy( SwEditShell* pDestShell )
SwNodeIndex aSttNdIdx( pDestShell->GetDoc()->GetNodes() );
sal_Int32 nSttCntIdx = 0;
// For block selection this list is filled with the insert positions
- std::list< boost::shared_ptr<SwPosition> >::iterator pNextInsert = aInsertList.begin();
+ std::list< std::shared_ptr<SwPosition> >::iterator pNextInsert = aInsertList.begin();
pDestShell->GetDoc()->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
for(SwPaM& rPaM : GetCrsr()->GetRingContainer())
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 01b6506caf71..da98b59e6aae 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -664,8 +664,8 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
// Paste for the interal clipboard. Copy the content of the clipboard
// in the document
namespace {
- typedef boost::shared_ptr<SwPaM> PaMPtr;
- typedef boost::shared_ptr<SwPosition> PositionPtr;
+ typedef std::shared_ptr<SwPaM> PaMPtr;
+ typedef std::shared_ptr<SwPosition> PositionPtr;
typedef std::pair< PaMPtr, PositionPtr > Insertion;
bool PamHasSelection(const SwPaM& rPaM)
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 40ad99712a03..e3484a2995c7 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -59,7 +59,7 @@ namespace sw {
virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) SAL_OVERRIDE;
// deleters
- virtual ::boost::shared_ptr<ILazyDeleter>
+ virtual std::shared_ptr<ILazyDeleter>
deleteMark(const const_iterator_t& ppMark) SAL_OVERRIDE;
virtual void deleteMark(const ::sw::mark::IMark* const pMark) SAL_OVERRIDE;
virtual void clearAllMarks() SAL_OVERRIDE;
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index 087d81eb4219..f025789ff36b 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
#include <IDocumentUndoRedo.hxx>
-#include <boost/shared_ptr.hpp>
#include <svx/sdrundomanager.hxx>
#include <ndarr.hxx>
+#include <memory>
class IDocumentDrawModelAccess;
class IDocumentRedlineAccess;
@@ -36,7 +36,7 @@ class UndoManager
, public SdrUndoManager
{
public:
- UndoManager(boost::shared_ptr<SwNodes> pUndoNodes,
+ UndoManager(std::shared_ptr<SwNodes> pUndoNodes,
IDocumentDrawModelAccess & rDrawModelAccess,
IDocumentRedlineAccess & rRedlineAccess,
IDocumentState & rState);
@@ -92,7 +92,7 @@ private:
IDocumentState & m_rState;
/// Undo nodes array: content not currently in document
- boost::shared_ptr<SwNodes> m_xUndoNodes;
+ std::shared_ptr<SwNodes> m_xUndoNodes;
bool m_bGroupUndo : 1; // TRUE: Undo grouping enabled
bool m_bDrawUndo : 1; // TRUE: Draw Undo enabled
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 8406fd47c896..eb2a48341426 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -22,7 +22,6 @@
#include <vector>
#include <undobj.hxx>
-#include <boost/shared_ptr.hpp>
#include <rtl/ustring.hxx>
#include <numrule.hxx>
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 45dccf97e9e1..1f41868696ed 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -22,10 +22,9 @@
#include <osl/thread.hxx>
#include <rtl/ref.hxx>
#include <osl/interlck.h>
-
-#include <boost/weak_ptr.hpp>
#include <salhelper/simplereferenceobject.hxx>
#include <ifinishedthreadlistener.hxx>
+#include <memory>
/** class for an observable thread
@@ -44,7 +43,7 @@ class ObservableThread : public osl::Thread,
virtual ~ObservableThread();
- void SetListener( boost::weak_ptr< IFinishedThreadListener > pThreadListener,
+ void SetListener( std::weak_ptr< IFinishedThreadListener > pThreadListener,
const oslInterlockedCount nThreadID );
static inline void * operator new(std::size_t size)
@@ -82,7 +81,7 @@ class ObservableThread : public osl::Thread,
oslInterlockedCount mnThreadID;
- boost::weak_ptr< IFinishedThreadListener > mpThreadListener;
+ std::weak_ptr< IFinishedThreadListener > mpThreadListener;
};
#endif
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index 831df4ee563a..111e2a3247d9 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -27,8 +27,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <map>
-
-#include <boost/weak_ptr.hpp>
+#include <memory>
class SwAsyncRetrieveInputStreamThreadConsumer;
@@ -49,7 +48,7 @@ class SwRetrievedInputStreamDataManager
struct tData
{
- boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
+ std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
bool mbIsStreamReadOnly;
@@ -58,7 +57,7 @@ class SwRetrievedInputStreamDataManager
mbIsStreamReadOnly( false )
{};
- tData( boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
+ tData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer )
: mpThreadConsumer( pThreadConsumer ),
mbIsStreamReadOnly( false )
{};
@@ -66,7 +65,7 @@ class SwRetrievedInputStreamDataManager
static SwRetrievedInputStreamDataManager& GetManager();
- tDataKey ReserveData( boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer );
+ tDataKey ReserveData( std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > pThreadConsumer );
void PushData( const tDataKey nDataKey,
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 006190ec04b6..67e4dc4441b5 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -33,8 +33,7 @@
#include <cancellablejob.hxx>
#include <threadlistener.hxx>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include <ifinishedthreadlistener.hxx>
@@ -52,7 +51,7 @@ class ThreadManager
explicit ThreadManager( ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager >& rThreadJoiner );
virtual ~ThreadManager();
- boost::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
+ std::weak_ptr< IFinishedThreadListener > GetThreadListenerWeakRef();
void NotifyAboutFinishedThread( const oslInterlockedCount nThreadID );
/** initialization
@@ -117,7 +116,7 @@ class ThreadManager
::com::sun::star::uno::WeakReference< ::com::sun::star::util::XJobManager > mrThreadJoiner;
- boost::shared_ptr< ThreadListener > mpThreadListener;
+ std::shared_ptr< ThreadListener > mpThreadListener;
oslInterlockedCount mnThreadIDCounter;
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 4445da495c54..7ec67802ab31 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -473,7 +473,7 @@ void SwTextField::NotifyContentChange(SwFormatField& rFormatField)
/*static*/
void SwTextField::GetPamForTextField(
const SwTextField& rTextField,
- boost::shared_ptr< SwPaM >& rPamForTextField )
+ std::shared_ptr< SwPaM >& rPamForTextField )
{
if (rTextField.GetpTextNode() == NULL)
{
@@ -495,7 +495,7 @@ void SwTextField::DeleteTextField( const SwTextField& rTextField )
{
if (rTextField.GetpTextNode() != NULL)
{
- boost::shared_ptr< SwPaM > pPamForTextField;
+ std::shared_ptr< SwPaM > pPamForTextField;
GetPamForTextField(rTextField, pPamForTextField);
if (pPamForTextField.get() != NULL)
{
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 9bdc06a39d56..26d212917b68 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -531,7 +531,7 @@ SwFormatMeta::SwFormatMeta(const sal_uInt16 i_nWhich)
"ERROR: SwFormatMeta: invalid which id!");
}
-SwFormatMeta::SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+SwFormatMeta::SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta,
const sal_uInt16 i_nWhich )
: SfxPoolItem( i_nWhich )
, m_pMeta( i_pMeta )
@@ -608,7 +608,7 @@ void SwFormatMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
OSL_ENSURE(m_pMeta, "DoCopy called for SwFormatMeta with no sw::Meta?");
if (m_pMeta)
{
- const ::boost::shared_ptr< ::sw::Meta> pOriginal( m_pMeta );
+ const std::shared_ptr< ::sw::Meta> pOriginal( m_pMeta );
if (RES_TXTATR_META == Which())
{
m_pMeta.reset( new ::sw::Meta(this) );
@@ -778,11 +778,11 @@ MetaFieldManager::MetaFieldManager()
{
}
-::boost::shared_ptr<MetaField>
+std::shared_ptr<MetaField>
MetaFieldManager::makeMetaField(SwFormatMeta * const i_pFormat,
const sal_uInt32 nNumberFormat, const bool bIsFixedLanguage)
{
- const ::boost::shared_ptr<MetaField> pMetaField(
+ const std::shared_ptr<MetaField> pMetaField(
new MetaField(i_pFormat, nNumberFormat, bIsFixedLanguage) );
m_MetaFields.push_back(pMetaField);
return pMetaField;
@@ -790,7 +790,7 @@ MetaFieldManager::makeMetaField(SwFormatMeta * const i_pFormat,
struct IsInUndo
{
- bool operator()(::boost::weak_ptr<MetaField> const & pMetaField) {
+ bool operator()(std::weak_ptr<MetaField> const & pMetaField) {
return pMetaField.lock()->IsInUndo();
}
};
@@ -798,7 +798,7 @@ struct IsInUndo
struct MakeUnoObject
{
uno::Reference<text::XTextField>
- operator()(::boost::weak_ptr<MetaField> const & pMetaField) {
+ operator()(std::weak_ptr<MetaField> const & pMetaField) {
return uno::Reference<text::XTextField>(
pMetaField.lock()->MakeUnoObject(), uno::UNO_QUERY);
}
@@ -810,7 +810,7 @@ MetaFieldManager::getMetaFields()
// erase deleted fields
const MetaFieldList_t::iterator iter(
::std::remove_if(m_MetaFields.begin(), m_MetaFields.end(),
- [] (::boost::weak_ptr<MetaField> const& rField) { return rField.expired(); }));
+ [] (std::weak_ptr<MetaField> const& rField) { return rField.expired(); }));
m_MetaFields.erase(iter, m_MetaFields.end());
// filter out fields in UNDO
MetaFieldList_t filtered(m_MetaFields.size());
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 654576a43ec6..8c54261c18d9 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
namespace sw {
-UndoManager::UndoManager(boost::shared_ptr<SwNodes> xUndoNodes,
+UndoManager::UndoManager(std::shared_ptr<SwNodes> xUndoNodes,
IDocumentDrawModelAccess & rDrawModelAccess,
IDocumentRedlineAccess & rRedlineAccess,
IDocumentState & rState)
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index b527d80ab062..1e2505567dff 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -118,7 +118,7 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, bool bScanFlys,
if( !pFrameFormats ||
pFrameFormats->end() == ( it = std::find( pFrameFormats->begin(), pFrameFormats->end(), pFormat ) ) )
{
- ::boost::shared_ptr<SwUndoInsLayFormat> const pFlyUndo(
+ std::shared_ptr<SwUndoInsLayFormat> const pFlyUndo(
new SwUndoInsLayFormat(pFormat, 0, 0));
m_FlyUndos.push_back(pFlyUndo);
}
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 5c295441d4ce..144a3704dfd7 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2070,7 +2070,7 @@ SwXTextField::getAnchor() throw (uno::RuntimeException, std::exception)
if (!pTextField)
throw uno::RuntimeException();
- boost::shared_ptr< SwPaM > pPamForTextField;
+ std::shared_ptr< SwPaM > pPamForTextField;
SwTextField::GetPamForTextField(*pTextField, pPamForTextField);
if (pPamForTextField.get() == NULL)
return 0;
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 447c02c1f619..c9c4e6e3973c 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -63,9 +63,9 @@
#include <comphelper/string.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <set>
-#include <boost/shared_ptr.hpp>
#include <algorithm>
+#include <memory>
+#include <set>
#include <stack>
using namespace ::com::sun::star;
@@ -107,7 +107,7 @@ namespace
return aPosition.nContent.GetIndex();
}
};
- typedef boost::shared_ptr < SwXBookmarkPortion_Impl > SwXBookmarkPortion_ImplSharedPtr;
+ typedef std::shared_ptr < SwXBookmarkPortion_Impl > SwXBookmarkPortion_ImplSharedPtr;
struct BookmarkCompareStruct
{
bool operator () ( const SwXBookmarkPortion_ImplSharedPtr &r1,
@@ -250,7 +250,7 @@ namespace
return maPosition.nContent.GetIndex();
}
};
- typedef boost::shared_ptr < SwAnnotationStartPortion_Impl > SwAnnotationStartPortion_ImplSharedPtr;
+ typedef std::shared_ptr < SwAnnotationStartPortion_Impl > SwAnnotationStartPortion_ImplSharedPtr;
struct AnnotationStartCompareStruct
{
bool operator () ( const SwAnnotationStartPortion_ImplSharedPtr &r1,
@@ -687,7 +687,7 @@ struct SwXRedlinePortion_Impl
}
};
-typedef boost::shared_ptr < SwXRedlinePortion_Impl >
+typedef std::shared_ptr < SwXRedlinePortion_Impl >
SwXRedlinePortion_ImplSharedPtr;
struct RedlineCompareStruct
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 62f83e5a8caa..af8bdf86ee6d 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1032,9 +1032,9 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
| SetAttrMode::DONTEXPAND)
: SetAttrMode::DONTEXPAND );
- const ::boost::shared_ptr< ::sw::Meta> pMeta( (RES_TXTATR_META == i_nWhich)
- ? ::boost::shared_ptr< ::sw::Meta>( new ::sw::Meta() )
- : ::boost::shared_ptr< ::sw::Meta>(
+ const std::shared_ptr< ::sw::Meta> pMeta( (RES_TXTATR_META == i_nWhich)
+ ? std::shared_ptr< ::sw::Meta>( new ::sw::Meta() )
+ : std::shared_ptr< ::sw::Meta>(
pDoc->GetMetaFieldManager().makeMetaField()) );
SwFormatMeta meta(pMeta, i_nWhich); // this is cloned by Insert!
const bool bSuccess( pDoc->getIDocumentContentOperations().InsertPoolItem( aPam, meta, nInsertFlags ) );
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 3456e45a21a3..d2affa0ceaff 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -61,8 +61,6 @@
#include <helpid.h>
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index ee30e49e9e7d..6501cae53220 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -40,7 +40,6 @@
#include <dbui.hrc>
#include <helpid.h>
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::ui::dialogs;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 9e9c4fef304b..e0821ee696d5 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -33,7 +33,6 @@
#include <svtools/treelistentry.hxx>
#include <vector>
-#include <boost/scoped_ptr.hpp>
#include <globals.hrc>
#include <dbui.hrc>
#include <helpid.h>
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 02188173c99b..c9efadf3c8b6 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star;
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 0193f2de2a1a..0295fd7bb6b4 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -29,8 +29,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <helpid.h>
-#include <boost/scoped_ptr.hpp>
-
using namespace svt;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index b80389cd7774..8068ea7d47d1 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -72,7 +72,6 @@
#include <statstr.hrc>
#include <unomid.h>
#include <comphelper/string.hxx>
-#include <boost/scoped_ptr.hpp>
using namespace svt;
using namespace ::com::sun::star;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index c2f84e933b78..dd458860e03c 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -23,7 +23,6 @@
#include <vcl/msgbox.hxx>
#include <dbui.hrc>
#include <swtypes.hxx>
-#include <boost/scoped_ptr.hpp>
SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent)
: svt::OWizardPage(pParent, "MMOutputTypePage",
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 6ed6e3d6fae7..eb1c3d16c7d7 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -33,7 +33,6 @@
#include <dbui.hrc>
#include <helpid.h>
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::sdbcx;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index e1d8502f0125..48ca34d85095 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -63,7 +63,7 @@
#include <svx/dialogs.hrc>
#include <svx/svxdlg.hxx>
#include <svx/flagsdef.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -780,7 +780,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void)
size_t nNewPos = rDocFormats.GetPos(pFormat);
if ( SIZE_MAX != nNewPos )
{
- boost::scoped_ptr<SfxItemSet> pSet(pFormat->GetAttrSet().Clone( false ));
+ std::unique_ptr<SfxItemSet> pSet(pFormat->GetAttrSet().Clone( false ));
if( pFormat->GetCol() != pRepr->GetCol() )
pSet->Put( pRepr->GetCol() );
@@ -1323,7 +1323,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFile
OUString sFileName, sFilterName, sPassword;
if ( _pFileDlg->GetError() == ERRCODE_NONE )
{
- boost::scoped_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium());
+ std::unique_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium());
if ( pMedium )
{
sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
@@ -1798,7 +1798,7 @@ IMPL_LINK_TYPED( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *,
{
if ( _pFileDlg->GetError() == ERRCODE_NONE )
{
- boost::scoped_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium());
+ std::unique_ptr<SfxMedium> pMedium(m_pDocInserter->CreateMedium());
if ( pMedium )
{
m_sFileName = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE );
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index ed9e52e9d397..b49ce96b1853 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -45,7 +45,6 @@
#include <algorithm>
#include <memory>
-#include <boost/scoped_ptr.hpp>
#include "swabstdlg.hxx"
#include "chrdlg.hrc"
@@ -280,7 +279,7 @@ IMPL_LINK_TYPED( SwEnvFormatPage, EditHdl, MenuButton *, pButton, void )
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
const OUString sFormatStr = pColl->GetName();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFormatStr));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_CHAR_ENV, &sFormatStr));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if (pDlg->Execute() == RET_OK)
{
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 649db1512e4a..9a3d59448c7f 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -27,7 +27,6 @@
#include "uitool.hxx"
#include "envprt.hrc"
-#include <boost/scoped_ptr.hpp>
SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "EnvPrinterPage",
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 12297627e5bb..4d739aba8eb0 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -35,7 +35,6 @@
#include "../../uibase/envelp/label.hrc"
#include "labfmt.hrc"
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
using namespace utl;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index cd4b1404fdc9..7e8907772dd4 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -26,7 +26,6 @@
#include <labimg.hxx>
#include <cmdid.h>
-#include <boost/scoped_ptr.hpp>
SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "LabelOptionsPage",
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 0886666bc541..083b7efe6214 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -25,7 +25,7 @@
#include <flddropdown.hxx>
#include <fldui.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -94,7 +94,7 @@ void sw::DropDownFieldDialog::Apply()
{
rSh.StartAllAction();
- boost::scoped_ptr<SwDropDownField> const pCopy(
+ std::unique_ptr<SwDropDownField> const pCopy(
static_cast<SwDropDownField *>( pDropField->CopyField() ) );
pCopy->SetPar1(sSelect);
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 91c2dcc4b272..4d4131039c62 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -46,7 +46,7 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <swuiexp.hxx>
void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr)
@@ -329,7 +329,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void)
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aSet,
pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(),
RC_DLG_ADDR ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 983d9a0d8059..5f272d4f96a7 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -69,7 +69,7 @@
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <vcl/graphicfilter.hxx>
#include <vcl/builderfactory.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::sfx2;
@@ -2768,7 +2768,7 @@ void SwFrmURLPage::Reset( const SfxItemSet *rSet )
const SfxPoolItem* pItem;
if ( SfxItemState::SET == rSet->GetItemState( SID_DOCFRAME, true, &pItem))
{
- boost::scoped_ptr<TargetList> pList(new TargetList);
+ std::unique_ptr<TargetList> pList(new TargetList);
static_cast<const SfxFrameItem*>(pItem)->GetFrame()->GetTargetList(*pList);
if( !pList->empty() )
{
@@ -2805,7 +2805,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet)
{
bool bModified = false;
const SwFormatURL* pOldURL = static_cast<const SwFormatURL*>(GetOldItem(*rSet, RES_URL));
- boost::scoped_ptr<SwFormatURL> pFormatURL;
+ std::unique_ptr<SwFormatURL> pFormatURL;
if(pOldURL)
pFormatURL.reset(static_cast<SwFormatURL*>(pOldURL->Clone()));
else
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 433cf5cdff94..2f419441c642 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -84,7 +84,6 @@ using namespace ::com::sun::star::uno;
using namespace com::sun::star::ui::dialogs;
using namespace ::sfx2;
#include <svtools/editbrowsebox.hxx>
-#include <boost/scoped_ptr.hpp>
static const sal_Unicode aDeliStart = '['; // for the form
static const sal_Unicode aDeliEnd = ']'; // for the form
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 79603ad3f89e..269731cd1dfb 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -59,7 +59,6 @@
#include <SwRewriter.hxx>
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
#define POS_CONTENT 0
#define POS_INDEX 1
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 56d0beeb8d41..cdea464d6b50 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -36,7 +36,7 @@
#include <misc.hrc>
#include <frmui.hrc>
#include <SwStyleNameMapper.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SwFootNoteOptionDlg::SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rS)
: SfxTabDialog(pParent, "FootEndnoteDialog", "modules/swriter/ui/footendnotedialog.ui")
@@ -145,7 +145,7 @@ void SwEndNoteOptionPage::dispose()
void SwEndNoteOptionPage::Reset( const SfxItemSet* )
{
- boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() )
+ std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo( pSh->GetEndNoteInfo() )
: new SwFootnoteInfo( pSh->GetFootnoteInfo() ));
SfxObjectShell * pDocSh = SfxObjectShell::Current();
@@ -364,7 +364,7 @@ static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFo
bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
{
- boost::scoped_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo());
+ std::unique_ptr<SwEndNoteInfo> pInf(bEndNote ? new SwEndNoteInfo() : new SwFootnoteInfo());
pInf->nFootnoteOffset = static_cast< sal_uInt16 >(m_pOffsetField->GetValue() -1);
pInf->aFormat.SetNumberingType(m_pNumViewBox->GetSelectedNumberingType() );
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index e65f3334beca..6162a97d18be 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -68,7 +68,7 @@
#include <swmodule.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "access.hrc"
@@ -559,7 +559,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool )
const SfxPoolItem* pItem;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet,
+ std::unique_ptr<SfxAbstractDialog> pMacroDlg(pFact->CreateSfxDialog( this, aSet,
pSh->GetView().GetViewFrame()->GetFrame().GetFrameInterface(), SID_EVENTCONFIG ));
if ( pMacroDlg && pMacroDlg->Execute() == RET_OK &&
SfxItemState::SET == pMacroDlg->GetOutputItemSet()->GetItemState( RES_FRMMACRO, false, &pItem ) )
@@ -1035,7 +1035,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- boost::scoped_ptr<AbstractSvxMultiPathDialog> pDlg(pFact->CreateSvxPathSelectDialog(pBtn));
+ std::unique_ptr<AbstractSvxMultiPathDialog> pDlg(pFact->CreateSvxPathSelectDialog(pBtn));
OSL_ENSURE(pDlg, "Dialog creation failed!");
SvtPathOptions aPathOpt;
const OUString sGlosPath( aPathOpt.GetAutoTextPath() );
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 86ccba7b3b26..8d81fbb8fc9f 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -38,7 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/layout.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
static bool bFootnote = true;
@@ -114,7 +114,7 @@ IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void)
aAllSet.Put( rFont );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aAllSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aAllSet,
rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
if (RET_OK == pDlg->Execute())
{
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index a76528e6a576..f2b2a07e186c 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -55,8 +55,6 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <boost/scoped_ptr.hpp>
-
using namespace ::com::sun::star;
class SwNumNamesDlg : public ModalDialog
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index ff28147f2523..d7f627c8d334 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -41,7 +41,7 @@
#include <globals.hrc>
#include <misc.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -157,7 +157,7 @@ VclPtr<SfxTabPage> SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet
void SwFootNotePage::Reset(const SfxItemSet *rSet)
{
// if no example exists, otherwise Init here in Activate
- boost::scoped_ptr<SwPageFootnoteInfo> pDefFootnoteInfo;
+ std::unique_ptr<SwPageFootnoteInfo> pDefFootnoteInfo;
const SwPageFootnoteInfo* pFootnoteInfo;
const SfxPoolItem* pItem = SfxTabPage::GetItem(*rSet, FN_PARAM_FTN_INFO);
if( pItem )
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index a6c7ef7e91d5..49e6978e81d9 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -42,7 +42,7 @@
#include <node.hxx>
#include <tblsel.hxx>
#include <sfx2/request.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
static bool bCheck1 = true;
static bool bCheck2 = false;
@@ -399,7 +399,7 @@ IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void)
{
SfxAllItemSet aSet( rSh.GetAttrPool() );
aSet.Put( SfxInt32Item( SID_ATTR_CHAR, GetDelimChar() ) );
- boost::scoped_ptr<SfxAbstractDialog> pMap(pFact->CreateSfxDialog( m_pDelimPB, aSet,
+ std::unique_ptr<SfxAbstractDialog> pMap(pFact->CreateSfxDialog( m_pDelimPB, aSet,
rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
if( RET_OK == pMap->Execute() )
{
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index e8f166506de4..8c429de2032d 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -34,8 +34,8 @@
#include "app.hrc"
#include "table.hrc"
#include "swabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
#include <swuiexp.hxx>
+#include <memory>
//keep the state of the buttons on runtime
static int nSaveButtonState = -1; // 0: tab, 1: semicolon, 2: paragraph, 3: other, -1: not yet used
@@ -202,7 +202,7 @@ IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void )
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFormat));
+ std::unique_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton, pShell, false, pTAutoFormat));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute())
pDlg->FillAutoFormatOfIndex( pTAutoFormat );
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index ad62d2def1e7..4543d83df4c6 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -32,8 +32,8 @@
#include "table.hrc"
#include "swabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
#include <swuiexp.hxx>
+#include <memory>
#define ROW_COL_PROD 16384
@@ -204,7 +204,7 @@ IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void )
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFormat));
+ std::unique_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(pButton,pShell, false, pTAutoFormat));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute())
pDlg->FillAutoFormatOfIndex( pTAutoFormat );
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index c52ecc24cffa..42e9042c3a39 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -39,7 +39,6 @@
#include "tblafmt.hxx"
#include "tautofmt.hxx"
#include "shellres.hxx"
-#include <boost/scoped_ptr.hpp>
using namespace com::sun::star;
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index f30c724f6c96..ba87cee454f4 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <ooo/vba/word/WdBuiltInProperty.hpp>
#include <ooo/vba/office/MsoDocProperties.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "wordvbahelper.hxx"
#include "fesh.hxx"
#include "docsh.hxx"
@@ -357,9 +357,9 @@ class DocPropInfo
public:
OUString msMSODesc;
OUString msOOOPropName;
- boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
+ std::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
- static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
+ static DocPropInfo createDocPropInfo( const OUString& sDesc, const OUString& sPropName, std::shared_ptr< PropertGetSetHelper >& rHelper )
{
DocPropInfo aItem;
aItem.msMSODesc = sDesc;
@@ -368,7 +368,7 @@ public:
return aItem;
}
- static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
+ static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, std::shared_ptr< PropertGetSetHelper >& rHelper )
{
return createDocPropInfo( OUString::createFromAscii( sDesc ), OUString::createFromAscii( sPropName ), rHelper );
}
@@ -401,8 +401,8 @@ class BuiltInIndexHelper
public:
explicit BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel )
{
- boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) );
- boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) );
+ std::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) );
+ std::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) );
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", aStandardHelper );
m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", aStandardHelper );
@@ -790,7 +790,7 @@ class CustomPropertiesImpl : public PropertiesImpl_BASE
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< frame::XModel > m_xModel;
uno::Reference< beans::XPropertySet > mxUserDefinedProp;
- boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
+ std::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
public:
CustomPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
{
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index cd19bc6ce47c..ef1033097175 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -69,7 +69,7 @@
#include "envimg.hxx"
#include <appenv.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define ENV_NEWDOC RET_OK
#define ENV_INSERT RET_USER
@@ -207,7 +207,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
}
vcl::Window *pParent = pOldSh ? pOldSh->GetWin() : 0;
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pDlg;
short nMode = ENV_INSERT;
SFX_REQUEST_ARG( rReq, pItem, SwEnvItem, FN_ENVELOP, false );
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 0416120047f7..9a2dd2a92655 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -74,8 +74,8 @@
#include <IDocumentDeviceAccess.hxx>
-#include <boost/scoped_ptr.hpp>
#include <appenv.hxx>
+#include <memory>
using namespace ::com::sun::star;
@@ -159,7 +159,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
#if HAVE_FEATURE_DBCONNECTIVITY
// Create DB-Manager
- boost::scoped_ptr<SwDBManager> pDBManager(new SwDBManager(0));
+ std::unique_ptr<SwDBManager> pDBManager(new SwDBManager(0));
#endif
// Read SwLabItem from Config
@@ -172,7 +172,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
SwAbstractDialogFactory* pDialogFactory = SwAbstractDialogFactory::Create();
OSL_ENSURE(pDialogFactory, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(0, aSet,
+ std::unique_ptr<AbstractSwLabDlg> pDlg(pDialogFactory->CreateSwLabDlg(0, aSet,
#if HAVE_FEATURE_DBCONNECTIVITY
pDBManager.get(),
#else
@@ -283,7 +283,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
pSh->ChgPageDesc( 0, aDesc );
// Insert frame
- boost::scoped_ptr<SwFieldMgr> pFieldMgr(new SwFieldMgr);
+ std::unique_ptr<SwFieldMgr> pFieldMgr(new SwFieldMgr);
pFieldMgr->SetEvalExpFields(false);
// Prepare border template
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 110c9cd64404..d6919ebb819a 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -125,7 +125,7 @@
#include <ndtxt.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::lang;
@@ -693,7 +693,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwInsertAbstractDlg> pDlg(pFact->CreateSwInsertAbstractDlg(0));
+ std::unique_ptr<AbstractSwInsertAbstractDlg> pDlg(pFact->CreateSwInsertAbstractDlg(0));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
{
@@ -1077,7 +1077,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
//search for the view that created the call
if(pViewShell->GetObjectShell() == this && pViewShell->GetDispatcher())
{
- boost::scoped_ptr<SfxFrameItem> pFrameItem(new SfxFrameItem( SID_DOCFRAME,
+ std::unique_ptr<SfxFrameItem> pFrameItem(new SfxFrameItem( SID_DOCFRAME,
pViewShell->GetViewFrame() ));
SfxDispatcher* pDispatch = pViewShell->GetDispatcher();
pDispatch->Execute(
@@ -1423,8 +1423,8 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
if ( bImport )
{
SwRead pRead = ReadXML;
- boost::scoped_ptr<SwReader> pReader;
- boost::scoped_ptr<SwPaM> pPam;
+ std::unique_ptr<SwReader> pReader;
+ std::unique_ptr<SwPaM> pPam;
// the SW3IO - Reader need the pam/wrtshell, because only then he
// insert the styles!
if( bUnoCall )
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 1e5bb2d2384a..70f2c0faa973 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -91,7 +91,7 @@
// text grid
#include <tgrditem.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
@@ -181,7 +181,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
{
sal_uInt16 nFontWhich = aFontWhich[i];
sal_uInt16 nFontId = aFontIds[i];
- boost::scoped_ptr<SvxFontItem> pFontItem;
+ std::unique_ptr<SvxFontItem> pFontItem;
const SvxLanguageItem& rLang = static_cast<const SvxLanguageItem&>(m_pDoc->GetDefault( aLangTypes[i] ));
LanguageType eLanguage = rLang.GetLanguage();
if(!pStdFont->IsFontDefault(nFontId))
diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx
index 294156f293dd..06f277ce120c 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -13,7 +13,7 @@
#include <sal/config.h>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { class Filters; }
@@ -30,7 +30,7 @@ public:
sw::Filters & getFilters();
private:
- boost::scoped_ptr< sw::Filters > filters_;
+ std::unique_ptr< sw::Filters > filters_;
};
#endif
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 945c181bdc41..3bfdfa30ba26 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <hintids.hxx>
#include <sfx2/request.hxx>
@@ -182,7 +182,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
bReadonly = pDocSh->IsReadOnly();
else //Use existing option if DocShell missing
bReadonly = pSh->GetViewOptions()->IsReadonly();
- boost::scoped_ptr<SwViewOption> xViewOpt;
+ std::unique_ptr<SwViewOption> xViewOpt;
if (!bViewOnly)
xViewOpt.reset(new SwViewOption(*pPref));
else
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 677ad3f734c9..bfbb0af4a9ff 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -136,7 +136,7 @@
#include <calc.hxx>
#include <dbfld.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <config_cups.h>
#if ENABLE_CUPS && !defined(MACOSX)
#include <vcl/printerinfomanager.hxx>
@@ -552,7 +552,7 @@ void SwDBManager::ImportFromConnection( SwWrtShell* pSh )
if( pSh->HasSelection() )
pSh->DelRight();
- boost::scoped_ptr<SwWait> pWait;
+ std::unique_ptr<SwWait> pWait;
{
sal_uLong i = 0;
@@ -1002,7 +1002,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
SfxObjectShellRef xTargetDocShell;
SwView* pTargetView = 0;
- boost::scoped_ptr< utl::TempFile > aTempFile;
+ std::unique_ptr< utl::TempFile > aTempFile;
bool createTempFile = ( rMergeDescriptor.nMergeType == DBMGR_MERGE_EMAIL || rMergeDescriptor.nMergeType == DBMGR_MERGE_FILE );
OUString sModifiedStartingPageDesc;
OUString sStartingPageDesc;
@@ -1154,7 +1154,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if( !bCancel )
{
- boost::scoped_ptr< INetURLObject > aTempFileURL;
+ std::unique_ptr< INetURLObject > aTempFileURL;
if( createTempFile )
aTempFileURL.reset( new INetURLObject(aTempFile->GetURL()));
if (!IsMergeSilent()) {
@@ -2984,7 +2984,7 @@ void SwDBManager::InsertText(SwWrtShell& rSh,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwInsertDBColAutoPilot> pDlg(pFact->CreateSwInsertDBColAutoPilot( rSh.GetView(),
+ std::unique_ptr<AbstractSwInsertDBColAutoPilot> pDlg(pFact->CreateSwInsertDBColAutoPilot( rSh.GetView(),
xSource,
xColSupp,
aDBData ));
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index a10fb41e268d..de8cc639aafe 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -54,7 +54,7 @@
#include <sfx2/htmlmode.hxx>
#include <svx/dlgutil.hxx>
#include "swabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
{
@@ -83,7 +83,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractInsertSectionTabDialog> aTabDlg(pFact->CreateInsertSectionTabDialog(
+ std::unique_ptr<AbstractInsertSectionTabDialog> aTabDlg(pFact->CreateInsertSectionTabDialog(
&GetView().GetViewFrame()->GetWindow(), aSet , rSh));
OSL_ENSURE(aTabDlg, "Dialog creation failed!");
aTabDlg->Execute();
@@ -177,7 +177,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
IMPL_LINK_TYPED( SwWrtShell, InsertRegionDialog, void*, p, void )
{
SwSectionData* pSect = static_cast<SwSectionData*>(p);
- boost::scoped_ptr<SwSectionData> xSectionData(pSect);
+ std::unique_ptr<SwSectionData> xSectionData(pSect);
if (xSectionData.get())
{
SfxItemSet aSet(GetView().GetPool(),
@@ -194,7 +194,7 @@ IMPL_LINK_TYPED( SwWrtShell, InsertRegionDialog, void*, p, void )
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractInsertSectionTabDialog> aTabDlg(pFact->CreateInsertSectionTabDialog(
+ std::unique_ptr<AbstractInsertSectionTabDialog> aTabDlg(pFact->CreateInsertSectionTabDialog(
&GetView().GetViewFrame()->GetWindow(),aSet , *this));
OSL_ENSURE(aTabDlg, "Dialog creation failed!");
aTabDlg->SetSectionData(*xSectionData);
@@ -219,7 +219,7 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractEditRegionDlg> pEditRegionDlg(pFact->CreateEditRegionDlg(pParentWin, rWrtShell));
+ std::unique_ptr<AbstractEditRegionDlg> pEditRegionDlg(pFact->CreateEditRegionDlg(pParentWin, rWrtShell));
OSL_ENSURE(pEditRegionDlg, "Dialog creation failed!");
if(pItem && pItem->ISA(SfxStringItem))
{
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index b7a293a209bc..d3d541ce61cf 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -58,7 +58,7 @@
#include <misc.hrc>
#include <IDocumentFieldsAccess.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -76,7 +76,7 @@ void SwGlossaryHdl::GlossaryDlg()
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
- boost::scoped_ptr<AbstractGlossaryDlg> pDlg(pFact->CreateGlossaryDlg(pViewFrame, this, pWrtShell));
+ std::unique_ptr<AbstractGlossaryDlg> pDlg(pFact->CreateGlossaryDlg(pViewFrame, this, pWrtShell));
assert(pDlg && "Dialog creation failed!");
OUString sName;
OUString sShortName;
@@ -444,7 +444,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwSelGlossaryDlg> pDlg(pFact->CreateSwSelGlossaryDlg(0, aShortName));
+ std::unique_ptr<AbstractSwSelGlossaryDlg> pDlg(pFact->CreateSwSelGlossaryDlg(0, aShortName));
assert(pDlg && "Dialog creation failed!");
for(size_t i = 0; i < aFoundArr.size(); ++i)
{
@@ -715,7 +715,7 @@ bool SwGlossaryHdl::ImportGlossaries( const OUString& rName )
if( !rName.isEmpty() )
{
const SfxFilter* pFilter = 0;
- boost::scoped_ptr<SfxMedium> pMed(new SfxMedium( rName, StreamMode::READ, 0, 0 ));
+ std::unique_ptr<SfxMedium> pMed(new SfxMedium( rName, StreamMode::READ, 0, 0 ));
SfxFilterMatcher aMatcher( OUString("swriter") );
pMed->UseInteractionHandler( true );
if (!aMatcher.GuessFilter(*pMed, &pFilter, SfxFilterFlags::NONE))
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index e85bbe78f498..21e2c6a6d59d 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -129,7 +129,6 @@
#include <comphelper/lok.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
extern bool g_bFrmDrag;
extern bool g_bDDINetAttr;
@@ -681,7 +680,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream,
if ( xTransact.is() )
xTransact->commit();
- boost::scoped_ptr<SvStream> pSrcStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ ));
+ std::unique_ptr<SvStream> pSrcStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ ));
if( pSrcStm )
{
xStream->SetBufferSize( 0xff00 );
@@ -863,7 +862,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
else if ( m_pWrtShell->IsSelection() || m_pWrtShell->IsFrmSelected() ||
m_pWrtShell->IsObjSelected() )
{
- boost::scoped_ptr<SwWait> pWait;
+ std::unique_ptr<SwWait> pWait;
if( m_pWrtShell->ShouldWait() )
pWait.reset(new SwWait( *m_pWrtShell->GetView().GetDocShell(), true ));
@@ -1186,7 +1185,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
bool bPasteSelection )
{
SwWait aWait( *rSh.GetView().GetDocShell(), false );
- boost::scoped_ptr<SwTrnsfrActionAndUndo> pAction;
+ std::unique_ptr<SwTrnsfrActionAndUndo> pAction;
SwModule* pMod = SW_MOD();
bool nRet = false;
@@ -2671,14 +2670,14 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
}
else if( nWh )
{
- boost::scoped_ptr<SfxUsrAnyItem> pConnectionItem;
- boost::scoped_ptr<SfxUsrAnyItem> pCursorItem;
- boost::scoped_ptr<SfxUsrAnyItem> pColumnItem;
- boost::scoped_ptr<SfxUsrAnyItem> pSourceItem;
- boost::scoped_ptr<SfxUsrAnyItem> pCommandItem;
- boost::scoped_ptr<SfxUsrAnyItem> pCommandTypeItem;
- boost::scoped_ptr<SfxUsrAnyItem> pColumnNameItem;
- boost::scoped_ptr<SfxUsrAnyItem> pSelectionItem;
+ std::unique_ptr<SfxUsrAnyItem> pConnectionItem;
+ std::unique_ptr<SfxUsrAnyItem> pCursorItem;
+ std::unique_ptr<SfxUsrAnyItem> pColumnItem;
+ std::unique_ptr<SfxUsrAnyItem> pSourceItem;
+ std::unique_ptr<SfxUsrAnyItem> pCommandItem;
+ std::unique_ptr<SfxUsrAnyItem> pCommandTypeItem;
+ std::unique_ptr<SfxUsrAnyItem> pColumnNameItem;
+ std::unique_ptr<SfxUsrAnyItem> pSelectionItem;
bool bDataAvailable = true;
ODataAccessDescriptor aDesc;
@@ -2897,7 +2896,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
{
bool nRet = false;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rSh.GetView().GetEditWin() ));
+ std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rSh.GetView().GetEditWin() ));
DataFlavorExVector aFormats( rData.GetDataFlavorExVector() );
TransferableObjectDescriptor aDesc;
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index ef2218179941..17ab5200437c 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -51,7 +51,7 @@
#include <IDocumentUndoRedo.hxx>
#include <SwUndoField.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { namespace annotation {
@@ -126,7 +126,7 @@ void SwAnnotationWin::UpdateData()
{
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
- boost::scoped_ptr<SwField> pOldField;
+ std::unique_ptr<SwField> pOldField;
if (rUndoRedo.DoesUndo())
{
pOldField.reset(mpField->Copy());
@@ -268,7 +268,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
Engine()->SetModifyHdl( Link<LinkParamNone*,void>() );
IDocumentUndoRedo & rUndoRedo(
DocView().GetDocShell()->GetDoc()->GetIDocumentUndoRedo());
- boost::scoped_ptr<SwField> pOldField;
+ std::unique_ptr<SwField> pOldField;
if (rUndoRedo.DoesUndo())
{
pOldField.reset(mpField->Copy());
diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx
index ad08175554ff..6b766f8e79d5 100644
--- a/sw/source/uibase/docvw/DashedLine.cxx
+++ b/sw/source/uibase/docvw/DashedLine.cxx
@@ -17,7 +17,7 @@
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SwDashedLine::SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ) :
FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ),
@@ -32,7 +32,7 @@ SwDashedLine::~SwDashedLine( )
void SwDashedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
// Compute the start and end points
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index af2b08ac77e3..a2577777d6ae 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -48,7 +48,7 @@
#include <vcl/menubtn.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define TEXT_PADDING 5
#define BOX_DISTANCE 10
@@ -362,7 +362,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const Rectangl
// Create the processor and process the primitives
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
// TODO Ghost it all if needed
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index b24cac66f940..9d6d1d2419d8 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -43,7 +43,7 @@
#include <svl/stritem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define BUTTON_WIDTH 30
#define BUTTON_HEIGHT 19
@@ -211,7 +211,7 @@ void SwPageBreakWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
// Create the processor and process the primitives
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext, aNewViewInfos));
pProcessor->process(aGhostedSeq);
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 362919f7c763..c46f42844bb6 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -79,7 +79,7 @@
#include "swabstdlg.hxx"
#include "swevent.hxx"
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
// distance between Anchor Y and initial note position
#define POSTIT_INITIAL_ANCHOR_DISTANCE 20
@@ -1394,7 +1394,7 @@ void SwPostItMgr::ExecuteFormatAllDialog(SwView& rView)
SfxItemSet aDlgAttr(*pPool, EE_ITEMS_START, EE_ITEMS_END);
aDlgAttr.Put(aEditAttr);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN));
sal_uInt16 nRet = pDlg->Execute();
if (RET_OK == nRet)
{
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 742aaa6c4317..1393fba85a25 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -52,7 +52,7 @@
#include <wrtsh.hxx>
#include <shellres.hxx>
#include <SwRewriter.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { namespace sidebarwindows {
@@ -345,7 +345,7 @@ void SidebarTextControl::Command( const CommandEvent& rCEvt )
}
else
{
- boost::scoped_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel()));
+ std::unique_ptr<SfxPopupMenuManager> pMgr(SfxDispatcher::Popup(0, this,&rCEvt.GetMousePosPixel()));
static_cast<PopupMenu*>(pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTextControl, Select) );
{
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 92dcd6c83f16..c82e10feabe6 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -79,7 +79,7 @@
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <drawinglayer/primitive2d/shadowprimitive2d.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
namespace sw { namespace sidebarwindows {
@@ -270,7 +270,7 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, D
mpSidebarTextControl->Draw(pDev, rPt, rSz, nInFlags);
const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
- boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
+ std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(
*pDev, aNewViewInfos ));
@@ -675,7 +675,7 @@ void SwSidebarWin::SetPosAndSize()
pCrsr->GetMark()->nContent.Assign( pTextNode, pTextAnnotationField->GetStart()+1 );
pTmpCrsr = pCrsr;
}
- ::boost::scoped_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
+ std::unique_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
pTmpCrsrForAnnotationTextRange->FillRects();
SwRects* pRects(pTmpCrsrForAnnotationTextRange.get());
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 09a24d25b2bf..d7852e42def4 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -153,7 +153,6 @@
#include <unotools/syslocaleoptions.hxx>
#include <memory>
-#include <boost/scoped_ptr.hpp>
using namespace sw::mark;
using namespace ::com::sun::star;
@@ -5179,7 +5178,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
if ( m_rView.GetDocShell()->IsReadOnly() )
{
- boost::scoped_ptr<SwReadOnlyPopup> pROPopup(new SwReadOnlyPopup( aDocPos, m_rView ));
+ std::unique_ptr<SwReadOnlyPopup> pROPopup(new SwReadOnlyPopup( aDocPos, m_rView ));
ui::ContextMenuExecuteEvent aEvent;
aEvent.SourceWindow = VCLUnoHelper::GetInterface( this );
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index 98dccf7d5e67..2abb2d4876e5 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -35,7 +35,7 @@
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define PSH (&pView->GetWrtShell())
@@ -72,7 +72,7 @@ void SwHyphWrapper::SpellStart( SvxSpellArea eSpell )
bool SwHyphWrapper::SpellContinue()
{
// for automatic separation, make actions visible only at the end
- boost::scoped_ptr<SwWait> pWait;
+ std::unique_ptr<SwWait> pWait;
if( bAutomatic )
{
PSH->StartAllAction();
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 4d002603692b..fbd685a9fac8 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -41,7 +41,7 @@
#include <swerror.h>
#include <globals.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -245,7 +245,7 @@ bool SwGlossaries::RenameGroupDoc(
m_GlosArr.push_back(rNewGroup);
}
- boost::scoped_ptr<SwTextBlocks> pNewBlock(new SwTextBlocks( sNewFileURL ));
+ std::unique_ptr<SwTextBlocks> pNewBlock(new SwTextBlocks( sNewFileURL ));
pNewBlock->SetName(rNewTitle);
return true;
@@ -610,7 +610,7 @@ Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry(
{
//standard must be created
bool bCreate = ( rCompleteGroupName == GetDefName() );
- boost::scoped_ptr< SwTextBlocks > pGlosGroup( GetGroupDoc( rCompleteGroupName, bCreate ) );
+ std::unique_ptr< SwTextBlocks > pGlosGroup( GetGroupDoc( rCompleteGroupName, bCreate ) );
if ( pGlosGroup.get() && !pGlosGroup->GetError() )
{
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 0a0f9f6c33d5..9774f7e05412 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -52,7 +52,7 @@
#include <sfx2/msg.hxx>
#include <swslots.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -105,7 +105,7 @@ static bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName,
const OUString& rShortNm, const OUString& rLongNm )
{
const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
- boost::scoped_ptr<SwTextBlocks> pBlock(::GetGlossaries()->GetGroupDoc( rGroupName ));
+ std::unique_ptr<SwTextBlocks> pBlock(::GetGlossaries()->GetGroupDoc( rGroupName ));
SvxMacro aStart(aEmptyOUStr, aEmptyOUStr);
SvxMacro aEnd(aEmptyOUStr, aEmptyOUStr);
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index d0b544a59b84..fadf770aa2e4 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -54,7 +54,7 @@
#include <docsh.hxx>
#include <IDocumentRedlineAccess.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SFX_IMPL_MODELESSDIALOG_WITHID( SwRedlineAcceptChild, FN_REDLINE_ACCEPT )
@@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void)
rRedline.GetRedlineData().GetTimeStamp() ),
SID_ATTR_POSTIT_DATE ));
- boost::scoped_ptr<AbstractSvxPostItDialog> pDlg(pFact->CreateSvxPostItDialog( pParentDlg, aSet ));
+ std::unique_ptr<AbstractSvxPostItDialog> pDlg(pFact->CreateSvxPostItDialog( pParentDlg, aSet ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->HideAuthor();
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index f736e6b8c19a..bcfae7d184ba 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -123,7 +123,7 @@
#include <langhelper.hxx>
#include <tools/diagnose_ex.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -489,7 +489,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR_ANN));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if (nSlot == SID_CHAR_DLG_EFFECT)
{
@@ -543,7 +543,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, 0, true ));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( rView.GetWindow(), rView, aDlgAttr,DLG_STD, 0, true ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
sal_uInt16 nRet = pDlg->Execute();
if(RET_OK == nRet)
@@ -911,7 +911,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq)
if (pPostItMgr->GetActiveSidebarWin()->GetLayoutStatus()!=SwPostItHelper::DELETED)
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rView.GetEditWin() ));
+ std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rView.GetEditWin() ));
pDlg->Insert( SotClipboardFormatId::STRING, OUString() );
pDlg->Insert( SotClipboardFormatId::RTF, OUString() );
@@ -1703,7 +1703,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
aAllSet.Put( SfxStringItem( SID_FONT_NAME, aSetDlgFont.GetFamilyName() ) );
// If character is selected then it can be shown.
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
rView.GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
sal_uInt16 nResult = pDlg->Execute();
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 92898c5c3696..787c21dbac5e 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -106,7 +106,7 @@
#include <unomid.h>
#include <svx/galleryitem.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
//UUUU
#include <svx/unobrushitemhelper.hxx>
@@ -169,7 +169,7 @@ static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
GraphicType nGrfType = aGrf.GetType();
void* pEditObj = GRAPHIC_NONE != nGrfType && GRAPHIC_DEFAULT != nGrfType
? rSh.GetIMapInventor() : 0;
- boost::scoped_ptr<TargetList> pList(new TargetList);
+ std::unique_ptr<TargetList> pList(new TargetList);
rSh.GetView().GetViewFrame()->GetTopFrame().GetTargetList(*pList);
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
@@ -780,7 +780,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
bToTable = true;
SwInsertTableOptions aInsTableOpts( tabopts::ALL_TBL_INS_ATTR, 1 );
SwTableAutoFormat const* pTAFormat = 0;
- boost::scoped_ptr<SwTableAutoFormatTable> pAutoFormatTable;
+ std::unique_ptr<SwTableAutoFormatTable> pAutoFormatTable;
bool bDeleteFormat = true;
if(pArgs && SfxItemState::SET == pArgs->GetItemState( FN_PARAM_1, true, &pItem))
{
@@ -830,7 +830,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwConvertTableDlg> pDlg(pFact->CreateSwConvertTableDlg(GetView(), bToTable));
+ std::unique_ptr<AbstractSwConvertTableDlg> pDlg(pFact->CreateSwConvertTableDlg(GetView(), bToTable));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute() )
{
@@ -1935,7 +1935,7 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
if( pArgs)
{
SwWrtShell &rSh = GetShell();
- boost::scoped_ptr<SvxScriptSetItem> pSSetItem;
+ std::unique_ptr<SvxScriptSetItem> pSSetItem;
sal_uInt16 nSlot = rReq.GetSlot();
SfxItemPool& rPool = rSh.GetAttrPool();
sal_uInt16 nWhich = rPool.GetWhich( nSlot );
@@ -2064,7 +2064,7 @@ void SwBaseShell::GetTextFontCtrlState( SfxItemSet& rSet )
{
SwWrtShell &rSh = GetShell();
bool bFirst = true;
- boost::scoped_ptr<SfxItemSet> pFntCoreSet;
+ std::unique_ptr<SfxItemSet> pFntCoreSet;
SvtScriptType nScriptType = SvtScriptType::LATIN;
SfxWhichIter aIter( rSet );
sal_uInt16 nWhich = aIter.FirstWhich();
@@ -2360,7 +2360,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
case FN_FORMAT_TITLEPAGE_DLG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateTitlePageDlg( pMDI ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateTitlePageDlg( pMDI ));
pDlg->Execute();
}
break;
@@ -2399,7 +2399,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
RES_BOX , RES_SHADOW,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0 );
- boost::scoped_ptr<SfxAbstractDialog> pDlg;
+ std::unique_ptr<SfxAbstractDialog> pDlg;
// Table cell(s) selected?
if ( rSh.IsTableMode() )
{
@@ -2464,7 +2464,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
SfxItemSet aSet( rSh.GetAttrPool(),
RES_BACKGROUND, RES_BACKGROUND );
- boost::scoped_ptr<SfxAbstractDialog> pDlg;
+ std::unique_ptr<SfxAbstractDialog> pDlg;
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -2620,7 +2620,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractInsTableDlg> pDlg(pFact->CreateInsTableDlg(rTempView));
+ std::unique_ptr<AbstractInsTableDlg> pDlg(pFact->CreateInsTableDlg(rTempView));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK == pDlg->Execute() )
{
@@ -2834,7 +2834,7 @@ void SwBaseShell::ExecField( SfxRequest& rReq )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwChangeDBDlg(GetView()));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSwChangeDBDlg(GetView()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx
index def6391e8077..36148b40ebb4 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -33,7 +33,7 @@
#include "drawsh.hxx"
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
{
@@ -55,7 +55,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( NULL, &aNewAttr, pView ));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog( NULL, &aNewAttr, pView ));
sal_uInt16 nResult = pDlg->Execute();
if (nResult == RET_OK)
@@ -77,7 +77,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
bool bHasMarked = pView->AreObjectsMarked();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( NULL,
+ std::unique_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( NULL,
&aNewAttr,
pDoc,
true));
@@ -119,7 +119,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxLineTabDialog( NULL,
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxLineTabDialog( NULL,
&aNewAttr,
pDoc,
pObj,
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index d3424f68e54e..434dcfc82c2a 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -65,7 +65,6 @@
#include "swslots.hxx"
#include "swabstdlg.hxx"
#include "misc.hrc"
-#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 67f8202ba8e3..9a87a1a9596b 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -62,7 +62,7 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
#include <IDocumentDrawModelAccess.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -149,7 +149,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG ));
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwWrapDlg( GetView().GetWindow(), aSet, pSh, true, RC_DLG_SWWRAPDLG ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if (pDlg->Execute() == RET_OK)
@@ -183,7 +183,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
if( rMarkList.GetMark(0) != 0 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pDlg;
bool bCaption = false;
// Allowed anchorages:
@@ -523,7 +523,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(NULL, aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, SwDrawBaseShell, CheckGroupShapeNameHdl));
@@ -553,7 +553,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 8f0169240e46..0a9892e96c29 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -98,7 +98,7 @@
#include "swabstdlg.hxx"
#include "chrdlg.hrc"
#include "misc.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -344,7 +344,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(pView->GetWindow(), *pView, aDlgAttr, DLG_CHAR_DRAW));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(pView->GetWindow(), *pView, aDlgAttr, DLG_CHAR_DRAW));
assert(pDlg && "Dialog creation failed!");
if (nSlot == SID_CHAR_DLG_EFFECT)
{
@@ -421,7 +421,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, 0, true ));
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, 0, true ));
assert(pDlg && "Dialog creation failed!");
sal_uInt16 nRet = pDlg->Execute();
if(RET_OK == nRet)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 216c412ee96d..df42de322d73 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -74,7 +74,7 @@
#include <comphelper/processfactory.hxx>
#include "swabstdlg.hxx"
#include "misc.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -463,7 +463,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog(
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTextTabDialog(
&(GetView().GetViewFrame()->GetWindow()),
&aNewAttr, pSdrView ));
sal_uInt16 nResult = pDlg->Execute();
@@ -743,7 +743,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
// If character is selected, it can be shown
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( rView.GetWindow(), aAllSet,
rView.GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ));
sal_uInt16 nResult = pDlg->Execute();
if( nResult == RET_OK )
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 6757697335f3..6adba620f093 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -81,7 +81,7 @@
#include <docsh.hxx>
#include <svx/drawitem.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -463,7 +463,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric) ));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact);
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog(
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog(
nSel & nsSelectionType::SEL_GRF ? OUString("PictureDialog") :
nSel & nsSelectionType::SEL_OLE ? OUString("ObjectDialog"):
OUString("FrameDialog"),
@@ -621,7 +621,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact);
- boost::scoped_ptr<AbstractSvxObjectTitleDescDialog> pDlg(
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(
pFact->CreateSvxObjectTitleDescDialog( NULL,
aTitle,
aDescription ));
@@ -1254,7 +1254,7 @@ void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact);
- boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(
+ std::unique_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(
NULL,
&aNewAttr,
pDoc,
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 32aa477038c7..cb65f2f18cd3 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -76,7 +76,7 @@
#include "swslots.hxx"
#include "swabstdlg.hxx"
#include <unocrsr.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define TOOLBOX_NAME "colorbar"
@@ -344,7 +344,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "no dialog factory!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("PictureDialog",
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateFrmTabDialog("PictureDialog",
GetView().GetViewFrame(),
GetView().GetWindow(),
aSet, false));
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index e3b6eaaade12..185cfa284e00 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -52,7 +52,7 @@
#include <vcl/msgbox.hxx>
#include <langhelper.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -126,7 +126,7 @@ namespace SwLangHelper
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if (pFact)
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS ));
pDlg->Execute();
}
}
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 6abddb664f54..c4326e11fe9c 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -67,7 +67,7 @@
#include <sfx2/msg.hxx>
#include "swslots.hxx"
#include "swabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell)
@@ -118,7 +118,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
if( pItem )
{
- boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( pSdrView->GetMarkedObjectList() ));
+ std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( pSdrView->GetMarkedObjectList() ));
if( 1 == pMarkList->GetMarkCount() )
{
@@ -161,7 +161,7 @@ void SwMediaShell::GetMediaState(SfxItemSet &rSet)
if( pView )
{
bool bDisable = true;
- boost::scoped_ptr<SdrMarkList> pMarkList(new SdrMarkList( pView->GetMarkedObjectList() ));
+ std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList( pView->GetMarkedObjectList() ));
if( 1 == pMarkList->GetMarkCount() )
{
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 13aa5dfce92b..228b86583437 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -86,7 +86,7 @@
#include "swabstdlg.hxx"
#include <table.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
@@ -561,7 +561,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebView, &rSh.GetView()));
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
- boost::scoped_ptr<SwTableRep> pTableRep(::lcl_TableParamToItemSet( aCoreSet, rSh ));
+ std::unique_ptr<SwTableRep> pTableRep(::lcl_TableParamToItemSet( aCoreSet, rSh ));
aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
rSh.GetTableAttr(aCoreSet);
@@ -572,7 +572,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
else
aCoreSet.InvalidateItem( RES_BACKGROUND );
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pDlg;
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -650,7 +650,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(),aCoreSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(),aCoreSet,
pView->GetViewFrame()->GetFrame().GetFrameInterface(),
RC_DLG_SWNUMFMTDLG ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
@@ -800,7 +800,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(&GetView().GetViewFrame()->GetWindow(), &rSh));
+ std::unique_ptr<AbstractSwAutoFormatDlg> pDlg(pFact->CreateSwAutoFormatDlg(&GetView().GetViewFrame()->GetWindow(), &rSh));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
break;
@@ -810,7 +810,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_ROW_HEIGHT ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_ROW_HEIGHT ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
break;
@@ -923,7 +923,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if ( FN_TABLE_INSERT_ROW_DLG != nSlot || !rSh.IsInRepeatedHeadline())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0);
+ std::unique_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0);
if( pDlg.get() && (pDlg->Execute() == 1) )
{
@@ -960,7 +960,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if( pFact )
{
const long nMaxVert = rSh.GetAnyCurRect( RECT_FRM ).Width() / MINLAY;
- boost::scoped_ptr<SvxAbstractSplittTableDialog> pDlg(pFact->CreateSvxSplittTableDialog( GetView().GetWindow(), rSh.IsTableVertical(), nMaxVert, 99 ));
+ std::unique_ptr<SvxAbstractSplittTableDialog> pDlg(pFact->CreateSvxSplittTableDialog( GetView().GetWindow(), rSh.IsTableVertical(), nMaxVert, 99 ));
if( pDlg && (pDlg->Execute() == RET_OK) )
{
nCount = pDlg->GetCount();
@@ -1004,7 +1004,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSplitTableDialog> pDlg(pFact->CreateSplitTableDialog( GetView().GetWindow(), rSh ));
+ std::unique_ptr<AbstractSplitTableDialog> pDlg(pFact->CreateSplitTableDialog( GetView().GetWindow(), rSh ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, pDlg->GetSplitMode() ) );
@@ -1022,7 +1022,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateTableMergeDialog(GetView().GetWindow(), bPrev));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateTableMergeDialog(GetView().GetWindow(), bPrev));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if( RET_OK != pDlg->Execute())
bPrev = bNext = false;
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 19f7655fba49..c290ab301f6a 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -70,7 +70,7 @@
#include <edtwin.hxx>
#include <PostItMgr.hxx>
#include <calbck.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace nsSwDocInfoSubType;
@@ -139,7 +139,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
if(rLink.IsVisible())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( pMDI, &rSh.GetLinkManager(), false, &rLink ));
+ std::unique_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( pMDI, &rSh.GetLinkManager(), false, &rLink ));
if ( pDlg )
{
pDlg->Execute();
@@ -152,7 +152,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwFieldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG ));
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSwFieldEditDlg( GetView(),RC_DLG_SWFLDEDITDLG ));
assert(pDlg && "Dialog creation failed!");
pDlg->Execute();
}
@@ -499,7 +499,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact2 = SvxAbstractDialogFactory::Create();
assert(pFact2 && "Dialog creation failed!");
- boost::scoped_ptr<AbstractSvxPostItDialog> pDlg(pFact2->CreateSvxPostItDialog( pMDI, aSet, bTravel ));
+ std::unique_ptr<AbstractSvxPostItDialog> pDlg(pFact2->CreateSvxPostItDialog( pMDI, aSet, bTravel ));
assert(pDlg && "Dialog creation failed!");
pDlg->HideAuthor();
@@ -558,7 +558,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
- boost::scoped_ptr<AbstractJavaEditDialog> pDlg(pFact->CreateJavaEditDialog(pMDI, &rSh));
+ std::unique_ptr<AbstractJavaEditDialog> pDlg(pFact->CreateJavaEditDialog(pMDI, &rSh));
assert(pDlg && "Dialog creation failed!");
if ( pDlg->Execute() )
{
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index f1c99467d276..9686c3ca2fdd 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -39,7 +39,7 @@
#include "swabstdlg.hxx"
#include <index.hrc>
#include <globals.hrc>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
void SwTextShell::ExecIdx(SfxRequest &rReq)
{
@@ -58,7 +58,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( pMDI, GetShell(), DLG_EDIT_AUTHMARK));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( pMDI, GetShell(), DLG_EDIT_AUTHMARK));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
@@ -84,7 +84,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
{ // Several marks, which should it be?
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<VclAbstractDialog> pMultDlg(pFact->CreateMultiTOXMarkDlg(pMDI, aMgr));
+ std::unique_ptr<VclAbstractDialog> pMultDlg(pFact->CreateMultiTOXMarkDlg(pMDI, aMgr));
OSL_ENSURE(pMultDlg, "Dialog creation failed!");
nRet = pMultDlg->Execute();
}
@@ -92,7 +92,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateIndexMarkModalDlg(pMDI, GetShell(), aMgr.GetCurTOXMark()));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateIndexMarkModalDlg(pMDI, GetShell(), aMgr.GetCurTOXMark()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
@@ -138,7 +138,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
}
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
+ std::unique_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
pMDI, aSet, rSh, const_cast<SwTOXBase*>(pCurTOX),
USHRT_MAX, bGlobal));
OSL_ENSURE(pDlg, "Dialog creation failed!");
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 245a3c038dce..372c29e7cb0c 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -118,7 +118,7 @@
#include <svx/svdmodel.hxx>
#include <svx/drawitem.hxx>
#include <numrule.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace svx::sidebar;
@@ -167,7 +167,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
::PrepareBoxInfo( aCoreSet, rWrtSh );
aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(rWrtSh.GetView().GetDocShell())));
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pDlg;
if ( bUseDialog && GetActiveView() )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -337,7 +337,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if (pFact)
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( GetView().GetWindow(), SID_LANGUAGE_OPTIONS ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( GetView().GetWindow(), SID_LANGUAGE_OPTIONS ));
pDlg->Execute();
}
}
@@ -483,7 +483,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
+ std::unique_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
GetView().GetWindow(), rWrtSh));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand());
@@ -563,7 +563,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwBreakDlg> pDlg(pFact->CreateSwBreakDlg(GetView().GetWindow(), rWrtSh));
+ std::unique_ptr<AbstractSwBreakDlg> pDlg(pFact->CreateSwBreakDlg(GetView().GetWindow(), rWrtSh));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if ( pDlg->Execute() == RET_OK )
{
@@ -621,7 +621,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwInsertBookmarkDlg( GetView().GetWindow(), rWrtSh, rReq, DLG_INSERT_BOOKMARK ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSwInsertBookmarkDlg( GetView().GetWindow(), rWrtSh, rReq, DLG_INSERT_BOOKMARK ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
@@ -653,7 +653,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwModalRedlineAcceptDlg> pDlg(pFact->CreateSwModalRedlineAcceptDlg(&GetView().GetEditWin()));
+ std::unique_ptr<AbstractSwModalRedlineAcceptDlg> pDlg(pFact->CreateSwModalRedlineAcceptDlg(&GetView().GetEditWin()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
switch (lcl_AskRedlineMode(&GetView().GetEditWin()))
@@ -717,7 +717,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rWrtSh, DLG_SORTING ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rWrtSh, DLG_SORTING ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
pDlg.reset();
@@ -988,7 +988,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
rWrtSh.GetNodeNumStart( pPaM ) );
aCoreSet.Put(aStartAt);
}
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg;
+ std::unique_ptr<SfxAbstractTabDialog> pDlg;
if ( bUseDialog && GetActiveView() )
{
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index 925d2af5c0cc..fddb21522455 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -62,7 +62,7 @@
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::svx;
using namespace ::com::sun::star;
@@ -263,7 +263,7 @@ IMPL_LINK_TYPED( SwBaseShell, InsertDBTextHdl, void*, p, void )
SwDBData aDBData = pDBStruct->aDBData;
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot(GetView(),
+ std::unique_ptr<AbstractSwInsertDBColAutoPilot>pDlg (pFact->CreateSwInsertDBColAutoPilot(GetView(),
xSource,
xColSupp,
aDBData));
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index abb34ee05c52..d8a966192c38 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -56,7 +56,7 @@
#include "swabstdlg.hxx"
#include "outline.hxx"
#include "chrdlg.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
const sal_uInt32 nFontInc = 40; // 2pt
const sal_uInt32 nFontMaxSz = 19998; // 999.9pt
@@ -458,7 +458,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(), aSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( GetView().GetWindow(), aSet,
rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), DLG_SWDROPCAPS ));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if (pDlg->Execute() == RET_OK)
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index c61382cb92cc..8558fbe8e710 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -40,7 +40,7 @@
#include <svx/nbdtmgfact.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
void SwTextShell::ExecEnterNum(SfxRequest &rReq)
{
@@ -183,7 +183,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET,
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET,
GetView().GetWindow(), &aSet, GetShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
SFX_REQUEST_ARG( rReq, pPageItem, SfxStringItem, FN_PARAM_1, false );
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index 7951a01cad8a..d19b8f453a04 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -45,8 +45,7 @@ namespace svx { namespace sidebar {
#include <vcl/field.hxx>
#include <svl/intitem.hxx>
-#include <boost/scoped_ptr.hpp>
-
+#include <memory>
namespace sw { namespace sidebar {
@@ -163,20 +162,20 @@ namespace sw { namespace sidebar {
// - page usage - only left, only right, both, mirrored
// item also hold the numbering type for the page style which should
// be kept stable.
- ::boost::scoped_ptr<SvxPageItem> mpPageItem;
+ ::std::unique_ptr<SvxPageItem> mpPageItem;
// item keeping the page style's left and right margins
- ::boost::scoped_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem;
+ ::std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem;
// item keeping the page style's top and bottom margins
- ::boost::scoped_ptr<SvxLongULSpaceItem> mpPageULMarginItem;
+ ::std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem;
// item keeping the page style's page size
- ::boost::scoped_ptr<SvxSizeItem> mpPageSizeItem;
+ ::std::unique_ptr<SvxSizeItem> mpPageSizeItem;
// Paper corresponding to the page style's page size
Paper mePaper;
// item keeping the page column type
- ::boost::scoped_ptr<SfxInt16Item> mpPageColumnTypeItem;
+ ::std::unique_ptr<SfxInt16Item> mpPageColumnTypeItem;
FieldUnit meFUnit;
SfxMapUnit meUnit;
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index 931641ceecbb..960ce3b8bd93 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
@@ -26,7 +26,6 @@
#include <sfx2/sidebar/ControllerItem.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <vcl/lstbox.hxx>
-#include <boost/scoped_ptr.hpp>
namespace sw { namespace sidebar {
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index cefeea728249..86f242bcf339 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -44,7 +44,7 @@
#include "docsh.hxx"
#include "unotbl.hxx"
#include "unochart.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -55,7 +55,7 @@ void SwTableFUNC::ColWidthDlg( vcl::Window *pParent )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwTableWidthDlg(pParent, *this));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSwTableWidthDlg(pParent, *this));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 06e059c24392..21c69c6e892e 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -79,7 +79,7 @@
#include <svx/dialogs.hrc>
#include <osl/mutex.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview")
@@ -758,7 +758,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
{
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
- boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
+ std::unique_ptr<AbstractSvxZoomDialog> pDlg;
if(!pArgs)
{
SfxItemSet aCoreSet(GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 6173af8596af..01b1759926a8 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -77,7 +77,7 @@ using namespace ::com::sun::star;
#include <IDocumentSettingAccess.hxx>
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include "swabstdlg.hxx"
#include "misc.hrc"
@@ -361,7 +361,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
void SwView::ExecViewOptions(SfxRequest &rReq)
{
- boost::scoped_ptr<SwViewOption> pOpt(new SwViewOption( *GetWrtShell().GetViewOptions() ));
+ std::unique_ptr<SwViewOption> pOpt(new SwViewOption( *GetWrtShell().GetViewOptions() ));
bool bModified = GetWrtShell().IsModified();
int eState = STATE_TOGGLE;
@@ -616,7 +616,7 @@ void SwView::ExecFormatFootnote()
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetWindow(), GetWrtShell()));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetWindow(), GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
@@ -626,7 +626,7 @@ void SwView::ExecNumberingOutline(SfxItemPool & rPool)
SfxItemSet aTmp(rPool, FN_PARAM_1, FN_PARAM_1);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE,
+ std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_TAB_OUTLINE,
GetWindow(), &aTmp, GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 1006837cb787..61b560cdef32 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -146,7 +146,7 @@
#include <vcl/GraphicNativeMetadata.hxx>
#include <vcl/settings.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
const char sStatusDelim[] = " : ";
const char sStatusComma[] = " , ";
@@ -298,7 +298,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
SwDocShell* pDocShell = GetDocShell();
const sal_uInt16 nHtmlMode = ::GetHtmlMode(pDocShell);
// when in HTML mode insert only as a link
- boost::scoped_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper(
+ std::unique_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE,
SFXWB_GRAPHIC ));
pFileDlg->SetTitle(SW_RESSTR(STR_INSERT_GRAPHIC ));
@@ -539,7 +539,7 @@ void SwView::Execute(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclSwViewDialog(*this));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclSwViewDialog(*this));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
break;
@@ -1673,7 +1673,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
if ( ( GetDocShell()->GetCreateMode() != SfxObjectCreateMode::EMBEDDED ) || !GetDocShell()->IsInPlaceActive() )
{
const SfxItemSet *pSet = 0;
- boost::scoped_ptr<AbstractSvxZoomDialog> pDlg;
+ std::unique_ptr<AbstractSvxZoomDialog> pDlg;
if ( pArgs )
pSet = pArgs;
else
@@ -1906,7 +1906,7 @@ void SwView::EditLinkDlg()
{
bool bWeb = 0 != PTR_CAST(SwWebView, this);
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- boost::scoped_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( &GetViewFrame()->GetWindow(), &GetWrtShell().GetLinkManager(), bWeb ));
+ std::unique_ptr<SfxAbstractLinksDialog> pDlg(pFact->CreateLinksDialog( &GetViewFrame()->GetWindow(), &GetWrtShell().GetLinkManager(), bWeb ));
if ( pDlg )
{
pDlg->Execute();
@@ -2372,7 +2372,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument)
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
if ( pFact )
{
- boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( NULL, SID_OPTIONS_DATABASES ));
+ std::unique_ptr<VclAbstractDialog> pDlg(pFact->CreateVclDialog( NULL, SID_OPTIONS_DATABASES ));
pDlg->Execute();
}
}
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 32e5f2be043b..785a00ea43af 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -41,7 +41,7 @@
#include "view.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
void SwView::ExecDlgExt(SfxRequest &rReq)
{
@@ -54,7 +54,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<VclAbstractDialog> pDialog(pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION ));
+ std::unique_ptr<VclAbstractDialog> pDialog(pFact->CreateSwCaptionDialog( pMDI, *this, DLG_CAPTION ));
assert(pDialog && "Dialog creation failed!");
if ( pDialog )
{
@@ -66,7 +66,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
- boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
+ std::unique_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg(
pMDI, *m_pWrtShell, true));
assert(pDlg && "Dialog creation failed!");
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index e48622ce3292..f2f6747fb1a3 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -86,7 +86,7 @@
#include <editeng/editerr.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace sw::mark;
using namespace ::com::sun::star;
@@ -575,7 +575,7 @@ void SwView::StartThesaurus()
SpellError( eLang );
else
{
- boost::scoped_ptr<AbstractThesaurusDialog> pDlg;
+ std::unique_ptr<AbstractThesaurusDialog> pDlg;
// create dialog
{ //Scope for SwWait-Object
SwWait aWait( *GetDocShell(), true );
@@ -702,7 +702,7 @@ bool SwView::ExecSpellPopup(const Point& rPt)
bRet = true;
m_pWrtShell->SttSelect();
- boost::scoped_ptr< SwSpellPopup > pPopup;
+ std::unique_ptr< SwSpellPopup > pPopup;
if (bUseGrammarContext)
{
sal_Int32 nPos = aPoint.nContent.GetIndex();
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 2c90c4517b43..b9c54fcfccdf 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -21,7 +21,7 @@
#include <string>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#include <hintids.hxx>
@@ -490,7 +490,7 @@ bool SwView::SearchAndWrap(bool bApi)
if (!m_pSrchItem->GetSelection())
m_pWrtShell->KillSelection(0, false);
- boost::scoped_ptr<SwWait> pWait(new SwWait( *GetDocShell(), true ));
+ std::unique_ptr<SwWait> pWait(new SwWait( *GetDocShell(), true ));
if( FUNC_Search( aOpts ) )
{
m_bFound = true;
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index df68232cf0f0..74de4115911f 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -32,7 +32,7 @@
#include "swabstdlg.hxx"
#include "dialog.hrc"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::ui::dialogs;
@@ -90,7 +90,7 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti
{
sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
- boost::scoped_ptr<SvStream> pInStream;
+ std::unique_ptr<SvStream> pInStream;
if ( xInputStream.is() )
pInStream.reset(utl::UcbStreamHelper::CreateStream( xInputStream ));
@@ -108,7 +108,7 @@ sal_Int16 SwXFilterOptions::execute() throw (uno::RuntimeException, std::excepti
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(NULL, *pDocShell,
+ std::unique_ptr<AbstractSwAsciiFilterDlg> pAsciiDlg(pFact->CreateSwAsciiFilterDlg(NULL, *pDocShell,
pInStream.get()));
OSL_ENSURE(pAsciiDlg, "Dialog creation failed!");
if(RET_OK == pAsciiDlg->Execute())
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 5289e292984c..f8223eeaca96 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -54,7 +54,7 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
@@ -253,7 +253,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup()
uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
const sal_uInt16 nCount = pGlosGroup->GetCount();
@@ -275,7 +275,7 @@ void SwXAutoTextGroup::renameByName(const OUString& aElementName,
// throw exception only if the programmatic name is to be changed into an existing name
if(aNewElementName != aElementName && hasByName(aNewElementName))
throw container::ElementExistException();
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(pGlosGroup && !pGlosGroup->GetError())
{
sal_uInt16 nIdx = pGlosGroup->GetIndex( aElementName);
@@ -439,7 +439,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const
void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(pGlosGroup && !pGlosGroup->GetError())
{
sal_uInt16 nIdx = pGlosGroup->GetIndex(aEntryName);
@@ -501,7 +501,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti
sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
return static_cast<sal_Int32>(pGlosGroup->GetCount());
@@ -511,7 +511,7 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex)
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
const sal_uInt16 nCount = pGlosGroup->GetCount();
@@ -529,7 +529,7 @@ uno::Type SwXAutoTextGroup::getElementType() throw( uno::RuntimeException, std::
sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
return pGlosGroup->GetCount() > 0;
@@ -550,7 +550,7 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames()
throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
@@ -568,7 +568,7 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName)
{
SolarMutexGuard aGuard;
bool bRet = false;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
@@ -603,7 +603,7 @@ void SwXAutoTextGroup::setPropertyValue(
if(!pEntry)
throw beans::UnknownPropertyException();
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
switch(pEntry->nWID)
@@ -631,7 +631,7 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
if(!pEntry)
throw beans::UnknownPropertyException();
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
+ std::unique_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
@@ -954,7 +954,7 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR
InsertPaM = *pCursor->GetPaM();
}
- boost::scoped_ptr<SwTextBlocks> pBlock(pGlossaries->GetGroupDoc(sGroupName));
+ std::unique_ptr<SwTextBlocks> pBlock(pGlossaries->GetGroupDoc(sGroupName));
const bool bResult = pBlock.get() && !pBlock->GetError()
&& pDoc->InsertGlossary( *pBlock, sEntryName, InsertPaM);
@@ -1029,7 +1029,7 @@ void SwAutoTextEventDescriptor::replaceByName(
SwGlossaries *const pGlossaries =
const_cast<SwGlossaries*>(rAutoTextEntry.GetGlossaries());
- boost::scoped_ptr<SwTextBlocks> pBlocks(
+ std::unique_ptr<SwTextBlocks> pBlocks(
pGlossaries->GetGroupDoc( rAutoTextEntry.GetGroupName() ));
OSL_ENSURE( pBlocks,
"can't get autotext group; SwAutoTextEntry has illegal name?");
@@ -1065,7 +1065,7 @@ void SwAutoTextEventDescriptor::getByName(
SwGlossaries *const pGlossaries =
const_cast<SwGlossaries*>(rAutoTextEntry.GetGlossaries());
- boost::scoped_ptr<SwTextBlocks> pBlocks(
+ std::unique_ptr<SwTextBlocks> pBlocks(
pGlossaries->GetGroupDoc( rAutoTextEntry.GetGroupName() ));
OSL_ENSURE( pBlocks,
"can't get autotext group; SwAutoTextEntry has illegal name?");
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index f5cc22988cf9..7205b4e4f2ad 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -71,7 +71,7 @@
#include <unomid.h>
#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -678,7 +678,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
SwMergeDescriptor aMergeDesc( nMergeType, rSh, aDescriptor );
- boost::scoped_ptr< SwMailMergeConfigItem > pMMConfigItem;
+ std::unique_ptr< SwMailMergeConfigItem > pMMConfigItem;
uno::Reference< mail::XMailService > xInService;
switch (nCurOutputType)
{
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index a3ed2de2003c..ab5b8281e29e 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -149,7 +149,7 @@
#include <svx/svdview.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicehelper.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
@@ -1997,7 +1997,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any&
default:
{
const SfxPoolItem& rItem = pDocShell->GetDoc()->GetDefault(pEntry->nWID);
- boost::scoped_ptr<SfxPoolItem> pNewItem(rItem.Clone());
+ std::unique_ptr<SfxPoolItem> pNewItem(rItem.Clone());
pNewItem->PutValue(aValue, pEntry->nMemberId);
pDocShell->GetDoc()->SetDefault(*pNewItem);
}
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index b830fdbc5d8d..195771a9d08a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -93,7 +93,7 @@
#include "navmgr.hxx"
#include "SidebarWin.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
#define CTYPE_CNT 0
#define CTYPE_CTT 1
@@ -3279,7 +3279,7 @@ void SwContentTree::EditEntry(SvTreeListEntry* pEntry, EditEntryMode nMode)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<AbstractSwRenameXNamedDlg> pDlg(pFact->CreateSwRenameXNamedDlg(this, xNamed, xNameAccess));
+ std::unique_ptr<AbstractSwRenameXNamedDlg> pDlg(pFact->CreateSwRenameXNamedDlg(this, xNamed, xNameAccess));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(xSecond.is())
pDlg->SetAlternativeAccess( xSecond, xThird);
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 422687f6efbb..a92682177d3e 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -57,7 +57,7 @@
#include <comcore.hrc>
#include <globals.hrc>
#include "swabstdlg.hxx"
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
@@ -226,7 +226,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
if( aData.HasFormat( SotClipboardFormatId::FILE_LIST ))
{
nRet = rEvt.mnAction;
- boost::scoped_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
+ std::unique_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
int nAbsContPos = pDropEntry ?
(int) GetModel()->GetAbsPos(pDropEntry):
- 1;
@@ -395,7 +395,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
const sal_uInt16 nEnableFlags = GetEnableFlags();
if(FN_GLOBAL_OPEN == nTbxId)
{
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; i++)
{
pMenu->InsertItem( i, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] );
@@ -413,7 +413,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
}
else if(FN_GLOBAL_UPDATE == nTbxId)
{
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
{
pMenu->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
@@ -858,7 +858,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
// must be refilled. So you do not have to remember anything,
// deleting begins at the end.
SvTreeListEntry* pSelEntry = LastSelected();
- boost::scoped_ptr<SwGlblDocContents> pTempContents;
+ std::unique_ptr<SwGlblDocContents> pTempContents;
pActiveShell->StartAction();
while(pSelEntry)
{
@@ -892,7 +892,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");
- boost::scoped_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
+ std::unique_ptr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
this, aSet,
*pActiveShell,
0,
@@ -1113,7 +1113,7 @@ bool SwGlobalTree::Update(bool bHard)
else
{
bool bCopy = false;
- boost::scoped_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
+ std::unique_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents);
pActiveShell->GetGlobalDocContent(*pTempContents);
if(pTempContents->size() != pSwGlblDocContents->size() ||
pTempContents->size() != GetEntryCount())
@@ -1366,7 +1366,7 @@ IMPL_LINK_TYPED( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileD
if ( ERRCODE_NONE != _pFileDlg->GetError() )
return;
- boost::scoped_ptr<SfxMediumList> pMedList(pDocInserter->CreateMediumList());
+ std::unique_ptr<SfxMediumList> pMedList(pDocInserter->CreateMediumList());
if ( pMedList )
{
Sequence< OUString >aFileNames( pMedList->size() );
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 075c3bda1441..d20b7e95dfb9 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -54,7 +54,7 @@
#include "access.hrc"
#include <unomid.h>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
@@ -367,7 +367,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
HID_NAVI_DRAG_LINK,
HID_NAVI_DRAG_COPY,
};
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); i++)
{
pMenu->InsertItem( i + 1, aContextArr[i] );
@@ -387,7 +387,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void )
break;
case FN_OUTLINE_LEVEL:
{
- boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
+ std::unique_ptr<PopupMenu> pMenu(new PopupMenu);
for (sal_uInt16 i = 101; i <= 100 + MAXLEVEL; i++)
{
pMenu->InsertItem( i, OUString::number(i - 100) );
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index c5d3b8baa2c7..f0e86d3a4dd3 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -42,7 +42,7 @@
#include "dialog.hrc"
#include <unomid.h>
#include <sfx2/viewfrm.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -403,7 +403,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox *, pBox )
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- boost::scoped_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aCoreSet,
+ std::unique_ptr<SfxAbstractDialog> pDlg(pFact->CreateSfxDialog( this, aCoreSet,
GetView()->GetViewFrame()->GetFrame().GetFrameInterface(),
RC_DLG_SWNUMFMTDLG ));
OSL_ENSURE(pDlg, "Dialog creation failed!");