boost->std

Change-Id: I9b4f884c6313a53fea543ea6f93175205351ad14
Reviewed-on: https://gerrit.libreoffice.org/18517
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

10 files changed, 33 insertions, 34 deletions

diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 24cd281b3bf8..b30d5718bd15 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -65,7 +65,6 @@
 #include <swcss1.hxx>
 #include <swhtml.hxx>
 #include <numrule.hxx>
-#include <boost/shared_ptr.hpp>
 
 #include <vcl/graphicfilter.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 7ca574f651e2..498d3af13bc4 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -204,7 +204,7 @@ class HTMLTableCell
     HTMLTableCnts *pContents;       // cell content
     SvxBrushItem *pBGBrush;         // cell background
     // !!!ATTENTION!!!!!
-    ::boost::shared_ptr<SvxBoxItem> m_pBoxItem;
+    std::shared_ptr<SvxBoxItem> m_pBoxItem;
 
     sal_uInt32 nNumFormat;
     sal_uInt16 nRowSpan;                // cell ROWSPAN
@@ -228,7 +228,7 @@ public:
     // Fill a not empty cell
     void Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
               sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
-              ::boost::shared_ptr<SvxBoxItem> const& rBoxItem,
+              std::shared_ptr<SvxBoxItem> const& rBoxItem,
               bool bHasNumFormat, sal_uInt32 nNumFormat,
               bool bHasValue, double nValue, bool bNoWrap, bool bCovered );
 
@@ -249,7 +249,7 @@ public:
     inline void SetWidth( sal_uInt16 nWidth, bool bRelWidth );
 
     const SvxBrushItem *GetBGBrush() const { return pBGBrush; }
-    ::boost::shared_ptr<SvxBoxItem> GetBoxItem() const { return m_pBoxItem; }
+    std::shared_ptr<SvxBoxItem> GetBoxItem() const { return m_pBoxItem; }
 
     inline bool GetNumFormat( sal_uInt32& rNumFormat ) const;
     inline bool GetValue( double& rValue ) const;
@@ -548,7 +548,7 @@ public:
     void InsertCell( HTMLTableCnts *pCnts, sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
                      sal_uInt16 nWidth, bool bRelWidth, sal_uInt16 nHeight,
                      sal_Int16 eVertOri, SvxBrushItem *pBGBrush,
-                     boost::shared_ptr<SvxBoxItem> const& rBoxItem,
+                     std::shared_ptr<SvxBoxItem> const& rBoxItem,
                      bool bHasNumFormat, sal_uInt32 nNumFormat,
                      bool bHasValue, double nValue, bool bNoWrap );
 
@@ -704,7 +704,7 @@ HTMLTableCell::~HTMLTableCell()
 
 void HTMLTableCell::Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan,
                          sal_Int16 eVert, SvxBrushItem *pBrush,
