From 47d3e82e4f2c0c06231c952a0cc2456b712da0cc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 12 Sep 2015 12:21:12 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9b4f884c6313a53fea543ea6f93175205351ad14 Reviewed-on: https://gerrit.libreoffice.org/18517 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/core/doc/tblrwcl.cxx | 10 ++++------ sw/source/filter/html/htmlgrin.cxx | 1 - sw/source/filter/html/htmltab.cxx | 16 ++++++++-------- sw/source/filter/ww8/WW8Sttbf.hxx | 4 ++-- sw/source/filter/ww8/WW8TableInfo.hxx | 22 +++++++++++----------- sw/source/filter/ww8/docxattributeoutput.cxx | 6 +++--- sw/source/filter/ww8/docxattributeoutput.hxx | 2 +- sw/source/filter/ww8/escher.hxx | 2 +- sw/source/filter/ww8/wrtw8sty.cxx | 2 +- sw/source/filter/ww8/wrtww8.hxx | 4 ++-- sw/source/filter/ww8/ww8par.hxx | 8 ++++---- sw/source/ui/vba/vbalisthelper.hxx | 3 +-- sw/source/uibase/inc/FrameControlsManager.hxx | 4 ++-- sw/source/uibase/uiview/formatclipboard.cxx | 7 +++---- 14 files changed, 43 insertions(+), 48 deletions(-) (limited to 'sw/source') diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 40831462789f..d96864db5114 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -56,8 +56,6 @@ #include #include #include -#include -#include #include #include @@ -249,7 +247,7 @@ typedef o3tl::sorted_vector<_CpyTabFrm> _CpyTabFrms; struct _CpyPara { - boost::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths; + std::shared_ptr< std::vector< std::vector< sal_uLong > > > pWidths; SwDoc* pDoc; SwTableNode* pTableNd; _CpyTabFrms& rTabFrmArr; @@ -1736,7 +1734,7 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, _CpyPara& rPara) const size_t nLineCount = rFndLines.size(); if( nLineCount ) { - rPara.pWidths = boost::shared_ptr< std::vector< std::vector< sal_uLong > > > + rPara.pWidths = std::shared_ptr< std::vector< std::vector< sal_uLong > > > ( new std::vector< std::vector< sal_uLong > >( nLineCount )); // First we collect information about the left/right borders of all // selected cells @@ -3385,7 +3383,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, const SwFormatFrmSize& rSz = GetFrameFormat()->GetFrmSize(); const SvxLRSpaceItem& rLR = GetFrameFormat()->GetLRSpace(); - boost::scoped_ptr<_FndBox> xFndBox; // for insertion/deletion + std::unique_ptr<_FndBox> xFndBox; // for insertion/deletion SwTableSortBoxes aTmpLst; // for Undo bool bBigger, bRet = false, @@ -4120,7 +4118,7 @@ bool SwTable::SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, while( pBaseLine->GetUpper() ) pBaseLine = pBaseLine->GetUpper()->GetUpper(); - boost::scoped_ptr<_FndBox> xFndBox; // for insertion/deletion + std::unique_ptr<_FndBox> xFndBox; // for insertion/deletion SwTableSortBoxes aTmpLst; // for Undo bool bBigger, bRet = false, 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 #include #include -#include #include #include 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 m_pBoxItem; + std::shared_ptr 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 const& rBoxItem, + std::shared_ptr 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 GetBoxItem() const { return m_pBoxItem; } + std::shared_ptr 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 const& rBoxItem, + std::shared_ptr 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 const& rBoxItem, + std::shared_ptr 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 pBoxItem; + std::shared_ptr 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 const& rBoxItem, + std::shared_ptr 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 m_pBoxItem; + std::shared_ptr 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 #include -#include #include #include #include @@ -55,7 +55,7 @@ typedef ::std::vector StringVector_t; template 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 #include +#include #include #include -#include #include #include #include @@ -41,13 +41,13 @@ const unsigned int MAXTABLECELLS = 63; class WW8TableNodeInfo; typedef ::std::vector TableBoxVector; -typedef boost::shared_ptr TableBoxVectorPtr; +typedef std::shared_ptr TableBoxVectorPtr; typedef ::std::vector GridCols; -typedef boost::shared_ptr GridColsPtr; +typedef std::shared_ptr GridColsPtr; typedef ::std::vector RowSpans; -typedef boost::shared_ptr RowSpansPtr; +typedef std::shared_ptr RowSpansPtr; typedef ::std::vector Widths; -typedef boost::shared_ptr WidthsPtr; +typedef std::shared_ptr WidthsPtr; class WW8TableNodeInfoInner { @@ -67,7 +67,7 @@ class WW8TableNodeInfoInner SwRect maRect; public: - typedef boost::shared_ptr Pointer_t; + typedef std::shared_ptr Pointer_t; explicit WW8TableNodeInfoInner(WW8TableNodeInfo * pParent); ~WW8TableNodeInfoInner(); @@ -177,7 +177,7 @@ private: const SwNode * mpNextNode; public: - typedef boost::shared_ptr Pointer_t; + typedef std::shared_ptr Pointer_t; WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTextNode); virtual ~WW8TableNodeInfo(); @@ -232,13 +232,13 @@ struct hashTable class WW8TableCellGridRow { - boost::shared_ptr m_pCellInfos; + std::shared_ptr m_pCellInfos; TableBoxVectorPtr m_pTableBoxVector; WidthsPtr m_pWidths; RowSpansPtr m_pRowSpans; public: - typedef boost::shared_ptr Pointer_t; + typedef std::shared_ptr Pointer_t; WW8TableCellGridRow(); ~WW8TableCellGridRow(); @@ -270,7 +270,7 @@ class WW8TableCellGrid CellInfoMultiSet::const_iterator getCellsEnd(long nTop); public: - typedef ::boost::shared_ptr Pointer_t; + typedef std::shared_ptr Pointer_t; WW8TableCellGrid(); ~WW8TableCellGrid(); @@ -336,7 +336,7 @@ class WW8TableInfo bool bCreate = true); public: - typedef boost::shared_ptr Pointer_t; + typedef std::shared_ptr 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 > aFramePrTextbox; + std::vector< std::shared_ptr > 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 pFramePr; + std::shared_ptr 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 > ::iterator it = aFramePrTextbox.begin() ; it != aFramePrTextbox.end(); ++it) + for (std::vector< std::shared_ptr > ::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 m_pTableStyleExport; + std::shared_ptr 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 const pAttrDesc(new WW8_PdAttrDesc); + std::shared_ptr 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 aCps; - ::std::vector< ::boost::shared_ptr > m_SectionAttributes; + ::std::vector< std::shared_ptr > 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 m_pKeyMap; + std::shared_ptr 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* m_pAtnNames; - boost::shared_ptr< std::map > m_pAtnIndexes; - boost::shared_ptr m_pAtnStarts; - boost::shared_ptr m_pAtnEnds; + std::shared_ptr< std::map > m_pAtnIndexes; + std::shared_ptr m_pAtnStarts; + std::shared_ptr 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 m_pTableEndPaM; + std::shared_ptr m_pTableEndPaM; // Indicate that currently on loading a TOC, managed by Read_F_TOX() and End_Field() bool m_bLoadingTOXCache; int m_nEmbeddedTOXLevel; diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index 24f2bf56125d..88a773ec340c 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -13,10 +13,9 @@ #include #include #include -#include class SwVbaListHelper; -typedef ::boost::shared_ptr< SwVbaListHelper > SwVbaListHelperRef; +typedef std::shared_ptr< SwVbaListHelper > SwVbaListHelperRef; class SwVbaListHelper { diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx index e87124b64be5..0d9c726955c8 100644 --- a/sw/source/uibase/inc/FrameControlsManager.hxx +++ b/sw/source/uibase/inc/FrameControlsManager.hxx @@ -12,16 +12,16 @@ #include #include -#include #include #include +#include #include class SwPageFrm; class SwEditWin; -typedef boost::shared_ptr< SwFrameControl > SwFrameControlPtr; +typedef std::shared_ptr< SwFrameControl > SwFrameControlPtr; typedef std::map SwFrameControlPtrMap; diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx index df1da591c45d..c6808fe5d43e 100644 --- a/sw/source/uibase/uiview/formatclipboard.cxx +++ b/sw/source/uibase/uiview/formatclipboard.cxx @@ -35,7 +35,6 @@ #include #include #include -#include namespace { @@ -413,7 +412,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP rWrtShell.EndAction(); } -typedef boost::shared_ptr< SfxPoolItem > SfxPoolItemSharedPtr; +typedef std::shared_ptr< SfxPoolItem > SfxPoolItemSharedPtr; typedef std::vector< SfxPoolItemSharedPtr > ItemVector; // collect all PoolItems from the applied styles static void lcl_AppendSetItems( ItemVector& rItemVector, const SfxItemSet& rStyleAttrSet ) @@ -510,7 +509,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo if ( m_pItemSet_ParAttr && m_pItemSet_ParAttr->Count() != 0 && !bNoParagraphFormats ) { // temporary SfxItemSet - boost::scoped_ptr pTemplateItemSet(lcl_CreateEmptyItemSet( + std::unique_ptr pTemplateItemSet(lcl_CreateEmptyItemSet( nSelectionType, *m_pItemSet_ParAttr->GetPool())); // no need to verify the existence of pTemplateItemSet as we // know that here the selection type is SEL_TXT @@ -543,7 +542,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo else { // temporary SfxItemSet - boost::scoped_ptr pTemplateItemSet(lcl_CreateEmptyItemSet( + std::unique_ptr pTemplateItemSet(lcl_CreateEmptyItemSet( nSelectionType, *m_pItemSet_TextAttr->GetPool(), true )); if(pTemplateItemSet) -- cgit