-                         ::boost::shared_ptr<SvxBoxItem> const& rBoxItem,
+                         std::shared_ptr<SvxBoxItem> const& rBoxItem,
                          bool bHasNF, sal_uInt32 nNF, bool bHasV, double nVal,
                          bool bNWrap, bool bCovered )
 {
@@ -1333,7 +1333,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
     SwFrameFormat *pFrameFormat = 0;      // frame::Frame-Format
     sal_Int16 eVOri = text::VertOrientation::NONE;
     const SvxBrushItem *pBGBrushItem = 0;   // Hintergrund
-    boost::shared_ptr<SvxBoxItem> pBoxItem;
+    std::shared_ptr<SvxBoxItem> pBoxItem;
     bool bTopLine = false, bBottomLine = false, bLastBottomLine = false;
     bool bReUsable = false;     // Format nochmals verwendbar?
     sal_uInt16 nEmptyRows = 0;
@@ -2060,7 +2060,7 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts,
                             sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
                             sal_uInt16 nCellWidth, bool bRelWidth, sal_uInt16 nCellHeight,
                             sal_Int16 eVertOrient, SvxBrushItem *pBGBrushItem,
-                            boost::shared_ptr<SvxBoxItem> const& rBoxItem,
+                            std::shared_ptr<SvxBoxItem> const& rBoxItem,
                             bool bHasNumFormat, sal_uInt32 nNumFormat,
                             bool bHasValue, double nValue, bool bNoWrap )
 {
@@ -3067,7 +3067,7 @@ class _CellSaveStruct : public _SectionSaveStruct
     OUString aStyle, aId, aClass, aLang, aDir;
     OUString aBGImage;
     Color aBGColor;
-    boost::shared_ptr<SvxBoxItem> m_pBoxItem;
+    std::shared_ptr<SvxBoxItem> m_pBoxItem;
 
     HTMLTableCnts* pCnts;           // Liste aller Inhalte
     HTMLTableCnts* pCurrCnts;   // der aktuelle Inhalt oder 0
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 8c9466b1c568..1fc1efa205e1 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_WW8STTBF_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8STTBF_HXX
 
+#include <memory>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
 #include <tools/solar.h>
 #include <rtl/ustring.hxx>
@@ -55,7 +55,7 @@ typedef ::std::vector<OUString> StringVector_t;
     template <class T>
     class WW8Sttb : public WW8Struct
     {
-        typedef ::boost::shared_ptr< void > ExtraPointer_t;
+        typedef std::shared_ptr< void > ExtraPointer_t;
         typedef ::std::vector< ExtraPointer_t > ExtrasVector_t;
         bool bDoubleByteCharacters;
         StringVector_t m_Strings;
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 29fde60af4b1..06454cff01a5 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_SW_SOURCE_FILTER_WW8_WW8TABLEINFO_HXX
 #include <string>
 #include <map>
+#include <memory>
 #include <set>
 #include <functional>
-#include <boost/shared_ptr.hpp>
 #include <unordered_map>
 #include <vector>
 #include <sal/types.h>
@@ -41,13 +41,13 @@ const unsigned int MAXTABLECELLS = 63;
 
 class WW8TableNodeInfo;
 typedef ::std::vector<const SwTableBox *> TableBoxVector;
-typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr;
+typedef std::shared_ptr<TableBoxVector> TableBoxVectorPtr;
 typedef ::std::vector<sal_uInt32> GridCols;
-typedef boost::shared_ptr<GridCols> GridColsPtr;
+typedef std::shared_ptr<GridCols> GridColsPtr;
 typedef ::std::vector<sal_Int32> RowSpans;
-typedef boost::shared_ptr<RowSpans> RowSpansPtr;
+typedef std::shared_ptr<RowSpans> RowSpansPtr;
 typedef ::std::vector<sal_uInt32> Widths;
-typedef boost::shared_ptr<Widths> WidthsPtr;
+typedef std::shared_ptr<Widths> WidthsPtr;
 
 class WW8TableNodeInfoInner
 {
@@ -67,7 +67,7 @@ class WW8TableNodeInfoInner
     SwRect maRect;
 
 public:
-    typedef boost::shared_ptr<WW8TableNodeInfoInner> Pointer_t;
+    typedef std::shared_ptr<WW8TableNodeInfoInner> Pointer_t;
 
     explicit WW8TableNodeInfoInner(WW8TableNodeInfo * pParent);
     ~WW8TableNodeInfoInner();
@@ -177,7 +177,7 @@ private:
     const SwNode * mpNextNode;
 
 public:
-    typedef boost::shared_ptr<WW8TableNodeInfo> Pointer_t;
+    typedef std::shared_ptr<WW8TableNodeInfo> Pointer_t;
 
     WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTextNode);
     virtual ~WW8TableNodeInfo();
@@ -232,13 +232,13 @@ struct hashTable
 
 class WW8TableCellGridRow
 {
-    boost::shared_ptr<CellInfoMultiSet> m_pCellInfos;
+    std::shared_ptr<CellInfoMultiSet> m_pCellInfos;
     TableBoxVectorPtr m_pTableBoxVector;
     WidthsPtr m_pWidths;
     RowSpansPtr m_pRowSpans;
 
 public:
-    typedef boost::shared_ptr<WW8TableCellGridRow> Pointer_t;
+    typedef std::shared_ptr<WW8TableCellGridRow> Pointer_t;
     WW8TableCellGridRow();
     ~WW8TableCellGridRow();
 
@@ -270,7 +270,7 @@ class WW8TableCellGrid
     CellInfoMultiSet::const_iterator getCellsEnd(long nTop);
 
 public:
-    typedef ::boost::shared_ptr<WW8TableCellGrid> Pointer_t;
+    typedef std::shared_ptr<WW8TableCellGrid> Pointer_t;
 
     WW8TableCellGrid();
     ~WW8TableCellGrid();
@@ -336,7 +336,7 @@ class WW8TableInfo
                                                     bool bCreate = true);
 
 public:
-    typedef boost::shared_ptr<WW8TableInfo> Pointer_t;
+    typedef std::shared_ptr<WW8TableInfo> Pointer_t;
 
     WW8TableInfo();
     virtual ~WW8TableInfo();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index d3ccb5a0c791..58ae8c6ca9a3 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -450,7 +450,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
 {
     // write the paragraph properties + the run, already in the correct order
     m_pSerializer->mergeTopMarks(Tag_StartParagraph_2);
-    std::vector<  boost::shared_ptr <sw::Frame> > aFramePrTextbox;
+    std::vector<  std::shared_ptr <sw::Frame> > aFramePrTextbox;
     // Write the anchored frame if any
     // Word can't handle nested text boxes, so write them on the same level.
     ++m_nTextFrameLevel;
@@ -526,7 +526,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
             }
             else
             {
-                ::boost::shared_ptr<sw::Frame>  pFramePr;
+                std::shared_ptr<sw::Frame>  pFramePr;
                 pFramePr.reset(new sw::Frame(aFrame));
                 aFramePrTextbox.push_back(pFramePr);
             }
@@ -585,7 +585,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
     // Write framePr
     if(!aFramePrTextbox.empty())
     {
-        for (std::vector< boost::shared_ptr<sw::Frame> > ::iterator it = aFramePrTextbox.begin() ; it != aFramePrTextbox.end(); ++it)
+        for (std::vector< std::shared_ptr<sw::Frame> > ::iterator it = aFramePrTextbox.begin() ; it != aFramePrTextbox.end(); ++it)
         {
             DocxTableExportContext aTableExportContext;
             pushToTableExportContext(aTableExportContext);
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6479726f0e64..cc68dcb12fad 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -896,7 +896,7 @@ private:
 
     PageMargins m_pageMargins;
 
-    boost::shared_ptr<DocxTableStyleExport> m_pTableStyleExport;
+    std::shared_ptr<DocxTableStyleExport> m_pTableStyleExport;
     // flag to check if auto spacing was set in original file
     bool m_bParaBeforeAutoSpacing,m_bParaAfterAutoSpacing;
     // store hardcoded value which was set during import.
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index c1e4427dda47..8acf8a68726d 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -84,7 +84,7 @@ private:
     virtual SvStream*   ImplQueryPictureStream() SAL_OVERRIDE;
 
 private:
-    boost::shared_ptr< SvStream > mxPicStrm;
+    std::shared_ptr< SvStream > mxPicStrm;
 };
 
 class SwBasicEscherEx : public EscherEx
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 9894af6de708..da762b77a132 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1737,7 +1737,7 @@ bool WW8_WrPlcSepx::WriteKFText( WW8Export& rWrt )
 
     for ( size_t i = 0; i < aSects.size(); ++i )
     {
-        ::boost::shared_ptr<WW8_PdAttrDesc> const pAttrDesc(new WW8_PdAttrDesc);
+        std::shared_ptr<WW8_PdAttrDesc> const pAttrDesc(new WW8_PdAttrDesc);
         m_SectionAttributes.push_back(pAttrDesc);
 
         WW8_SepInfo& rSepInfo = aSects[i];
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 5f63e60e0e03..4fbc1cb74242 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -237,7 +237,7 @@ public:
 class WW8_WrPlcSepx : public MSWordSections
 {
     std::vector<WW8_CP> aCps;
-    ::std::vector< ::boost::shared_ptr<WW8_PdAttrDesc> > m_SectionAttributes;
+    ::std::vector< std::shared_ptr<WW8_PdAttrDesc> > m_SectionAttributes;
     // hack to prevent adding sections in endnotes
     bool m_bHeaderFooterWritten;
     WW8_WrPlc0* pTextPos;        // Position of the headers/footers
@@ -462,7 +462,7 @@ public:
     std::stack< sal_Int32 > m_aCurrentCharPropStarts; ///< To remember the position in a run.
     WW8_WrtBookmarks* m_pBkmks;
     WW8_WrtRedlineAuthor* m_pRedlAuthors;
-    boost::shared_ptr<NfKeywordTable> m_pKeyMap;
+    std::shared_ptr<NfKeywordTable> m_pKeyMap;
     SvxMSExportOLEObjects* m_pOLEExp;
     SwMSConvertControls* m_pOCXExp;
     WW8OleMap m_aOleMap;    // To remember all already exported ole objects
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 7187bfe1e6a7..197d161af9c5 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1258,9 +1258,9 @@ private:
     SwMSDffManager* m_pMSDffManager;
 
     std::vector<OUString>* m_pAtnNames;
-    boost::shared_ptr< std::map<sal_uInt32, int> > m_pAtnIndexes;
-    boost::shared_ptr<WW8PLCFspecial> m_pAtnStarts;
-    boost::shared_ptr<WW8PLCFspecial> m_pAtnEnds;
+    std::shared_ptr< std::map<sal_uInt32, int> > m_pAtnIndexes;
+    std::shared_ptr<WW8PLCFspecial> m_pAtnStarts;
+    std::shared_ptr<WW8PLCFspecial> m_pAtnEnds;
 
     sw::util::AuthorInfos m_aAuthorInfos;
     OUString m_sBaseURL;
@@ -1363,7 +1363,7 @@ private:
     int m_nIdctHint;
     bool m_bBidi;
     bool m_bReadTable;
-    boost::shared_ptr<SwPaM> m_pTableEndPaM;
+    std::shared_ptr<SwPaM> m_pTableEndPaM;
     // Indicate that currently on loading a TOC, managed by Read_F_TOX() and End_Field()
     bool m_bLoadingTOXCache;
     int m_nEmbeddedTOXLevel;