diff options
Diffstat (limited to 'sw')
135 files changed, 484 insertions, 484 deletions
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx index e0e1679814ac..e8573e59879f 100644 --- a/sw/inc/IDocumentListItems.hxx +++ b/sw/inc/IDocumentListItems.hxx @@ -29,7 +29,7 @@ class SwNodeNum; class IDocumentListItems { public: - typedef ::std::vector< const SwNodeNum* > tSortedNodeNumList; + typedef std::vector< const SwNodeNum* > tSortedNodeNumList; virtual void addListItem( const SwNodeNum& rNodeNum ) = 0; virtual void removeListItem( const SwNodeNum& rNodeNum ) = 0; diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index a0bdeb6a8fac..6bd844d0c59f 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -51,7 +51,7 @@ class IDocumentMarkAccess }; typedef std::shared_ptr< ::sw::mark::IMark> pMark_t; - typedef ::std::vector< pMark_t > container_t; + typedef std::vector< pMark_t > container_t; typedef container_t::iterator iterator_t; typedef container_t::const_iterator const_iterator_t; typedef container_t::const_reverse_iterator const_reverse_iterator_t; @@ -170,7 +170,7 @@ class IDocumentMarkAccess virtual void deleteMarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, - ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, // Ugly: SaveBookmark is core-internal + std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, // Ugly: SaveBookmark is core-internal const SwIndex* pSttIdx, const SwIndex* pEndIdx) =0; diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx index 5803f7077482..f4aa9b2fb259 100644 --- a/sw/inc/IDocumentOutlineNodes.hxx +++ b/sw/inc/IDocumentOutlineNodes.hxx @@ -30,7 +30,7 @@ class SwTextNode; class IDocumentOutlineNodes { public: - typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList; + typedef std::vector< const SwTextNode* > tSortedOutlineNodeList; virtual sal_Int32 getOutlineNodesCount() const = 0; diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx index a132b6a3c0a4..9ae6fb81d486 100644 --- a/sw/inc/IMark.hxx +++ b/sw/inc/IMark.hxx @@ -98,7 +98,7 @@ namespace sw { namespace mark IFieldmark() = default; public: - typedef ::std::map< OUString, css::uno::Any> parameter_map_t; + typedef std::map< OUString, css::uno::Any> parameter_map_t; //getters virtual OUString GetFieldname() const =0; virtual OUString GetFieldHelptext() const =0; diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index d4fd06e72ff8..2c34d80eb088 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -82,7 +82,7 @@ class SwStyleNameMapper protected: // UI Name tables - static ::std::vector<OUString> *m_pTextUINameArray, + static std::vector<OUString> *m_pTextUINameArray, *m_pListsUINameArray, *m_pExtraUINameArray, *m_pRegisterUINameArray, @@ -173,33 +173,33 @@ public: const OUString& rExtraUIName); static const OUString GetSpecialExtraUIName(const OUString& rExtraProgName); - static const ::std::vector<OUString>& GetTextUINameArray(); - static const ::std::vector<OUString>& GetListsUINameArray(); - static const ::std::vector<OUString>& GetExtraUINameArray(); - static const ::std::vector<OUString>& GetRegisterUINameArray(); - static const ::std::vector<OUString>& GetDocUINameArray(); - static const ::std::vector<OUString>& GetHTMLUINameArray(); - static const ::std::vector<OUString>& GetFrameFormatUINameArray(); - static const ::std::vector<OUString>& GetChrFormatUINameArray(); - static const ::std::vector<OUString>& GetHTMLChrFormatUINameArray(); - static const ::std::vector<OUString>& GetPageDescUINameArray(); - static const ::std::vector<OUString>& GetNumRuleUINameArray(); - static const ::std::vector<OUString>& GetTableStyleUINameArray(); - static const ::std::vector<OUString>& GetCellStyleUINameArray(); - - static const ::std::vector<OUString>& GetTextProgNameArray(); - static const ::std::vector<OUString>& GetListsProgNameArray(); - static const ::std::vector<OUString>& GetExtraProgNameArray(); - static const ::std::vector<OUString>& GetRegisterProgNameArray(); - static const ::std::vector<OUString>& GetDocProgNameArray(); - static const ::std::vector<OUString>& GetHTMLProgNameArray(); - static const ::std::vector<OUString>& GetFrameFormatProgNameArray(); - static const ::std::vector<OUString>& GetChrFormatProgNameArray(); - static const ::std::vector<OUString>& GetHTMLChrFormatProgNameArray(); - static const ::std::vector<OUString>& GetPageDescProgNameArray(); - static const ::std::vector<OUString>& GetNumRuleProgNameArray(); - static const ::std::vector<OUString>& GetTableStyleProgNameArray(); - static const ::std::vector<OUString>& GetCellStyleProgNameArray(); + static const std::vector<OUString>& GetTextUINameArray(); + static const std::vector<OUString>& GetListsUINameArray(); + static const std::vector<OUString>& GetExtraUINameArray(); + static const std::vector<OUString>& GetRegisterUINameArray(); + static const std::vector<OUString>& GetDocUINameArray(); + static const std::vector<OUString>& GetHTMLUINameArray(); + static const std::vector<OUString>& GetFrameFormatUINameArray(); + static const std::vector<OUString>& GetChrFormatUINameArray(); + static const std::vector<OUString>& GetHTMLChrFormatUINameArray(); + static const std::vector<OUString>& GetPageDescUINameArray(); + static const std::vector<OUString>& GetNumRuleUINameArray(); + static const std::vector<OUString>& GetTableStyleUINameArray(); + static const std::vector<OUString>& GetCellStyleUINameArray(); + + static const std::vector<OUString>& GetTextProgNameArray(); + static const std::vector<OUString>& GetListsProgNameArray(); + static const std::vector<OUString>& GetExtraProgNameArray(); + static const std::vector<OUString>& GetRegisterProgNameArray(); + static const std::vector<OUString>& GetDocProgNameArray(); + static const std::vector<OUString>& GetHTMLProgNameArray(); + static const std::vector<OUString>& GetFrameFormatProgNameArray(); + static const std::vector<OUString>& GetChrFormatProgNameArray(); + static const std::vector<OUString>& GetHTMLChrFormatProgNameArray(); + static const std::vector<OUString>& GetPageDescProgNameArray(); + static const std::vector<OUString>& GetNumRuleProgNameArray(); + static const std::vector<OUString>& GetTableStyleProgNameArray(); + static const std::vector<OUString>& GetCellStyleProgNameArray(); }; #endif // _NAME_MAPPER_HXX diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 412b419edbb1..71d4886a4610 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -348,7 +348,7 @@ class SW_DLLPUBLIC SwDoc : /// Cell Styles not assigned to a Table Style std::unique_ptr<SwCellStyleTable> mpCellStyles; private: - ::std::unique_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry; + std::unique_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry; // other diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 56a756865c41..2e9355c8d935 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -166,7 +166,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener sal_uInt32 nLastPos; bool bFirstCalled; - void AppendStyleList(const ::std::vector<OUString>& rLst, + void AppendStyleList(const std::vector<OUString>& rLst, bool bUsed, bool bTestHidden, bool bOnlyHidden, diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index c66cb9a7da42..bd68cb12ad5e 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -769,10 +769,10 @@ public: void GetConnectableFrameFormats (SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors, - ::std::vector< OUString > & aPrevPageVec, - ::std::vector< OUString > & aThisPageVec, - ::std::vector< OUString > & aNextPageVec, - ::std::vector< OUString > & aRestVec); + std::vector< OUString > & aPrevPageVec, + std::vector< OUString > & aThisPageVec, + std::vector< OUString > & aNextPageVec, + std::vector< OUString > & aRestVec); /** SwFEShell::GetShapeBackgrd diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index d660f9973153..1ac8c050b3c5 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -194,7 +194,7 @@ public: class SW_DLLPUBLIC MetaFieldManager { private: - typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t; + typedef std::vector< std::weak_ptr<MetaField> > MetaFieldList_t; MetaFieldList_t m_MetaFields; /// Document properties of a clipboard document, empty for non-clipboard documents. css::uno::Reference<css::document::XDocumentProperties> m_xDocumentProperties; @@ -209,7 +209,7 @@ public: const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); /// get all meta fields - ::std::vector< css::uno::Reference<css::text::XTextField> > getMetaFields(); + std::vector< css::uno::Reference<css::text::XTextField> > getMetaFields(); /// Copy document properties from rSource to m_xDocumentProperties. void copyDocumentProperties(const SwDoc& rSource); const css::uno::Reference<css::document::XDocumentProperties>& getDocumentProperties(); diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 39078e7f627f..abbf27e53a7b 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -135,8 +135,8 @@ protected: public: ~SwNodes(); - typedef ::std::vector<SwNodeRange> NodeRanges_t; - typedef ::std::vector<NodeRanges_t> TableRanges_t; + typedef std::vector<SwNodeRange> NodeRanges_t; + typedef std::vector<NodeRanges_t> TableRanges_t; SwNodePtr operator[]( sal_uLong n ) const; // defined in node.hxx diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 14d189e39d42..2abdf1149e40 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -110,7 +110,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable /// pointer to the list, to whose the text node is added to SwList* mpList; - ::std::unique_ptr< OUString > m_pNumStringCache; + std::unique_ptr< OUString > m_pNumStringCache; css::uno::WeakReference<css::text::XTextContent> m_wXParagraph; @@ -385,7 +385,7 @@ public: @param nWhich only attributes with this id are returned. @param eMode the predicate for matching (@see GetTextAttrMode). */ - ::std::vector<SwTextAttr *> GetTextAttrsAt( + std::vector<SwTextAttr *> GetTextAttrsAt( sal_Int32 const nIndex, RES_TXTATR const nWhich ) const; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index ebd19461cc42..dd1ceae91f47 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -361,7 +361,7 @@ class SW_DLLPUBLIC Writer void AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ); void AddFontItems_( SfxItemPool& rPool, sal_uInt16 nWhichId ); - ::std::unique_ptr<Writer_Impl> m_pImpl; + std::unique_ptr<Writer_Impl> m_pImpl; Writer(Writer const&) = delete; Writer& operator=(Writer const&) = delete; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 309f7e34b259..665d7ff86276 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -490,7 +490,7 @@ class SwCellFrame; class SW_DLLPUBLIC SwTableCellInfo { struct Impl; - ::std::unique_ptr<Impl> m_pImpl; + std::unique_ptr<Impl> m_pImpl; const SwCellFrame * getCellFrame() const; diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index 5c5f197fe53b..26170310c1fe 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> -typedef ::std::vector< OUString > SwUndoComments_t; +typedef std::vector< OUString > SwUndoComments_t; // The IDs for StdActions. enum SwUndoId diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 4e50bb39e674..f49fc29babdc 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -43,7 +43,7 @@ class SwTable; class SwUndoTableMerge; class SwCellFrame; -typedef ::std::deque< SwCellFrame* > SwCellFrames; +typedef std::deque< SwCellFrame* > SwCellFrames; struct CompareSwSelBoxes { diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index d83db238ecc5..79d890cf022a 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -221,7 +221,7 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent { SwTextFormatColl *pTextFormatColl, *pLastNdColl; std::vector<SwFrameFormat*>* pFrameFormats; - ::std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos; + std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos; SwRedlineData* pRedlData; bool bSttWasTextNd; protected: diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 367af0c47b23..119bccb77875 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -101,7 +101,7 @@ namespace sw { }; /// Smart pointer class ensuring that the pointed object is deleted with a locked SolarMutex. template<typename T> - using UnoImplPtr = ::std::unique_ptr<T, UnoImplPtrDeleter<T> >; + using UnoImplPtr = std::unique_ptr<T, UnoImplPtrDeleter<T> >; template< class C > C * UnoTunnelGetImplementation( css::uno::Reference< css::lang::XUnoTunnel > const & xUnoTunnel) diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 8ab856777a4a..7fc6b2dedaaf 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -442,7 +442,7 @@ public: virtual Pointer getPointer() override; // css::tiledrendering::XTiledRenderable - virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) override; void Invalidate(); void Reactivate(SwDocShell* pNewDocShell); diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index aafafd8278d4..b4beb8c5d77d 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -283,7 +283,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap, const SwRect& rVisArea, const SwFrame& rFrame, - ::std::list< SwAccessibleChild >& rChildren, + std::list< SwAccessibleChild >& rChildren, bool bInPagePreview ) { if( SwAccessibleChildMap::IsSortingRequired( rFrame ) ) @@ -471,7 +471,7 @@ sw::access::SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( } void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap, - ::std::list< sw::access::SwAccessibleChild >& rChildren ) const + std::list< sw::access::SwAccessibleChild >& rChildren ) const { GetChildren( rAccMap, maVisArea, *mpFrame, rChildren, IsInPagePreview() ); } diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx index 337ecb310ada..8a4ef379a441 100644 --- a/sw/source/core/access/accframe.hxx +++ b/sw/source/core/access/accframe.hxx @@ -73,7 +73,7 @@ protected: static void GetChildren( SwAccessibleMap& rAccMap, const SwRect& rVisArea, const SwFrame& rFrame, - ::std::list< sw::access::SwAccessibleChild >& rChildren, + std::list< sw::access::SwAccessibleChild >& rChildren, bool bInPagePreview ); bool IsEditable( SwViewShell *pVSh ) const; @@ -132,7 +132,7 @@ protected: sw::access::SwAccessibleChild GetChildAtPixel( const Point& rPos, SwAccessibleMap& rAccMap ) const; void GetChildren( SwAccessibleMap& rAccMap, - ::std::list< sw::access::SwAccessibleChild >& rChildren ) const; + std::list< sw::access::SwAccessibleChild >& rChildren ) const; inline void SetVisArea( const SwRect& rNewVisArea ) { diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx index fc492a770e7a..28511ab4b3b7 100644 --- a/sw/source/core/access/accfrmobjmap.cxx +++ b/sw/source/core/access/accfrmobjmap.cxx @@ -123,7 +123,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, } } -::std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert( +std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert( const sal_uInt32 nPos, const SwAccessibleChildMapKey::LayerId eLayerId, const SwAccessibleChild& rLower ) @@ -133,7 +133,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, return insert( aEntry ); } -::std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert( +std::pair< SwAccessibleChildMap::iterator, bool > SwAccessibleChildMap::insert( const SdrObject *pObj, const SwAccessibleChild& rLower ) { diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx index 84c113a52c01..819c3313ce16 100644 --- a/sw/source/core/access/accfrmobjmap.hxx +++ b/sw/source/core/access/accfrmobjmap.hxx @@ -68,9 +68,9 @@ public: /* MT: Need to get this position parameter stuff in dev300 somehow... //This methods are used to insert an object to the map, adding a position parameter. - ::std::pair< iterator, bool > insert( sal_uInt32 nOrd, Point nPos, + std::pair< iterator, bool > insert( sal_uInt32 nOrd, Point nPos, const SwFrameOrObj& rLower ); - ::std::pair< iterator, bool > insert( const SdrObject *pObj, + std::pair< iterator, bool > insert( const SdrObject *pObj, const SwFrameOrObj& rLower, const SwDoc *pDoc, Point nPos); @@ -99,10 +99,10 @@ private: const SdrLayerID nControlsId; std::map<key_type,mapped_type,key_compare> maMap; - ::std::pair< iterator, bool > insert( const sal_uInt32 nPos, + std::pair< iterator, bool > insert( const sal_uInt32 nPos, const SwAccessibleChildMapKey::LayerId eLayerId, const sw::access::SwAccessibleChild& rLower ); - ::std::pair< iterator, bool > insert( const SdrObject* pObj, + std::pair< iterator, bool > insert( const SdrObject* pObj, const sw::access::SwAccessibleChild& rLower ); public: diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx index 1a0272936ada..ea1d349371ee 100644 --- a/sw/source/core/access/acchypertextdata.hxx +++ b/sw/source/core/access/acchypertextdata.hxx @@ -34,7 +34,7 @@ public: typedef const SwTextAttr * key_type; typedef css::uno::WeakReference< css::accessibility::XAccessibleHyperlink > mapped_type; typedef std::pair<const key_type,mapped_type> value_type; - typedef ::std::less< const SwTextAttr * > key_compare; + typedef std::less< const SwTextAttr * > key_compare; typedef std::map<key_type,mapped_type,key_compare>::iterator iterator; private: std::map<key_type,mapped_type,key_compare> maMap; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 4c2aaaec4698..2f902ad2dedc 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -212,7 +212,7 @@ struct SwShapeFunc return p1 < p2; } }; -typedef ::std::pair < const SdrObject *, ::rtl::Reference < ::accessibility::AccessibleShape > > SwAccessibleObjShape_Impl; +typedef std::pair < const SdrObject *, ::rtl::Reference < ::accessibility::AccessibleShape > > SwAccessibleObjShape_Impl; class SwAccessibleShapeMap_Impl { @@ -498,7 +498,7 @@ public: } }; -class SwAccessibleEventList_Impl: public ::std::list < SwAccessibleEvent_Impl > +class SwAccessibleEventList_Impl: public std::list < SwAccessibleEvent_Impl > { bool mbFiring; @@ -555,7 +555,7 @@ void SwAccessibleEventList_Impl::MoveMissingXAccToEnd() // shape) leads to an assert, because a client of the Modify is destroyed // within a Modify call. -class SwShapeList_Impl: public ::std::list < uno::Reference < drawing::XShape > > +class SwShapeList_Impl: public std::list < uno::Reference < drawing::XShape > > { public: SwShapeList_Impl() {} @@ -782,7 +782,7 @@ void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, // find proper rectangle Rectangles::const_iterator aBegin = maLogicRects.begin(); Rectangles::const_iterator aEnd = maLogicRects.end(); - Rectangles::const_iterator aFound = ::std::find_if( aBegin, aEnd, + Rectangles::const_iterator aFound = std::find_if( aBegin, aEnd, ContainsPredicate( rPoint ) ); if( aFound != aEnd ) diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index beef3e26026a..d497cfeff90a 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1903,7 +1903,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( else { const OUString* aRequestedAttrIter = - ::std::find( aRequestedAttributes.begin(), aRequestedAttributes.end(), sMMToPixelRatio ); + std::find( aRequestedAttributes.begin(), aRequestedAttributes.end(), sMMToPixelRatio ); if ( aRequestedAttrIter != aRequestedAttributes.end() ) bProvideMMToPixelRatio = true; } diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 8827404d44a5..dccc35d720c5 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -185,11 +185,11 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) SwFEShell* pFEShell = GetFEShell(); if( pFEShell ) { - ::std::list< SwAccessibleChild > aChildren; + std::list< SwAccessibleChild > aChildren; m_rContext.GetChildren( *(m_rContext.GetMap()), aChildren ); - ::std::list< SwAccessibleChild >::const_iterator aIter = aChildren.begin(); - ::std::list< SwAccessibleChild >::const_iterator aEndIter = aChildren.end(); + std::list< SwAccessibleChild >::const_iterator aIter = aChildren.begin(); + std::list< SwAccessibleChild >::const_iterator aEndIter = aChildren.end(); while( aIter != aEndIter ) { const SwAccessibleChild& rChild = *aIter; @@ -227,12 +227,12 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) const size_t nSelObjs = pFEShell->IsObjSelected(); if( nSelObjs > 0 ) { - ::std::list< SwAccessibleChild > aChildren; + std::list< SwAccessibleChild > aChildren; m_rContext.GetChildren( *(m_rContext.GetMap()), aChildren ); - ::std::list< SwAccessibleChild >::const_iterator aIter = + std::list< SwAccessibleChild >::const_iterator aIter = aChildren.begin(); - ::std::list< SwAccessibleChild >::const_iterator aEndIter = + std::list< SwAccessibleChild >::const_iterator aEndIter = aChildren.end(); while( aIter != aEndIter && static_cast<size_t>(nCount) < nSelObjs ) { @@ -252,11 +252,11 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) //we should check whether it is selected in the selection cursor. if( nCount == 0 ) { - ::std::list< SwAccessibleChild > aChildren; + std::list< SwAccessibleChild > aChildren; m_rContext.GetChildren( *(m_rContext.GetMap()), aChildren ); - ::std::list< SwAccessibleChild >::const_iterator aIter = + std::list< SwAccessibleChild >::const_iterator aIter = aChildren.begin(); - ::std::list< SwAccessibleChild >::const_iterator aEndIter = + std::list< SwAccessibleChild >::const_iterator aEndIter = aChildren.end(); while( aIter != aEndIter ) { @@ -316,11 +316,11 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( if( 0 == nSelObjs || static_cast<size_t>(nSelectedChildIndex) >= nSelObjs ) throwIndexOutOfBoundsException(); - ::std::list< SwAccessibleChild > aChildren; + std::list< SwAccessibleChild > aChildren; m_rContext.GetChildren( *(m_rContext.GetMap()), aChildren ); - ::std::list< SwAccessibleChild >::const_iterator aIter = aChildren.begin(); - ::std::list< SwAccessibleChild >::const_iterator aEndIter = aChildren.end(); + std::list< SwAccessibleChild >::const_iterator aIter = aChildren.begin(); + std::list< SwAccessibleChild >::const_iterator aEndIter = aChildren.end(); while( aIter != aEndIter && !aChild.IsValid() ) { const SwAccessibleChild& rChild = *aIter; diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index c626b097ecc1..28611e263581 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -58,8 +58,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; using namespace ::sw::access; -typedef ::std::set < sal_Int32 > Int32Set_Impl; -typedef ::std::pair < sal_Int32, sal_Int32 > Int32Pair_Impl; +typedef std::set < sal_Int32 > Int32Set_Impl; +typedef std::pair < sal_Int32, sal_Int32 > Int32Pair_Impl; const unsigned int SELECTION_WITH_NUM = 10; @@ -77,7 +77,7 @@ class SwAccessibleTableData_Impl SwAccessibleMap& mrAccMap; Int32Set_Impl maRows; Int32Set_Impl maColumns; - ::std::list < Int32Pair_Impl > maExtents; // cell extends for event processing only + std::list < Int32Pair_Impl > maExtents; // cell extends for event processing only Point maTabFramePos; const SwTabFrame *mpTabFrame; bool mbIsInPagePreview; @@ -384,7 +384,7 @@ void SwAccessibleTableData_Impl::GetSelection( Int32Set_Impl::const_iterator aSttRowOrCol( rRowsOrCols.lower_bound( nPos ) ); sal_Int32 nRowOrCol = - static_cast< sal_Int32 >( ::std::distance( + static_cast< sal_Int32 >( std::distance( rRowsOrCols.begin(), aSttRowOrCol ) ); nPos = bColumns ? (rBox.Right() - rTabPos.X()) @@ -392,7 +392,7 @@ void SwAccessibleTableData_Impl::GetSelection( Int32Set_Impl::const_iterator aEndRowOrCol( rRowsOrCols.upper_bound( nPos ) ); sal_Int32 nExt = - static_cast< sal_Int32 >( ::std::distance( + static_cast< sal_Int32 >( std::distance( aSttRowOrCol, aEndRowOrCol ) ); rSelHdl.Unselect( nRowOrCol, nExt ); @@ -440,7 +440,7 @@ void SwAccessibleTableData_Impl::GetSelection( if( nStart > 0 ) { Int32Set_Impl::const_iterator aStt( rRowsOrColumns.begin() ); - ::std::advance( aStt, + std::advance( aStt, static_cast< Int32Set_Impl::difference_type >( nStart ) ); if( bColumns ) aArea.Left( *aStt + aPos.getX() ); @@ -450,7 +450,7 @@ void SwAccessibleTableData_Impl::GetSelection( if( nEnd < static_cast< sal_Int32 >( rRowsOrColumns.size() ) ) { Int32Set_Impl::const_iterator aEnd( rRowsOrColumns.begin() ); - ::std::advance( aEnd, + std::advance( aEnd, static_cast< Int32Set_Impl::difference_type >( nEnd ) ); if( bColumns ) aArea.Right( *aEnd + aPos.getX() - 1 ); @@ -490,7 +490,7 @@ bool SwAccessibleTableData_Impl::CompareExtents( if( maExtents.size() != rCmp.maExtents.size() ) return false; - return ::std::equal(maExtents.begin(), maExtents.end(), rCmp.maExtents.begin()); + return std::equal(maExtents.begin(), maExtents.end(), rCmp.maExtents.begin()); } SwAccessibleTableData_Impl::SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap, @@ -513,7 +513,7 @@ inline Int32Set_Impl::const_iterator SwAccessibleTableData_Impl::GetRowIter( Int32Set_Impl::const_iterator aCol( GetRows().begin() ); if( nRow > 0 ) { - ::std::advance( aCol, + std::advance( aCol, static_cast< Int32Set_Impl::difference_type >( nRow ) ); } return aCol; @@ -525,7 +525,7 @@ inline Int32Set_Impl::const_iterator SwAccessibleTableData_Impl::GetColumnIter( Int32Set_Impl::const_iterator aCol = GetColumns().begin(); if( nColumn > 0 ) { - ::std::advance( aCol, + std::advance( aCol, static_cast< Int32Set_Impl::difference_type >( nColumn ) ); } return aCol; @@ -556,16 +556,16 @@ void SwAccessibleTableData_Impl::GetRowColumnAndExtent( Int32Set_Impl::const_iterator aEnd( maRows.upper_bound( rBox.Bottom() - maTabFramePos.Y() ) ); rRow = - static_cast< sal_Int32 >( ::std::distance( maRows.begin(), aStt ) ); + static_cast< sal_Int32 >( std::distance( maRows.begin(), aStt ) ); rRowExtent = - static_cast< sal_Int32 >( ::std::distance( aStt, aEnd ) ); + static_cast< sal_Int32 >( std::distance( aStt, aEnd ) ); aStt = maColumns.lower_bound( rBox.Left() - maTabFramePos.X() ); aEnd = maColumns.upper_bound( rBox.Right() - maTabFramePos.X() ); rColumn = - static_cast< sal_Int32 >( ::std::distance( maColumns.begin(), aStt ) ); + static_cast< sal_Int32 >( std::distance( maColumns.begin(), aStt ) ); rColumnExtent = - static_cast< sal_Int32 >( ::std::distance( aStt, aEnd ) ); + static_cast< sal_Int32 >( std::distance( aStt, aEnd ) ); } class SwAccSingleTableSelHander_Impl : public SwAccTableSelHander_Impl @@ -596,7 +596,7 @@ void SwAccSingleTableSelHander_Impl::Unselect( sal_Int32, sal_Int32 ) class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl { - ::std::vector< bool > aSelected; + std::vector< bool > aSelected; sal_Int32 nCount; public: @@ -1032,7 +1032,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( Int32Set_Impl::const_iterator aEndRow( GetTableData().GetRows().upper_bound( nBottom ) ); nExtend = - static_cast< sal_Int32 >( ::std::distance( aSttRow, aEndRow ) ); + static_cast< sal_Int32 >( std::distance( aSttRow, aEndRow ) ); } return nExtend; @@ -1063,7 +1063,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt( Int32Set_Impl::const_iterator aEndCol( GetTableData().GetColumns().upper_bound( nRight ) ); nExtend = - static_cast< sal_Int32 >( ::std::distance( aSttCol, aEndCol ) ); + static_cast< sal_Int32 >( std::distance( aSttCol, aEndCol ) ); } return nExtend; @@ -1296,7 +1296,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) nTop -= GetFrame()->Frame().Top(); Int32Set_Impl::const_iterator aRow( GetTableData().GetRows().lower_bound( nTop ) ); - nRet = static_cast< sal_Int32 >( ::std::distance( + nRet = static_cast< sal_Int32 >( std::distance( GetTableData().GetRows().begin(), aRow ) ); } else @@ -1334,7 +1334,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( nLeft -= GetFrame()->Frame().Left(); Int32Set_Impl::const_iterator aCol( GetTableData().GetColumns().lower_bound( nLeft ) ); - nRet = static_cast< sal_Int32 >( ::std::distance( + nRet = static_cast< sal_Int32 >( std::distance( GetTableData().GetColumns().begin(), aCol ) ); } else diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 8afd565b5c14..84930ef9f378 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -266,7 +266,7 @@ public: // XAccessibleComponent sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; - typedef std::vector< ::std::pair<SwAccessibleContext*, + typedef std::vector< std::pair<SwAccessibleContext*, css::uno::WeakReference<css::accessibility::XAccessible> > > Cells_t; Cells_t m_vecCellAdd; Cells_t m_vecCellRemove; diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index 5f7ae087243b..960c14ec5a98 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -175,7 +175,7 @@ css::uno::Sequence< css::accessibility::TextSegment > mpTextMarkupList ? mpTextMarkupList : getTextMarkupList( *mpTextNode, nTextMarkupType ); - ::std::vector< css::accessibility::TextSegment > aTmpTextMarkups; + std::vector< css::accessibility::TextSegment > aTmpTextMarkups; if ( pTextMarkupList ) { const OUString rText = mrPortionData.GetAccessibleString(); @@ -205,7 +205,7 @@ css::uno::Sequence< css::accessibility::TextSegment > uno::Sequence< css::accessibility::TextSegment > aTextMarkups( aTmpTextMarkups.size() ); - ::std::copy( aTmpTextMarkups.begin(), aTmpTextMarkups.end(), aTextMarkups.begin() ); + std::copy( aTmpTextMarkups.begin(), aTmpTextMarkups.end(), aTextMarkups.begin() ); return aTextMarkups; } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 7dd29d42c0b3..bebb41ba67b1 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1346,7 +1346,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, pTextAttr = nullptr; if( SwContentAtPos::SW_TOXMARK & rContentAtPos.eContentAtPos ) { - ::std::vector<SwTextAttr *> const marks( + std::vector<SwTextAttr *> const marks( pTextNd->GetTextAttrsAt( aPos.nContent.GetIndex(), RES_TXTATR_TOXMARK)); if (marks.size()) @@ -1358,7 +1358,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, if( !pTextAttr && SwContentAtPos::SW_REFMARK & rContentAtPos.eContentAtPos ) { - ::std::vector<SwTextAttr *> const marks( + std::vector<SwTextAttr *> const marks( pTextNd->GetTextAttrsAt( aPos.nContent.GetIndex(), RES_TXTATR_REFMARK)); if (marks.size()) diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index dab51af2e685..e86bef32262e 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1023,7 +1023,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas, } else if( FND_IN_SELALL & eFndRngs ) { - ::std::unique_ptr< SwCursor> pSav( Create( this ) ); // save the current cursor + std::unique_ptr< SwCursor> pSav( Create( this ) ); // save the current cursor const SwNode* pSttNd = ( FND_IN_BODYONLY & eFndRngs ) ? rNds.GetEndOfContent().StartOfSectionNode() diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index f15934de43aa..7f21526746c6 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -223,7 +223,7 @@ namespace const SwPosition &rStt = *rPam.Start(), &rEnd = *rPam.End(); SwPosition* pCpyStt = rCpyPam.Start(); - typedef ::std::vector< const ::sw::mark::IMark* > mark_vector_t; + typedef std::vector< const ::sw::mark::IMark* > mark_vector_t; mark_vector_t vMarksToCopy; for ( IDocumentMarkAccess::const_iterator_t ppMark = pSrcMarkAccess->getAllMarksBegin(); ppMark != pSrcMarkAccess->getAllMarksEnd(); @@ -473,7 +473,7 @@ namespace namespace { void - lcl_CalcBreaks( ::std::vector<sal_Int32> & rBreaks, SwPaM const & rPam ) + lcl_CalcBreaks( std::vector<sal_Int32> & rBreaks, SwPaM const & rPam ) { SwTextNode const * const pTextNode( rPam.End()->nNode.GetNode().GetTextNode() ); @@ -503,7 +503,7 @@ namespace bool lcl_DoWithBreaks(::sw::DocumentContentOperationsManager & rDocumentContentOperations, SwPaM & rPam, bool (::sw::DocumentContentOperationsManager::*pFunc)(SwPaM&, bool), const bool bForceJoinNext = false) { - ::std::vector<sal_Int32> Breaks; + std::vector<sal_Int32> Breaks; lcl_CalcBreaks(Breaks, rPam); @@ -521,7 +521,7 @@ namespace bool bRet( true ); // iterate from end to start, to avoid invalidating the offsets! - ::std::vector<sal_Int32>::reverse_iterator iter( Breaks.rbegin() ); + std::vector<sal_Int32>::reverse_iterator iter( Breaks.rbegin() ); SwPaM aPam( rSelectionEnd, rSelectionEnd ); // end node! SwPosition & rEnd( *aPam.End() ); SwPosition & rStart( *aPam.Start() ); @@ -2037,7 +2037,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // Copy all Bookmarks that are within the Move range into an array, // that saves the position as an offset. - ::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks; + std::vector< ::sw::mark::SaveBookmark> aSaveBkmks; DelBookmarks( pStt->nNode, pEnd->nNode, @@ -2145,7 +2145,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, // Insert the Bookmarks back into the Document. *rPaM.GetMark() = *aSavePam.Start(); for( - ::std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin(); + std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin(); pBkmk != aSaveBkmks.end(); ++pBkmk) pBkmk->SetInDoc( @@ -2230,7 +2230,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // Copy all Bookmarks that are within the Move range into an array // that stores all references to positions as an offset. // The final mapping happens after the Move. - ::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks; + std::vector< ::sw::mark::SaveBookmark> aSaveBkmks; DelBookmarks(rRange.aStart, rRange.aEnd, &aSaveBkmks); // Save the paragraph-bound Flys, so that they can be moved. @@ -2266,7 +2266,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod // Add the Bookmarks back to the Document for( - ::std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin(); + std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin(); pBkmk != aSaveBkmks.end(); ++pBkmk) pBkmk->SetInDoc(&m_rDoc, aIdx); @@ -3001,7 +3001,7 @@ bool DocumentContentOperationsManager::ReplaceRange( SwPaM& rPam, const OUString // unfortunately replace works slightly differently from delete, // so we cannot use lcl_DoWithBreaks here... - ::std::vector<sal_Int32> Breaks; + std::vector<sal_Int32> Breaks; SwPaM aPam( *rPam.GetMark(), *rPam.GetPoint() ); aPam.Normalize(false); @@ -3037,7 +3037,7 @@ bool DocumentContentOperationsManager::ReplaceRange( SwPaM& rPam, const OUString bool bRet( true ); // iterate from end to start, to avoid invalidating the offsets! - ::std::vector<sal_Int32>::reverse_iterator iter( Breaks.rbegin() ); + std::vector<sal_Int32>::reverse_iterator iter( Breaks.rbegin() ); OSL_ENSURE(aPam.GetPoint() == aPam.End(), "wrong!"); SwPosition & rEnd( *aPam.End() ); SwPosition & rStart( *aPam.Start() ); @@ -3250,7 +3250,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // and then only copy them. This maintains the ordering numbers (which are only // managed in the DrawModel). SwDoc *const pDest = rStartIdx.GetNode().GetDoc(); - ::std::set< ZSortFly > aSet; + std::set< ZSortFly > aSet; const size_t nArrLen = m_rDoc.GetSpzFrameFormats()->size(); SwTextBoxHelper::SavedLink aOldTextBoxes; @@ -3342,8 +3342,8 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( // Store all copied (and also the newly created) frames in another array. // They are stored as matching the originals, so that we will be later // able to build the chains accordingly. - ::std::vector< SwFrameFormat* > aVecSwFrameFormat; - ::std::set< ZSortFly >::const_iterator it=aSet.begin(); + std::vector< SwFrameFormat* > aVecSwFrameFormat; + std::set< ZSortFly >::const_iterator it=aSet.begin(); while (it != aSet.end()) { @@ -3461,14 +3461,14 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( if ( aSet.size() == aVecSwFrameFormat.size() ) { size_t n = 0; - for (::std::set< ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n ) + for (std::set< ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n ) { const SwFrameFormat *pFormatN = (*nIt).GetFormat(); const SwFormatChain &rChain = pFormatN->GetChain(); int nCnt = int(nullptr != rChain.GetPrev()); nCnt += rChain.GetNext() ? 1: 0; size_t k = 0; - for (::std::set< ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k ) + for (std::set< ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k ) { const SwFrameFormat *pFormatK = (*kIt).GetFormat(); if ( rChain.GetPrev() == pFormatK ) diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 81ed9f4481f2..90bc30b8e268 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -120,7 +120,7 @@ void DocumentStatisticsManager::UpdateDocStat( bool bCompleteAsync, bool bFields if (!bCompleteAsync) { while (IncrementalDocStatCalculate( - ::std::numeric_limits<long>::max(), bFields)) {} + std::numeric_limits<long>::max(), bFields)) {} maStatsUpdateTimer.Stop(); } else if (IncrementalDocStatCalculate(5000, bFields)) diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 2cdd35300280..5a4044b1c60b 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -31,7 +31,7 @@ extern ResMgr* pSwResMgr; // Initialise UI names to 0 -::std::vector<OUString> *SwStyleNameMapper::m_pTextUINameArray = nullptr, +std::vector<OUString> *SwStyleNameMapper::m_pTextUINameArray = nullptr, *SwStyleNameMapper::m_pListsUINameArray = nullptr, *SwStyleNameMapper::m_pExtraUINameArray = nullptr, *SwStyleNameMapper::m_pRegisterUINameArray = nullptr, @@ -342,10 +342,10 @@ const struct SwTableEntry TableStyleProgNameTable [] = }; #undef ENTRY -::std::vector<OUString>* +std::vector<OUString>* lcl_NewUINameArray(sal_uInt16 nStt, sal_uInt16 const nEnd) { - ::std::vector<OUString> *const pNameArray = new ::std::vector<OUString>; + std::vector<OUString> *const pNameArray = new std::vector<OUString>; pNameArray->reserve(nEnd - nStt); while( nStt < nEnd ) { @@ -356,10 +356,10 @@ lcl_NewUINameArray(sal_uInt16 nStt, sal_uInt16 const nEnd) return pNameArray; } -::std::vector<OUString>* +std::vector<OUString>* lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount) { - ::std::vector<OUString> *const pProgNameArray = new ::std::vector<OUString>; + std::vector<OUString> *const pProgNameArray = new std::vector<OUString>; pProgNameArray->reserve(nCount); while (pTable->nLength) { @@ -373,7 +373,7 @@ lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount) OUString lcl_GetSpecialExtraName(const OUString& rExtraName, const bool bIsUIName ) { - const ::std::vector<OUString>& rExtraArr = bIsUIName + const std::vector<OUString>& rExtraArr = bIsUIName ? SwStyleNameMapper::GetExtraUINameArray() : SwStyleNameMapper::GetExtraProgNameArray(); static const sal_uInt16 nIds[] = @@ -456,7 +456,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag // pHashPointer is a pointer to a pointer which stores the UI/prog name array NameToIdHash **pHashPointer = nullptr; // Stores tuples representing (index start, index end, pointer to function which returns ref to name array) - ::std::vector<NameArrayIndexTuple_t> vIndexes; + std::vector<NameArrayIndexTuple_t> vIndexes; switch ( eFlags ) { @@ -520,13 +520,13 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag sal_uInt16 nSize = std::accumulate( vIndexes.begin(), vIndexes.end(), 0, lcl_AccumulateIndexCount ); NameToIdHash *pHash = new NameToIdHash( nSize ); - for ( ::std::vector<NameArrayIndexTuple_t>::iterator entry = vIndexes.begin(); entry != vIndexes.end(); ++entry ) + for ( std::vector<NameArrayIndexTuple_t>::iterator entry = vIndexes.begin(); entry != vIndexes.end(); ++entry ) { // Get a pointer to the function which will populate pStrings - const ::std::vector<OUString>& (*pStringsFetchFunc)() = std::get<2>( *entry ); + const std::vector<OUString>& (*pStringsFetchFunc)() = std::get<2>( *entry ); if ( pStringsFetchFunc ) { - const ::std::vector<OUString>& rStrings = pStringsFetchFunc(); + const std::vector<OUString>& rStrings = pStringsFetchFunc(); sal_uInt16 nIndex, nId; for ( nIndex = 0, nId = std::get<0>( *entry ) ; nId < std::get<1>( *entry ) ; nId++, nIndex++ ) (*pHash)[rStrings[nIndex]] = nId; @@ -629,7 +629,7 @@ const OUString& SwStyleNameMapper::getNameFromId( sal_uInt16 const nId, const OUString& rFillName, bool const bProgName) { sal_uInt16 nStt = 0; - const ::std::vector<OUString>* pStrArr = nullptr; + const std::vector<OUString>* pStrArr = nullptr; switch( (USER_FMT | COLL_GET_RANGE_BITS | POOLGRP_NOCOLLID) & nId ) { @@ -769,7 +769,7 @@ sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName( return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX; } -const ::std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray() { if (!m_pTextUINameArray) m_pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN, @@ -777,7 +777,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray() return *m_pTextUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray() { if (!m_pListsUINameArray) m_pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN, @@ -785,7 +785,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray() return *m_pListsUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray() { if (!m_pExtraUINameArray) m_pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN, @@ -793,7 +793,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray() return *m_pExtraUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray() { if (!m_pRegisterUINameArray) m_pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN, @@ -801,7 +801,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray() return *m_pRegisterUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray() { if (!m_pDocUINameArray) m_pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN, @@ -809,7 +809,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray() return *m_pDocUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray() { if (!m_pHTMLUINameArray) m_pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN, @@ -817,7 +817,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray() return *m_pHTMLUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray() { if (!m_pFrameFormatUINameArray) m_pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN, @@ -825,7 +825,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray() return *m_pFrameFormatUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray() { if (!m_pChrFormatUINameArray) m_pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN, @@ -833,7 +833,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray() return *m_pChrFormatUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray() { if (!m_pHTMLChrFormatUINameArray) m_pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN, @@ -841,7 +841,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray() return *m_pHTMLChrFormatUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray() { if (!m_pPageDescUINameArray) m_pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN, @@ -849,7 +849,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray() return *m_pPageDescUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray() { if (!m_pNumRuleUINameArray) m_pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN, @@ -857,7 +857,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray() return *m_pNumRuleUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray() { if (!m_pTableStyleUINameArray) m_pTableStyleUINameArray = lcl_NewUINameArray( RC_POOLTABSTYLE_BEGIN, @@ -866,14 +866,14 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray() } /// retuns an empty array because Cell Names aren't translated -const ::std::vector<OUString>& SwStyleNameMapper::GetCellStyleUINameArray() +const std::vector<OUString>& SwStyleNameMapper::GetCellStyleUINameArray() { if (!m_pCellStyleUINameArray) m_pCellStyleUINameArray = new std::vector<OUString>(); return *m_pCellStyleUINameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetTextProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetTextProgNameArray() { if (!m_pTextProgNameArray) m_pTextProgNameArray = lcl_NewProgNameArray(TextProgNameTable, @@ -881,7 +881,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetTextProgNameArray() return *m_pTextProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetListsProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetListsProgNameArray() { if (!m_pListsProgNameArray) m_pListsProgNameArray = lcl_NewProgNameArray( ListsProgNameTable, @@ -889,7 +889,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetListsProgNameArray() return *m_pListsProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetExtraProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetExtraProgNameArray() { if (!m_pExtraProgNameArray) m_pExtraProgNameArray = lcl_NewProgNameArray( ExtraProgNameTable, @@ -897,7 +897,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetExtraProgNameArray() return *m_pExtraProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetRegisterProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetRegisterProgNameArray() { if (!m_pRegisterProgNameArray) m_pRegisterProgNameArray = lcl_NewProgNameArray( RegisterProgNameTable, @@ -905,7 +905,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetRegisterProgNameArray() return *m_pRegisterProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetDocProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetDocProgNameArray() { if (!m_pDocProgNameArray) m_pDocProgNameArray = lcl_NewProgNameArray( DocProgNameTable, @@ -913,7 +913,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetDocProgNameArray() return *m_pDocProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray() { if (!m_pHTMLProgNameArray) m_pHTMLProgNameArray = lcl_NewProgNameArray( HTMLProgNameTable, @@ -921,7 +921,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray() return *m_pHTMLProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray() { if (!m_pFrameFormatProgNameArray) m_pFrameFormatProgNameArray = lcl_NewProgNameArray( FrameFormatProgNameTable, @@ -929,7 +929,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray() return *m_pFrameFormatProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray() { if (!m_pChrFormatProgNameArray) m_pChrFormatProgNameArray = lcl_NewProgNameArray( ChrFormatProgNameTable, @@ -937,7 +937,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray() return *m_pChrFormatProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray() { if (!m_pHTMLChrFormatProgNameArray) m_pHTMLChrFormatProgNameArray = lcl_NewProgNameArray( HTMLChrFormatProgNameTable, @@ -945,7 +945,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray( return *m_pHTMLChrFormatProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray() { if (!m_pPageDescProgNameArray) m_pPageDescProgNameArray = lcl_NewProgNameArray( PageDescProgNameTable, @@ -953,7 +953,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray() return *m_pPageDescProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetNumRuleProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetNumRuleProgNameArray() { if (!m_pNumRuleProgNameArray) m_pNumRuleProgNameArray = lcl_NewProgNameArray( NumRuleProgNameTable, @@ -961,7 +961,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetNumRuleProgNameArray() return *m_pNumRuleProgNameArray; } -const ::std::vector<OUString>& SwStyleNameMapper::GetTableStyleProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetTableStyleProgNameArray() { if (!m_pTableStyleProgNameArray) m_pTableStyleProgNameArray = lcl_NewProgNameArray( TableStyleProgNameTable, @@ -970,7 +970,7 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetTableStyleProgNameArray() } /// retuns an empty array because Cell Names aren't translated -const ::std::vector<OUString>& SwStyleNameMapper::GetCellStyleProgNameArray() +const std::vector<OUString>& SwStyleNameMapper::GetCellStyleProgNameArray() { if (!m_pCellStyleProgNameArray) m_pCellStyleProgNameArray = new std::vector<OUString>(); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index f58f8bc528bc..ea8089295b9b 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -885,7 +885,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData( // add the post-it document pages to print, i.e those // post-it pages that have the data for the above physical page - ::std::map<sal_Int32, sal_Int32>::const_iterator const iter( + std::map<sal_Int32, sal_Int32>::const_iterator const iter( aPostItLastStartPageNum.find(nPhysPage)); if (iter != aPostItLastStartPageNum.end()) { @@ -1540,12 +1540,12 @@ bool SwDoc::ConvertFieldsToText() continue; SwIterator<SwFormatField,SwFieldType> aIter( *pCurType ); - ::std::vector<const SwFormatField*> aFieldFormats; + std::vector<const SwFormatField*> aFieldFormats; for( SwFormatField* pCurFieldFormat = aIter.First(); pCurFieldFormat; pCurFieldFormat = aIter.Next() ) aFieldFormats.push_back(pCurFieldFormat); - ::std::vector<const SwFormatField*>::iterator aBegin = aFieldFormats.begin(); - ::std::vector<const SwFormatField*>::iterator aEnd = aFieldFormats.end(); + std::vector<const SwFormatField*>::iterator aBegin = aFieldFormats.begin(); + std::vector<const SwFormatField*>::iterator aEnd = aFieldFormats.end(); while(aBegin != aEnd) { const SwTextField *pTextField = (*aBegin)->GetTextField(); diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 89252fb447cf..7fb4fdcfe94c 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -99,11 +99,11 @@ namespace pMark); } - inline ::std::unique_ptr<SwPosition> lcl_PositionFromContentNode( + inline std::unique_ptr<SwPosition> lcl_PositionFromContentNode( SwContentNode * const pContentNode, const bool bAtEnd=false) { - ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pContentNode)); + std::unique_ptr<SwPosition> pResult(new SwPosition(*pContentNode)); pResult->nContent.Assign(pContentNode, bAtEnd ? pContentNode->Len() : 0); return pResult; } @@ -112,7 +112,7 @@ namespace // else set it to the begin of the Node after rEnd, if there is one // else set it to the end of the node before rStt // else set it to the ContentNode of the Pos outside the Range - inline ::std::unique_ptr<SwPosition> lcl_FindExpelPosition( + inline std::unique_ptr<SwPosition> lcl_FindExpelPosition( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, const SwPosition& rOtherPosition) @@ -664,11 +664,11 @@ namespace sw { namespace mark void MarkManager::deleteMarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, - ::std::vector<SaveBookmark>* pSaveBkmk, + std::vector<SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx ) { - ::std::vector<const_iterator_t> vMarksToDelete; + std::vector<const_iterator_t> vMarksToDelete; bool bIsSortingNeeded = false; // boolean indicating, if at least one mark has been moved while collecting marks for deletion @@ -753,7 +753,7 @@ namespace sw { namespace mark // the bookmark is partially in the range // move position of that is in the range out of it - ::std::unique_ptr< SwPosition > pNewPos; + std::unique_ptr< SwPosition > pNewPos; { if ( pEndIdx != nullptr ) { @@ -817,7 +817,7 @@ namespace sw { namespace mark // for the shared_ptr<> (the entry in m_vAllMarks) again // reverse iteration, since erasing an entry invalidates iterators // behind it (the iterators in vMarksToDelete are sorted) - for ( ::std::vector< const_iterator_t >::reverse_iterator pppMark = vMarksToDelete.rbegin(); + for ( std::vector< const_iterator_t >::reverse_iterator pppMark = vMarksToDelete.rbegin(); pppMark != vMarksToDelete.rend(); ++pppMark ) { @@ -1315,7 +1315,7 @@ void SaveBookmark::SetInDoc( void DelBookmarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, - ::std::vector<SaveBookmark> * pSaveBkmk, + std::vector<SaveBookmark> * pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) { diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index fa2ca527c2bf..ce48a9d81270 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; -using ::std::vector; +using std::vector; class SwCompareLine { diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index db6ccf9a77ce..1b55385f37ba 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1200,7 +1200,7 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM) { OSL_ENSURE( rPaM.GetDoc() == this, "need same doc" ); - ::std::map<SwNumRule *, ListStyleData> aMyNumRuleMap; + std::map<SwNumRule *, ListStyleData> aMyNumRuleMap; bool bFirst = true; diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 220e3cb90b18..cbf5c9abeedf 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -63,8 +63,8 @@ LocaleDataWrapper* SwSortElement::pLclData = nullptr; // List of all sorted elements -typedef ::std::multiset<SwSortTextElement> SwSortTextElements; -typedef ::std::multiset<SwSortBoxElement> SwSortBoxElements; +typedef std::multiset<SwSortTextElement> SwSortTextElements; +typedef std::multiset<SwSortBoxElement> SwSortBoxElements; /// Construct a SortElement for the Sort void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt, diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 302c7062a2cd..17c69b8f2b4f 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1817,10 +1817,10 @@ static sal_uInt16 SwFormatGetPageNum(const SwFlyFrameFormat * pFormat) void SwFEShell::GetConnectableFrameFormats(SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors, - ::std::vector< OUString > & aPrevPageVec, - ::std::vector< OUString > & aThisPageVec, - ::std::vector< OUString > & aNextPageVec, - ::std::vector< OUString > & aRestVec) + std::vector< OUString > & aPrevPageVec, + std::vector< OUString > & aThisPageVec, + std::vector< OUString > & aNextPageVec, + std::vector< OUString > & aRestVec) { StartAction(); @@ -1837,7 +1837,7 @@ void SwFEShell::GetConnectableFrameFormats(SwFrameFormat & rFormat, const size_t nCnt = mpDoc->GetFlyCount(FLYCNTTYPE_FRM); /* potential successors resp. predecessors */ - ::std::vector< const SwFrameFormat * > aTmpSpzArray; + std::vector< const SwFrameFormat * > aTmpSpzArray; mpDoc->FindFlyByName(rReference); @@ -1878,7 +1878,7 @@ void SwFEShell::GetConnectableFrameFormats(SwFrameFormat & rFormat, /* number of page rFormat resides on */ sal_uInt16 nPageNum = SwFormatGetPageNum(static_cast<SwFlyFrameFormat *>(&rFormat)); - ::std::vector< const SwFrameFormat * >::const_iterator aIt; + std::vector< const SwFrameFormat * >::const_iterator aIt; for (aIt = aTmpSpzArray.begin(); aIt != aTmpSpzArray.end(); ++aIt) { diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index fc6108bb6ad9..5d0538f3337c 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -85,7 +85,7 @@ const SwFrame *g_pRowCacheLastCellFrame = nullptr; class TableWait { - const ::std::unique_ptr<SwWait> m_pWait; + const std::unique_ptr<SwWait> m_pWait; // this seems really fishy: do some locking, if an arbitrary number of lines is exceeded static const size_t our_kLineLimit = 20; static bool ShouldWait(size_t nCnt, SwFrame *pFrame, size_t nCnt2) @@ -1117,7 +1117,7 @@ void SwFEShell::AdjustCellWidth( bool bBalance ) // switch on wait-cursor, as we do not know how // much content is affected - TableWait aWait(::std::numeric_limits<size_t>::max(), nullptr, + TableWait aWait(std::numeric_limits<size_t>::max(), nullptr, *GetDoc()->GetDocShell()); GetDoc()->AdjustCellWidth( *getShellCursor( false ), bBalance ); diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index ca557cfdd640..77b80ab26fb3 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -49,7 +49,7 @@ public: const SwNodeNum* pNodeNumTwo ) const; }; - typedef ::std::set< const SwNodeNum*, lessThanNodeNum > tImplSortedNodeNumList; + typedef std::set< const SwNodeNum*, lessThanNodeNum > tImplSortedNodeNumList; private: diff --git a/sw/source/core/inc/DocumentOutlineNodesManager.hxx b/sw/source/core/inc/DocumentOutlineNodesManager.hxx index 8afafe420ff0..76dccf6998c3 100644 --- a/sw/source/core/inc/DocumentOutlineNodesManager.hxx +++ b/sw/source/core/inc/DocumentOutlineNodesManager.hxx @@ -33,7 +33,7 @@ public: DocumentOutlineNodesManager( SwDoc& i_rSwdoc ); - //typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList; + //typedef std::vector< const SwTextNode* > tSortedOutlineNodeList; sal_Int32 getOutlineNodesCount() const override; diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx index ac93ab3f74bf..bc0aecd6064a 100644 --- a/sw/source/core/inc/MarkManager.hxx +++ b/sw/source/core/inc/MarkManager.hxx @@ -55,7 +55,7 @@ namespace sw { virtual void correctMarksAbsolute(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) override; virtual void correctMarksRelative(const SwNodeIndex& rOldNode, const SwPosition& rNewPos, const sal_Int32 nOffset) override; - virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) override; + virtual void deleteMarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, const SwIndex* pSttIdx, const SwIndex* pEndIdx) override; // deleters virtual std::shared_ptr<ILazyDeleter> diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index f0320d924cfb..c68a4bcf89f7 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -36,9 +36,9 @@ class SwEndNoteInfo; class SwUndoAttr : public SwUndo, private SwUndRng { SfxItemSet m_AttrSet; // attributes for Redo - const ::std::unique_ptr<SwHistory> m_pHistory; // History for Undo - ::std::unique_ptr<SwRedlineData> m_pRedlineData; // Redlining - ::std::unique_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; + const std::unique_ptr<SwHistory> m_pHistory; // History for Undo + std::unique_ptr<SwRedlineData> m_pRedlineData; // Redlining + std::unique_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; sal_uLong m_nNodeIndex; // Offset: for Redlining const SetAttrMode m_nInsertFlags; // insert flags @@ -61,7 +61,7 @@ public: class SwUndoResetAttr : public SwUndo, private SwUndRng { - const ::std::unique_ptr<SwHistory> m_pHistory; + const std::unique_ptr<SwHistory> m_pHistory; std::set<sal_uInt16> m_Ids; const sal_uInt16 m_nFormatId; // Format-Id for Redo @@ -84,7 +84,7 @@ class SwUndoFormatAttr : public SwUndo { friend class SwUndoDefaultAttr; SwFormat * m_pFormat; - ::std::unique_ptr<SfxItemSet> m_pOldSet; // old attributes + std::unique_ptr<SfxItemSet> m_pOldSet; // old attributes sal_uLong m_nNodeIndex; const sal_uInt16 m_nFormatWhich; const bool m_bSaveDrawPt; @@ -142,7 +142,7 @@ class SwUndoFormatResetAttr : public SwUndo // which ID of the reset attribute const sal_uInt16 m_nWhichId; // old attribute which has been reset - needed for undo. - ::std::unique_ptr<SfxPoolItem> m_pOldItem; + std::unique_ptr<SfxPoolItem> m_pOldItem; }; class SwUndoDontExpandFormat : public SwUndo @@ -161,7 +161,7 @@ public: // helper class to receive changed attribute sets class SwUndoFormatAttrHelper : public SwClient { - ::std::unique_ptr<SwUndoFormatAttr> m_pUndo; + std::unique_ptr<SwUndoFormatAttr> m_pUndo; const bool m_bSaveDrawPt; public: @@ -176,7 +176,7 @@ public: class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng { - const ::std::unique_ptr<SwHistory> m_pHistory; + const std::unique_ptr<SwHistory> m_pHistory; const bool m_bModulus; public: @@ -194,8 +194,8 @@ public: class SwUndoDefaultAttr : public SwUndo { - ::std::unique_ptr<SfxItemSet> m_pOldSet; // the old attributes - ::std::unique_ptr<SvxTabStopItem> m_pTabStop; + std::unique_ptr<SfxItemSet> m_pOldSet; // the old attributes + std::unique_ptr<SvxTabStopItem> m_pTabStop; public: // registers at the format and saves old attributes @@ -209,7 +209,7 @@ public: class SwUndoChangeFootNote : public SwUndo, private SwUndRng { - const ::std::unique_ptr<SwHistory> m_pHistory; + const std::unique_ptr<SwHistory> m_pHistory; const OUString m_Text; const sal_uInt16 m_nNumber; const bool m_bEndNote; @@ -228,7 +228,7 @@ public: class SwUndoFootNoteInfo : public SwUndo { - ::std::unique_ptr<SwFootnoteInfo> m_pFootNoteInfo; + std::unique_ptr<SwFootnoteInfo> m_pFootNoteInfo; public: SwUndoFootNoteInfo( const SwFootnoteInfo &rInfo ); @@ -241,7 +241,7 @@ public: class SwUndoEndNoteInfo : public SwUndo { - ::std::unique_ptr<SwEndNoteInfo> m_pEndNoteInfo; + std::unique_ptr<SwEndNoteInfo> m_pEndNoteInfo; public: SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo ); diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index 7cfb4624f5fe..401c15edad21 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -32,7 +32,7 @@ namespace sw { class SwUndoBookmark : public SwUndo { - const ::std::unique_ptr<SwHistoryBookmark> m_pHistoryBookmark; + const std::unique_ptr<SwHistoryBookmark> m_pHistoryBookmark; protected: SwUndoBookmark( SwUndoId nUndoId, const ::sw::mark::IMark& ); diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx index 8192d325e901..b72f9d0363e5 100644 --- a/sw/source/core/inc/UndoInsert.hxx +++ b/sw/source/core/inc/UndoInsert.hxx @@ -127,7 +127,7 @@ public: private: class Impl; - ::std::unique_ptr<Impl> m_pImpl; + std::unique_ptr<Impl> m_pImpl; }; class SwUndoReRead : public SwUndo diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx index fa70a7303e86..1cfbef5f3128 100644 --- a/sw/source/core/inc/UndoSection.hxx +++ b/sw/source/core/inc/UndoSection.hxx @@ -33,12 +33,12 @@ class SwTOXBase; class SwUndoInsSection : public SwUndo, private SwUndRng { private: - const ::std::unique_ptr<SwSectionData> m_pSectionData; - const ::std::unique_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX - const ::std::unique_ptr<SfxItemSet> m_pAttrSet; - ::std::unique_ptr<SwHistory> m_pHistory; - ::std::unique_ptr<SwRedlineData> m_pRedlData; - ::std::unique_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; + const std::unique_ptr<SwSectionData> m_pSectionData; + const std::unique_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX + const std::unique_ptr<SfxItemSet> m_pAttrSet; + std::unique_ptr<SwHistory> m_pHistory; + std::unique_ptr<SwRedlineData> m_pRedlData; + std::unique_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; sal_uLong m_nSectionNodePos; bool m_bSplitAtStart : 1; bool m_bSplitAtEnd : 1; diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index fe926d339973..c7a06b0156ee 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -84,7 +84,7 @@ namespace sw { namespace mark void DelBookmarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, - ::std::vector< ::sw::mark::SaveBookmark> * SaveBkmk =nullptr, + std::vector< ::sw::mark::SaveBookmark> * SaveBkmk =nullptr, const SwIndex* pSttIdx =nullptr, const SwIndex* pEndIdx =nullptr); @@ -101,7 +101,7 @@ struct SaveFly { } }; -typedef ::std::deque< SaveFly > SaveFlyArr; +typedef std::deque< SaveFly > SaveFlyArr; void RestFlyInRange( SaveFlyArr& rArr, const SwNodeIndex& rSttIdx, const SwNodeIndex* pInsPos ); diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index a756779cfb23..f4b412ba29e8 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -90,7 +90,7 @@ public: class SwHistorySetFormat : public SwHistoryHint { - ::std::unique_ptr<SfxPoolItem> m_pAttr; + std::unique_ptr<SfxPoolItem> m_pAttr; const sal_uLong m_nNodeIndex; public: @@ -114,7 +114,7 @@ public: class SwHistorySetText : public SwHistoryHint { - ::std::unique_ptr<SfxPoolItem> m_pAttr; + std::unique_ptr<SfxPoolItem> m_pAttr; const sal_uLong m_nNodeIndex; const sal_Int32 m_nStart; const sal_Int32 m_nEnd; @@ -132,8 +132,8 @@ class SwHistorySetTextField : public SwHistoryHint { //!! beware of the order for the declaration of the unique_ptrs. //!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well) - ::std::unique_ptr<SwFieldType> m_pFieldType; - const ::std::unique_ptr<SwFormatField> m_pField; + std::unique_ptr<SwFieldType> m_pFieldType; + const std::unique_ptr<SwFormatField> m_pField; sal_uLong m_nNodeIndex; sal_Int32 m_nPos; @@ -197,7 +197,7 @@ public: class SwHistorySetFootnote : public SwHistoryHint { - const ::std::unique_ptr<SwUndoSaveSection> m_pUndo; + const std::unique_ptr<SwUndoSaveSection> m_pUndo; const OUString m_FootnoteNumber; sal_uLong m_nNodeIndex; const sal_Int32 m_nStart; @@ -227,7 +227,7 @@ public: class SwHistoryTextFlyCnt : public SwHistoryHint { - ::std::unique_ptr<SwUndoDelLayFormat> m_pUndo; + std::unique_ptr<SwUndoDelLayFormat> m_pUndo; public: SwHistoryTextFlyCnt( SwFrameFormat* const pFlyFormat ); diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx index a57c91650bd0..3d29867866b4 100644 --- a/sw/source/core/inc/swthreadmanager.hxx +++ b/sw/source/core/inc/swthreadmanager.hxx @@ -70,7 +70,7 @@ class SwThreadManager static bool mbThreadManagerInstantiated; - ::std::unique_ptr<ThreadManager> mpThreadManagerImpl; + std::unique_ptr<ThreadManager> mpThreadManagerImpl; }; #endif diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index d5447f56c806..bd9268f537ac 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -36,7 +36,7 @@ #include <unobaseclass.hxx> -typedef ::std::deque< +typedef std::deque< css::uno::Reference< css::text::XTextRange > > TextRangeList_t; @@ -93,7 +93,7 @@ public: CreateXMeta( ::sw::Meta & rMeta, css::uno::Reference< css::text::XText> const& xParentText = nullptr, - ::std::unique_ptr<TextRangeList_t const> && pPortions = ::std::unique_ptr<TextRangeList_t const>()); + std::unique_ptr<TextRangeList_t const> && pPortions = std::unique_ptr<TextRangeList_t const>()); static css::uno::Reference<css::rdf::XMetadatable> CreateXMeta(SwDoc & rDoc, bool isField); @@ -229,7 +229,7 @@ private: friend css::uno::Reference< css::rdf::XMetadatable > SwXMeta::CreateXMeta(::sw::Meta &, css::uno::Reference< css::text::XText> const&, - ::std::unique_ptr<TextRangeList_t const> && pPortions); + std::unique_ptr<TextRangeList_t const> && pPortions); SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta, css::uno::Reference< css::text::XText> const& xParentText, diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx index 9c33589bb1dc..9584ab995f27 100644 --- a/sw/source/core/inc/unoparaframeenum.hxx +++ b/sw/source/core/inc/unoparaframeenum.hxx @@ -55,10 +55,10 @@ struct FrameClientSortListEntry : nIndex(i_nIndex), nOrder(i_nOrder), pFrameClient(i_pClient) { } }; -typedef ::std::deque< FrameClientSortListEntry > +typedef std::deque< FrameClientSortListEntry > FrameClientSortList_t; -typedef ::std::deque< std::shared_ptr<sw::FrameClient> > +typedef std::deque< std::shared_ptr<sw::FrameClient> > FrameClientList_t; // #i28701# - adjust 4th parameter diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 3931230dbb9e..39c0569ea672 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -48,7 +48,7 @@ class SwFrameFormat; class SwRangeRedline; class SwTextRuby; -typedef ::std::deque< +typedef std::deque< css::uno::Reference< css::text::XTextRange > > TextRangeList_t; @@ -107,10 +107,10 @@ private: m_xTextField; css::uno::Reference< css::text::XTextContent > m_xMeta; - ::std::unique_ptr< css::uno::Any > m_pRubyText; - ::std::unique_ptr< css::uno::Any > m_pRubyStyle; - ::std::unique_ptr< css::uno::Any > m_pRubyAdjust; - ::std::unique_ptr< css::uno::Any > m_pRubyIsAbove; + std::unique_ptr< css::uno::Any > m_pRubyText; + std::unique_ptr< css::uno::Any > m_pRubyStyle; + std::unique_ptr< css::uno::Any > m_pRubyAdjust; + std::unique_ptr< css::uno::Any > m_pRubyIsAbove; sw::UnoCursorPointer m_pUnoCursor; const SwDepend m_FrameDepend; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 612b1be75fef..8de9ddbc8039 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -106,8 +106,8 @@ using namespace ::editeng; using namespace ::com::sun::star; using ::drawinglayer::primitive2d::BorderLinePrimitive2D; -using ::std::pair; -using ::std::make_pair; +using std::pair; +using std::make_pair; struct SwPaintProperties; @@ -2116,7 +2116,7 @@ void DrawGraphic( aGrf.SSize(), Size( aPaintOffset.X(), aPaintOffset.Y() ), nullptr, GraphicManagerDrawFlags::STANDARD, - ::std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); + std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); } // reset clipping at output device pOutDev->Pop(); diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index a456fdc93615..b3278a9420c1 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1095,10 +1095,10 @@ static void lcl_UnMerge( const SwTable& rTable, SwTableBox& rBox, size_t nCnt, return; if( nCnt > nCount ) nCnt = nCount; - ::std::unique_ptr<size_t[]> const pSplitIdx(new size_t[nCnt]); + std::unique_ptr<size_t[]> const pSplitIdx(new size_t[nCnt]); if( bSameHeight ) { - ::std::unique_ptr<SwTwips[]> const pHeights(new SwTwips[nCount]); + std::unique_ptr<SwTwips[]> const pHeights(new SwTwips[nCount]); SwTwips nHeight = 0; for (size_t i = 0; i < nCount; ++i) { diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 0ac496b05193..2cf4c4cd657e 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2556,7 +2556,7 @@ struct SwTableCellInfo::Impl const SwTable * m_pTable; const SwCellFrame * m_pCellFrame; const SwTabFrame * m_pTabFrame; - typedef ::std::set<const SwTableBox *> TableBoxes_t; + typedef std::set<const SwTableBox *> TableBoxes_t; TableBoxes_t m_HandledTableBoxes; public: diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 24ece607d45e..d953c208019b 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -1347,7 +1347,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements() OUString sStyleName; if ( !pInetFormatAttr ) { - ::std::vector<SwTextAttr *> const charAttrs( + std::vector<SwTextAttr *> const charAttrs( pNd->GetTextAttrsAt(rInf.GetIdx(), RES_TXTATR_CHARFMT)); // TODO: handle more than 1 char style? const SwCharFormat* pCharFormat = (charAttrs.size()) diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index c473980bc5ec..9ab99f1945bb 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -139,7 +139,7 @@ public: class SwTextSizeInfo : public SwTextInfo { private: - typedef ::std::map< sal_uIntPtr, sal_uInt16 > SwTextPortionMap; + typedef std::map< sal_uIntPtr, sal_uInt16 > SwTextPortionMap; protected: // during formatting, a small database is built, mapping portion pointers @@ -312,7 +312,7 @@ public: // stored in m_aMaxWidth and discarded after a line has been formatted. inline void SetMaxWidthDiff( const void *nKey, sal_uInt16 nVal ) { - m_aMaxWidth.insert( ::std::make_pair( reinterpret_cast<sal_uIntPtr>(nKey), nVal ) ); + m_aMaxWidth.insert( std::make_pair( reinterpret_cast<sal_uIntPtr>(nKey), nVal ) ); }; inline sal_uInt16 GetMaxWidthDiff( const void *nKey ) { diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index bfca27182846..9e8f5f439f8c 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -809,23 +809,23 @@ struct MakeUnoObject } }; -::std::vector< uno::Reference<text::XTextField> > +std::vector< uno::Reference<text::XTextField> > MetaFieldManager::getMetaFields() { // erase deleted fields const MetaFieldList_t::iterator iter( - ::std::remove_if(m_MetaFields.begin(), m_MetaFields.end(), + std::remove_if(m_MetaFields.begin(), m_MetaFields.end(), [] (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()); const MetaFieldList_t::iterator iter2( - ::std::remove_copy_if(m_MetaFields.begin(), m_MetaFields.end(), + std::remove_copy_if(m_MetaFields.begin(), m_MetaFields.end(), filtered.begin(), IsInUndo())); filtered.erase(iter2, filtered.end()); // create uno objects - ::std::vector< uno::Reference<text::XTextField> > ret(filtered.size()); - ::std::transform(filtered.begin(), filtered.end(), ret.begin(), + std::vector< uno::Reference<text::XTextField> > ret(filtered.size()); + std::transform(filtered.begin(), filtered.end(), ret.begin(), MakeUnoObject()); return ret; } diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 13064a1c2f6a..b8660b827185 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -1275,7 +1275,7 @@ static bool lcl_GetTextAttrParent(sal_Int32 nIndex, sal_Int32 nHintStart, sal_In static void lcl_GetTextAttrs( - ::std::vector<SwTextAttr *> *const pVector, + std::vector<SwTextAttr *> *const pVector, SwTextAttr **const ppTextAttr, SwpHints *const pSwpHints, sal_Int32 const nIndex, RES_TXTATR const nWhich, @@ -1337,10 +1337,10 @@ lcl_GetTextAttrs( } } -::std::vector<SwTextAttr *> +std::vector<SwTextAttr *> SwTextNode::GetTextAttrsAt(sal_Int32 const nIndex, RES_TXTATR const nWhich) const { - ::std::vector<SwTextAttr *> ret; + std::vector<SwTextAttr *> ret; lcl_GetTextAttrs(& ret, nullptr, m_pSwpHints, nIndex, nWhich, DEFAULT); return ret; } diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index b2228ec57443..f4094c574a44 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -242,7 +242,7 @@ MakeTextAttrNesting(SwTextNode & rNode, SwTextAttrNesting & rNesting, return static_txtattr_cast<SwTextAttrNesting*>(pNew); } -typedef ::std::vector<SwTextAttrNesting *> NestList_t; +typedef std::vector<SwTextAttrNesting *> NestList_t; static void lcl_DoSplitNew(NestList_t & rSplits, SwTextNode & rNode, @@ -253,7 +253,7 @@ lcl_DoSplitNew(NestList_t & rSplits, SwTextNode & rNode, const sal_Int32 nSplitPos( (bSplitAtStart) ? nOtherStart : nOtherEnd ); // first find the portion that is split (not necessarily the last one!) NestList_t::iterator const iter( - ::std::find_if( rSplits.begin(), rSplits.end(), + std::find_if( rSplits.begin(), rSplits.end(), [nSplitPos](SwTextAttrEnd * const pAttr) { return TextAttrContains(nSplitPos, pAttr); } ) ); diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 2e8a57e31ccd..cff5b541b5dd 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1106,11 +1106,11 @@ bool SwTextNode::Convert( SwConversionArgs &rArgs ) // (either all the text or the text within the selection // when the conversion was started) const sal_Int32 nTextBegin = ( rArgs.pStartNode == this ) - ? ::std::min(rArgs.pStartIdx->GetIndex(), m_Text.getLength()) + ? std::min(rArgs.pStartIdx->GetIndex(), m_Text.getLength()) : 0; const sal_Int32 nTextEnd = ( rArgs.pEndNode == this ) - ? ::std::min(rArgs.pEndIdx->GetIndex(), m_Text.getLength()) + ? std::min(rArgs.pEndIdx->GetIndex(), m_Text.getLength()) : m_Text.getLength(); rArgs.aConvText.clear(); diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 982c7f5e4a4c..06097f7f4509 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -277,9 +277,9 @@ class SwUndoDelSection : public SwUndo { private: - ::std::unique_ptr<SwSectionData> const m_pSectionData; /// section not TOX - ::std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX - ::std::unique_ptr<SfxItemSet> const m_pAttrSet; + std::unique_ptr<SwSectionData> const m_pSectionData; /// section not TOX + std::unique_ptr<SwTOXBase> const m_pTOXBase; /// set iff section is TOX + std::unique_ptr<SfxItemSet> const m_pAttrSet; std::shared_ptr< ::sfx2::MetadatableUndo > const m_pMetadataUndo; sal_uLong const m_nStartNode; sal_uLong const m_nEndNode; @@ -387,8 +387,8 @@ class SwUndoUpdateSection : public SwUndo { private: - ::std::unique_ptr<SwSectionData> m_pSectionData; - ::std::unique_ptr<SfxItemSet> m_pAttrSet; + std::unique_ptr<SwSectionData> m_pSectionData; + std::unique_ptr<SfxItemSet> m_pAttrSet; sal_uLong const m_nStartNode; bool const m_bOnlyAttrChanged; diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index 8047e000f2c6..3c4b828f58d1 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -31,7 +31,7 @@ namespace array (which you can get from an OUString with getStr()) and puts the result into the OUStringBuffer given in the CTOR */ -class lcl_Escape : public ::std::unary_function< sal_Unicode, void > +class lcl_Escape : public std::unary_function< sal_Unicode, void > { public: explicit lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} @@ -54,7 +54,7 @@ private: you can get from an OUString with getStr()) and puts the result into the OUStringBuffer given in the CTOR */ -class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void > +class lcl_UnEscape : public std::unary_function< sal_Unicode, void > { public: explicit lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {} @@ -188,7 +188,7 @@ bool lcl_getCellAddressFromXMLString( const sal_Unicode * pTableName = rXMLString.getStr(); // remove escapes from table name - ::std::for_each( pTableName + nStartPos, + std::for_each( pTableName + nStartPos, pTableName + nDelimiterPos, lcl_UnEscape( aTableNameBuffer )); @@ -359,7 +359,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange ) const sal_Unicode * pTableNameBeg = rRange.aTableName.getStr(); // append the quoted string at the buffer - ::std::for_each( pTableNameBeg, + std::for_each( pTableNameBeg, pTableNameBeg + rRange.aTableName.getLength(), lcl_Escape( aBuffer ) ); } diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 2cbd5fe63075..44e7b63bd6ac 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1056,7 +1056,7 @@ namespace : public SwSimpleEnumeration_Base { private: - typedef ::std::list< Any > frmcontainer_t; + typedef std::list< Any > frmcontainer_t; frmcontainer_t m_aFrames; protected: virtual ~SwXFrameEnumeration() {}; @@ -1084,7 +1084,7 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) return; // #i104937# const size_t nSize = pFormats->size(); - ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin()); + std::insert_iterator<frmcontainer_t> pInserter = std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin()); // #i104937# SwFrameFormat* pFormat( nullptr ); @@ -1239,7 +1239,7 @@ uno::Sequence<OUString> SwXFrames::getElementNames() throw( uno::RuntimeExceptio if(!IsValid()) throw uno::RuntimeException(); const Reference<XEnumeration> xEnum = createEnumeration(); - ::std::vector<OUString> vNames; + std::vector<OUString> vNames; while(xEnum->hasMoreElements()) { Reference<container::XNamed> xNamed; @@ -1654,7 +1654,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames() if(!IsValid()) throw uno::RuntimeException(); - ::std::vector< OUString > ret; + std::vector< OUString > ret; IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess(); for (IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin(); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index f3a725a53885..4e935d6fe8ea 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -466,7 +466,7 @@ bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry break; case FN_UNO_DOCUMENT_INDEX_MARK: { - ::std::vector<SwTextAttr *> marks; + std::vector<SwTextAttr *> marks; if (rPam.GetNode().IsTextNode()) { marks = rPam.GetNode().GetTextNode()->GetTextAttrsAt( @@ -620,7 +620,7 @@ bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry break; case FN_UNO_REFERENCE_MARK: { - ::std::vector<SwTextAttr *> marks; + std::vector<SwTextAttr *> marks; if (rPam.GetNode().IsTextNode()) { marks = ( diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index bd54a963b06c..7a2896c6e0cb 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -377,7 +377,7 @@ namespace : public SwSimpleEnumeration_Base { private: - typedef ::std::list< css::uno::Any > shapescontainer_t; + typedef std::list< css::uno::Any > shapescontainer_t; shapescontainer_t m_aShapes; protected: virtual ~SwXShapesEnumeration() {}; @@ -399,7 +399,7 @@ SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage) : m_aShapes() { SolarMutexGuard aGuard; - ::std::insert_iterator<shapescontainer_t> pInserter = ::std::insert_iterator<shapescontainer_t>(m_aShapes, m_aShapes.begin()); + std::insert_iterator<shapescontainer_t> pInserter = std::insert_iterator<shapescontainer_t>(m_aShapes, m_aShapes.begin()); sal_Int32 nCount = pDrawPage->getCount(); std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDrawPage->GetDoc()); for(sal_Int32 nIdx = 0; nIdx < nCount; nIdx++) diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 6eabb3793a99..e2efdad70749 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -589,7 +589,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, bool bSetValue = true; if( rPropertyName == UNO_NAME_SUB_TYPE ) { - const ::std::vector<OUString>& rExtraArr( + const std::vector<OUString>& rExtraArr( SwStyleNameMapper::GetExtraUINameArray()); const OUString sTypeName = pType->GetName(); static sal_uInt16 nIds[] = @@ -3021,7 +3021,7 @@ SwXFieldEnumeration::SwXFieldEnumeration(SwDoc & rDoc) } } // now handle meta-fields, which are not SwFields - const ::std::vector< uno::Reference<text::XTextField> > MetaFields( + const std::vector< uno::Reference<text::XTextField> > MetaFields( m_pImpl->m_pDoc->GetMetaFieldManager().getMetaFields() ); for (const auto & rMetaField : MetaFields) { diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index cb901d591c90..fbf405961139 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -274,7 +274,7 @@ public: class SwDocIndexDescriptorProperties_Impl { private: - ::std::unique_ptr<SwTOXBase> m_pTOXBase; + std::unique_ptr<SwTOXBase> m_pTOXBase; OUString m_sUserTOXTypeName; public: @@ -328,7 +328,7 @@ public: const TOXTypes m_eTOXType; bool m_bIsDescriptor; SwDoc * m_pDoc; - ::std::unique_ptr<SwDocIndexDescriptorProperties_Impl> m_pProps; + std::unique_ptr<SwDocIndexDescriptorProperties_Impl> m_pProps; uno::WeakReference<container::XIndexReplace> m_wStyleAccess; uno::WeakReference<container::XIndexReplace> m_wTokenAccess; @@ -1950,11 +1950,11 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) template<typename T> struct NotContainedIn { - ::std::vector<T> const& m_rVector; - explicit NotContainedIn(::std::vector<T> const& rVector) + std::vector<T> const& m_rVector; + explicit NotContainedIn(std::vector<T> const& rVector) : m_rVector(rVector) { } bool operator() (T const& rT) { - return ::std::find(m_rVector.begin(), m_rVector.end(), rT) + return std::find(m_rVector.begin(), m_rVector.end(), rT) == m_rVector.end(); } }; @@ -1986,7 +1986,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( | SetAttrMode::DONTEXPAND) : SetAttrMode::DONTEXPAND; - ::std::vector<SwTextAttr *> oldMarks; + std::vector<SwTextAttr *> oldMarks; if (bMark) { oldMarks = rPam.GetNode().GetTextNode()->GetTextAttrsAt( @@ -2005,11 +2005,11 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( { // #i107672# // ensure that we do not retrieve a different mark at the same position - ::std::vector<SwTextAttr *> const newMarks( + std::vector<SwTextAttr *> const newMarks( rPam.GetNode().GetTextNode()->GetTextAttrsAt( rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_TOXMARK)); - ::std::vector<SwTextAttr *>::const_iterator const iter( - ::std::find_if(newMarks.begin(), newMarks.end(), + std::vector<SwTextAttr *>::const_iterator const iter( + std::find_if(newMarks.begin(), newMarks.end(), NotContainedIn<SwTextAttr *>(oldMarks))); OSL_ASSERT(newMarks.end() != iter); if (newMarks.end() != iter) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 1a4bc629ea30..03587834f9f4 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -299,7 +299,7 @@ SwUnoCursorHelper::SetPageDesc( { return false; } - ::std::unique_ptr<SwFormatPageDesc> pNewDesc; + std::unique_ptr<SwFormatPageDesc> pNewDesc; const SfxPoolItem* pItem; if(SfxItemState::SET == rSet.GetItemState( RES_PAGEDESC, true, &pItem ) ) { @@ -420,7 +420,7 @@ lcl_setDropcapCharStyle(SwPaM & rPam, SfxItemSet & rItemSet, { throw lang::IllegalArgumentException(); } - ::std::unique_ptr<SwFormatDrop> pDrop; + std::unique_ptr<SwFormatDrop> pDrop; SfxPoolItem const* pItem(nullptr); if (SfxItemState::SET == rItemSet.GetItemState(RES_PARATR_DROP, true, &pItem)) @@ -445,7 +445,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue) throw lang::IllegalArgumentException(); } - ::std::unique_ptr<SwFormatRuby> pRuby; + std::unique_ptr<SwFormatRuby> pRuby; const SfxPoolItem* pItem; if (SfxItemState::SET == rItemSet.GetItemState(RES_TXTATR_CJK_RUBY, true, &pItem)) @@ -1880,8 +1880,8 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); const SfxItemPropertyMap &rMap = rPropSet.getPropertyMap(); - ::std::unique_ptr<SfxItemSet> pSet; - ::std::unique_ptr<SfxItemSet> pSetParent; + std::unique_ptr<SfxItemSet> pSet; + std::unique_ptr<SfxItemSet> pSetParent; for (sal_Int32 i = 0, nEnd = rPropertyNames.getLength(); i < nEnd; i++) { diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 71619b352d6b..010e4a1569c9 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -236,7 +236,7 @@ void CollectFrameAtNode( const SwNodeIndex& rIdx, rFrames.push_back(entry); } } - ::std::sort(rFrames.begin(), rFrames.end(), FrameClientSortListLess()); + std::sort(rFrames.begin(), rFrames.end(), FrameClientSortListLess()); } } @@ -453,7 +453,7 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration SwXParagraphEnumerationImpl( uno::Reference< text::XText > const& xParent, - ::std::shared_ptr<SwUnoCursor> pCursor, + std::shared_ptr<SwUnoCursor> pCursor, const CursorType eType, SwStartNode const*const pStartNode, SwTable const*const pTable) : m_xParentText( xParent ) @@ -515,7 +515,7 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration SwXParagraphEnumeration* SwXParagraphEnumeration::Create( uno::Reference< text::XText > const& xParent, - const ::std::shared_ptr<SwUnoCursor>& pCursor, + const std::shared_ptr<SwUnoCursor>& pCursor, const CursorType eType, SwStartNode const*const pStartNode, SwTable const*const pTable) @@ -1508,7 +1508,7 @@ struct SwXTextRangesImpl final : public SwXTextRanges virtual SwUnoCursor* GetCursor() override { return &(*m_pUnoCursor); }; void MakeRanges(); - ::std::vector< uno::Reference< text::XTextRange > > m_Ranges; + std::vector< uno::Reference< text::XTextRange > > m_Ranges; sw::UnoCursorPointer m_pUnoCursor; }; @@ -1655,8 +1655,8 @@ SwXParaFrameEnumerationImpl::SwXParaFrameEnumerationImpl( { FrameClientSortList_t vFrames; ::CollectFrameAtNode(rPaM.GetPoint()->nNode, vFrames, false); - ::std::transform(vFrames.begin(), vFrames.end(), - ::std::back_inserter(m_vFrames), + std::transform(vFrames.begin(), vFrames.end(), + std::back_inserter(m_vFrames), [] (const FrameClientSortListEntry& rEntry) { return rEntry.pFrameClient; }); } else if (pFormat) diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 920f3b70b8f6..07fe139b86f6 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -73,8 +73,8 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::std; -typedef ::std::pair< TextRangeList_t * const, SwTextAttr const * const > PortionList_t; -typedef ::std::stack< PortionList_t > PortionStack_t; +typedef std::pair< TextRangeList_t * const, SwTextAttr const * const > PortionList_t; +typedef std::stack< PortionList_t > PortionStack_t; static void lcl_CreatePortions( TextRangeList_t & i_rPortions, @@ -407,7 +407,7 @@ throw( container::NoSuchElementException, lang::WrappedTargetException, return any; } -typedef ::std::deque< sal_Int32 > FieldMarks_t; +typedef std::deque< sal_Int32 > FieldMarks_t; static void lcl_FillFieldMarkArray(FieldMarks_t & rFieldMarks, SwUnoCursor const & rUnoCursor, @@ -419,7 +419,7 @@ lcl_FillFieldMarkArray(FieldMarks_t & rFieldMarks, SwUnoCursor const & rUnoCurso const sal_Unicode fld[] = { CH_TXT_ATR_FIELDSTART, CH_TXT_ATR_FIELDEND, CH_TXT_ATR_FORMELEMENT, 0 }; - sal_Int32 pos = ::std::max(static_cast<const sal_Int32>(0), i_nStartPos); + sal_Int32 pos = std::max(static_cast<const sal_Int32>(0), i_nStartPos); while ((pos = ::comphelper::string::indexOfAny(pTextNode->GetText(), fld, pos)) != -1) { rFieldMarks.push_back(pos); @@ -580,7 +580,7 @@ static uno::Reference<text::XTextRange> lcl_CreateMetaPortion( uno::Reference<text::XText> const& xParent, const SwUnoCursor * const pUnoCursor, - SwTextAttr & rAttr, ::std::unique_ptr<TextRangeList_t const> && pPortions) + SwTextAttr & rAttr, std::unique_ptr<TextRangeList_t const> && pPortions) { const uno::Reference<rdf::XMetadatable> xMeta( SwXMeta::CreateXMeta( *static_cast<SwFormatMeta &>(rAttr.GetAttr()).GetMeta(), @@ -788,7 +788,7 @@ lcl_ExportHints( } else { - ::std::unique_ptr<const TextRangeList_t> + std::unique_ptr<const TextRangeList_t> pCurrentPortions(Top.first); rPortionStack.pop(); const uno::Reference<text::XTextRange> xPortion( @@ -961,7 +961,7 @@ lcl_ExportHints( if ((i_nEndPos < 0) || (*pAttr->GetEnd() <= i_nEndPos)) { - rPortionStack.push( ::std::make_pair( + rPortionStack.push( std::make_pair( new TextRangeList_t, pAttr )); } } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index d03d6a35e411..445cdf4a9177 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -187,11 +187,11 @@ throw (uno::RuntimeException, std::exception) template<typename T> struct NotContainedIn { - ::std::vector<T> const& m_rVector; - explicit NotContainedIn(::std::vector<T> const& rVector) + std::vector<T> const& m_rVector; + explicit NotContainedIn(std::vector<T> const& rVector) : m_rVector(rVector) { } bool operator() (T const& rT) { - return ::std::find(m_rVector.begin(), m_rVector.end(), rT) + return std::find(m_rVector.begin(), m_rVector.end(), rT) == m_rVector.end(); } }; @@ -214,7 +214,7 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, | SetAttrMode::DONTEXPAND) : SetAttrMode::DONTEXPAND; - ::std::vector<SwTextAttr *> oldMarks; + std::vector<SwTextAttr *> oldMarks; if (bMark) { oldMarks = rPam.GetNode().GetTextNode()->GetTextAttrsAt( @@ -234,11 +234,11 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam, { // #i107672# // ensure that we do not retrieve a different mark at the same position - ::std::vector<SwTextAttr *> const newMarks( + std::vector<SwTextAttr *> const newMarks( rPam.GetNode().GetTextNode()->GetTextAttrsAt( rPam.GetPoint()->nContent.GetIndex(), RES_TXTATR_REFMARK)); - ::std::vector<SwTextAttr *>::const_iterator const iter( - ::std::find_if(newMarks.begin(), newMarks.end(), + std::vector<SwTextAttr *>::const_iterator const iter( + std::find_if(newMarks.begin(), newMarks.end(), NotContainedIn<SwTextAttr *>(oldMarks))); OSL_ASSERT(newMarks.end() != iter); if (newMarks.end() != iter) @@ -317,7 +317,7 @@ SwXReferenceMark::getAnchor() throw (uno::RuntimeException, std::exception) &m_pImpl->m_pDoc->GetNodes())) { SwTextNode const& rTextNode = pTextMark->GetTextNode(); - const ::std::unique_ptr<SwPaM> pPam( (pTextMark->End()) + const std::unique_ptr<SwPaM> pPam( (pTextMark->End()) ? new SwPaM( rTextNode, *pTextMark->End(), rTextNode, pTextMark->GetStart()) : new SwPaM( rTextNode, pTextMark->GetStart()) ); @@ -641,7 +641,7 @@ private: public: uno::WeakReference<uno::XInterface> m_wThis; ::comphelper::OInterfaceContainerHelper2 m_EventListeners; - ::std::unique_ptr<const TextRangeList_t> m_pTextPortions; + std::unique_ptr<const TextRangeList_t> m_pTextPortions; // 3 possible states: not attached, attached, disposed bool m_bIsDisposed; bool m_bIsDescriptor; @@ -735,7 +735,7 @@ SwXMeta::CreateXMeta(SwDoc & rDoc, bool const isField) uno::Reference<rdf::XMetadatable> SwXMeta::CreateXMeta(::sw::Meta & rMeta, uno::Reference<text::XText> const& i_xParent, - ::std::unique_ptr<TextRangeList_t const> && pPortions) + std::unique_ptr<TextRangeList_t const> && pPortions) { // re-use existing SwXMeta // #i105557#: do not iterate over the registered clients: race condition diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index dbad25a0ad77..1f9285110e8a 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -70,14 +70,14 @@ struct SwTextSectionProperties_Impl OUString m_sSectionFilter; OUString m_sSectionRegion; - ::std::unique_ptr<SwFormatCol> m_pColItem; - ::std::unique_ptr<SvxBrushItem> m_pBrushItem; - ::std::unique_ptr<SwFormatFootnoteAtTextEnd> m_pFootnoteItem; - ::std::unique_ptr<SwFormatEndAtTextEnd> m_pEndItem; - ::std::unique_ptr<SvXMLAttrContainerItem> m_pXMLAttr; - ::std::unique_ptr<SwFormatNoBalancedColumns> m_pNoBalanceItem; - ::std::unique_ptr<SvxFrameDirectionItem> m_pFrameDirItem; - ::std::unique_ptr<SvxLRSpaceItem> m_pLRSpaceItem; + std::unique_ptr<SwFormatCol> m_pColItem; + std::unique_ptr<SvxBrushItem> m_pBrushItem; + std::unique_ptr<SwFormatFootnoteAtTextEnd> m_pFootnoteItem; + std::unique_ptr<SwFormatEndAtTextEnd> m_pEndItem; + std::unique_ptr<SvXMLAttrContainerItem> m_pXMLAttr; + std::unique_ptr<SwFormatNoBalancedColumns> m_pNoBalanceItem; + std::unique_ptr<SvxFrameDirectionItem> m_pFrameDirItem; + std::unique_ptr<SvxLRSpaceItem> m_pLRSpaceItem; bool m_bDDE; bool m_bHidden; @@ -112,7 +112,7 @@ public: const bool m_bIndexHeader; bool m_bIsDescriptor; OUString m_sName; - ::std::unique_ptr<SwTextSectionProperties_Impl> m_pProps; + std::unique_ptr<SwTextSectionProperties_Impl> m_pProps; Impl( SwXTextSection & rThis, SwSectionFormat *const pFormat, const bool bIndexHeader) @@ -512,8 +512,8 @@ lcl_UpdateLinkType(SwSection & rSection, bool const bLinkUpdateAlways = true) static void lcl_UpdateSection(SwSectionFormat *const pFormat, - ::std::unique_ptr<SwSectionData> const& pSectionData, - ::std::unique_ptr<SfxItemSet> const& pItemSet, + std::unique_ptr<SwSectionData> const& pSectionData, + std::unique_ptr<SfxItemSet> const& pItemSet, bool const bLinkModeChanged, bool const bLinkUpdateAlways = true) { if (pFormat) @@ -563,12 +563,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, throw uno::RuntimeException(); } - ::std::unique_ptr<SwSectionData> const pSectionData( + std::unique_ptr<SwSectionData> const pSectionData( (pFormat) ? new SwSectionData(*pFormat->GetSection()) : nullptr); OUString const*const pPropertyNames = rPropertyNames.getConstArray(); uno::Any const*const pValues = rValues.getConstArray(); - ::std::unique_ptr<SfxItemSet> pItemSet; + std::unique_ptr<SfxItemSet> pItemSet; bool bLinkModeChanged = false; bool bLinkMode = false; @@ -1473,10 +1473,10 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) static_cast<cppu::OWeakObject *>(this)); } - ::std::unique_ptr<SwSectionData> const pSectionData( + std::unique_ptr<SwSectionData> const pSectionData( (pFormat) ? new SwSectionData(*pFormat->GetSection()) : nullptr); - ::std::unique_ptr<SfxItemSet> pNewAttrSet; + std::unique_ptr<SfxItemSet> pNewAttrSet; bool bLinkModeChanged = false; switch (pEntry->nWID) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index f7d522faf517..5dcf99c3ab40 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1352,7 +1352,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFormat { bool bChapterNum = pHeadingStyleName != nullptr; - ::std::vector<PropertyValue> aPropertyValues; + std::vector<PropertyValue> aPropertyValues; aPropertyValues.reserve(32); //fill all properties into the array @@ -1631,7 +1631,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat( }; const beans::PropertyValue* pPropArray = rProperties.getConstArray(); - ::std::vector<PropertyValue const*> aPropertyValues; + std::vector<PropertyValue const*> aPropertyValues; bool bExcept = false; for(sal_Int32 i = 0; i < rProperties.getLength() && !bExcept; i++) { diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index add72dba4218..ddb9d46d271d 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -109,7 +109,7 @@ public: void ConvertCell( const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, - ::std::vector<SwNodeRange> & rRowNodes, + std::vector<SwNodeRange> & rRowNodes, SwNodeRange *const pLastCell, bool & rbExcept); @@ -1810,7 +1810,7 @@ static bool lcl_SimilarPosition( const sal_Int32 nPos1, const sal_Int32 nPos2 ) void SwXText::Impl::ConvertCell( const uno::Sequence< uno::Reference< text::XTextRange > > & rCell, - ::std::vector<SwNodeRange> & rRowNodes, + std::vector<SwNodeRange> & rRowNodes, SwNodeRange *const pLastCell, bool & rbExcept) { @@ -2042,7 +2042,7 @@ lcl_ApplyCellProperties( TableColumnSeparators const& rRowSeparators, const uno::Sequence< beans::PropertyValue >& rCellProperties, const uno::Reference< uno::XInterface >& xCell, - ::std::vector<VerticallyMergedCell> & rMergedCells) + std::vector<VerticallyMergedCell> & rMergedCells) { const sal_Int32 nCellProperties = rCellProperties.getLength(); const uno::Reference< beans::XPropertySet > xCellPS(xCell, uno::UNO_QUERY); @@ -2158,7 +2158,7 @@ lcl_ApplyCellProperties( } static void -lcl_MergeCells(::std::vector<VerticallyMergedCell> & rMergedCells) +lcl_MergeCells(std::vector<VerticallyMergedCell> & rMergedCells) { if (rMergedCells.size()) { diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 9c09330a3feb..e04bc3564f1f 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1083,7 +1083,7 @@ class HTMLEndPosLst // but the text length // the script that is valid up to the position // contained in aScriptChgList at the same index - ::std::vector<sal_uInt16> aScriptLst; + std::vector<sal_uInt16> aScriptLst; SwDoc *pDoc; // das aktuelle Dokument SwDoc* pTemplate; // die HTML-Vorlage (oder 0) diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index 89f19c538bd9..6c9e57668dcf 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -177,8 +177,8 @@ public: class SvxCSS1Parser : public CSS1Parser { - typedef ::std::vector<std::unique_ptr<CSS1Selector>> CSS1Selectors; - typedef ::std::map<OUString, std::unique_ptr<SvxCSS1MapEntry>> CSS1Map; + typedef std::vector<std::unique_ptr<CSS1Selector>> CSS1Selectors; + typedef std::map<OUString, std::unique_ptr<SvxCSS1MapEntry>> CSS1Map; CSS1Selectors m_Selectors; // List of "open" Selectors CSS1Map m_Ids; diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 41d7c73dc1c2..c82ba953fa39 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -331,7 +331,7 @@ class HTMLTable; class SwCSS1Parser; class SwHTMLNumRuleInfo; -typedef ::std::vector<std::unique_ptr<ImageMap>> ImageMaps; +typedef std::vector<std::unique_ptr<ImageMap>> ImageMaps; #define HTML_CNTXT_PROTECT_STACK 0x0001 #define HTML_CNTXT_STRIP_PARA 0x0002 diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 222f76db7560..2ffbe0074239 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -184,7 +184,7 @@ bool Writer::CopyNextPam( SwPaM ** ppPam ) sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const { const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); - const IDocumentMarkAccess::const_iterator_t ppBkmk = ::std::lower_bound( + const IDocumentMarkAccess::const_iterator_t ppBkmk = std::lower_bound( pMarkAccess->getAllMarksBegin(), pMarkAccess->getAllMarksEnd(), rPos, diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx index a0cf156cb6dc..8a2392d643ab 100644 --- a/sw/source/filter/ww8/WW8FFData.cxx +++ b/sw/source/filter/ww8/WW8FFData.cxx @@ -146,7 +146,7 @@ void WW8FFData::Write(SvStream * pDataStrm) sal_uInt32 nListboxEntries = msListEntries.size(); pDataStrm->WriteUInt32( nListboxEntries ); - ::std::vector< OUString >::const_iterator aIt = msListEntries.begin(); + std::vector< OUString >::const_iterator aIt = msListEntries.begin(); while (aIt != msListEntries.end()) { diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index f861a07753c2..eaa7afc0f935 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -60,7 +60,7 @@ private: OUString msMacroEnter; OUString msMacroExit; - ::std::vector< OUString > msListEntries; + std::vector< OUString > msListEntries; protected: static void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero); diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index ba2f094e5135..327d1cf555a6 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -346,7 +346,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() #ifdef DBG_UTIL -::std::string WW8TableNodeInfoInner::toString() const +std::string WW8TableNodeInfoInner::toString() const { static char buffer[256]; snprintf(buffer, sizeof(buffer), @@ -365,7 +365,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() mnShadowsAfter, mbVertMerge ? "yes" : "no"); - return ::std::string(buffer); + return std::string(buffer); } #endif @@ -384,14 +384,14 @@ WW8TableNodeInfo::~WW8TableNodeInfo() } #ifdef DBG_UTIL -::std::string WW8TableNodeInfo::toString() const +std::string WW8TableNodeInfo::toString() const { static char buffer[1024]; snprintf(buffer, sizeof(buffer), "<tableNodeInfo p=\"%p\" depth=\"%" SAL_PRIuUINT32 "\">" ,this, getDepth()); - ::std::string sResult(buffer); + std::string sResult(buffer); Inners_t::const_iterator aIt(mInners.begin()); Inners_t::const_iterator aEnd(mInners.end()); @@ -1006,7 +1006,7 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const } #ifdef DBG_UTIL -::std::string CellInfo::toString() const +std::string CellInfo::toString() const { static char sBuffer[256]; @@ -1287,9 +1287,9 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells(RowEndInners_t &rLastRowEnds) } #ifdef DBG_UTIL -::std::string WW8TableCellGrid::toString() +std::string WW8TableCellGrid::toString() { - ::std::string sResult = "<WW8TableCellGrid>"; + std::string sResult = "<WW8TableCellGrid>"; RowTops_t::const_iterator aTopsIt = getRowTopsBegin(); static char sBuffer[1024]; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index f77c3ec14e95..10378cc3837c 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -40,13 +40,13 @@ namespace ww8 const unsigned int MAXTABLECELLS = 63; class WW8TableNodeInfo; -typedef ::std::vector<const SwTableBox *> TableBoxVector; +typedef std::vector<const SwTableBox *> TableBoxVector; typedef std::shared_ptr<TableBoxVector> TableBoxVectorPtr; -typedef ::std::vector<sal_uInt32> GridCols; +typedef std::vector<sal_uInt32> GridCols; typedef std::shared_ptr<GridCols> GridColsPtr; -typedef ::std::vector<sal_Int32> RowSpans; +typedef std::vector<sal_Int32> RowSpans; typedef std::shared_ptr<RowSpans> RowSpansPtr; -typedef ::std::vector<sal_uInt32> Widths; +typedef std::vector<sal_uInt32> Widths; typedef std::shared_ptr<Widths> WidthsPtr; class WW8TableNodeInfoInner @@ -108,7 +108,7 @@ public: RowSpansPtr getRowSpansOfRow(); #ifdef DBG_UTIL - ::std::string toString() const; + std::string toString() const; #endif }; @@ -152,21 +152,21 @@ public: } #ifdef DBG_UTIL - ::std::string toString() const; + std::string toString() const; #endif }; -typedef ::std::multiset<CellInfo, ::std::less<CellInfo> > CellInfoMultiSet; -typedef ::std::map<sal_uInt32, WW8TableNodeInfoInner*, - ::std::greater<sal_uInt32> > RowEndInners_t; +typedef std::multiset<CellInfo, std::less<CellInfo> > CellInfoMultiSet; +typedef std::map<sal_uInt32, WW8TableNodeInfoInner*, + std::greater<sal_uInt32> > RowEndInners_t; class WW8TableInfo; class WW8TableNodeInfo { public: - typedef ::std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, - ::std::greater<sal_uInt32> > Inners_t; + typedef std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, + std::greater<sal_uInt32> > Inners_t; private: WW8TableInfo * mpParent; @@ -212,7 +212,7 @@ public: sal_uInt32 getRow() const; #ifdef DBG_UTIL - ::std::string toString() const; + std::string toString() const; #endif bool operator < (const WW8TableNodeInfo & rInfo) const; @@ -257,8 +257,8 @@ public: class WW8TableCellGrid { - typedef ::std::set<long> RowTops_t; - typedef ::std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t; + typedef std::set<long> RowTops_t; + typedef std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t; RowTops_t m_aRowTops; Rows_t m_aRows; @@ -281,7 +281,7 @@ public: WW8TableNodeInfo *connectCells(RowEndInners_t &rLastRowEnds); #ifdef DBG_UTIL - ::std::string toString(); + std::string toString(); #endif TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo); diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index 87593aa80e13..c2ec261d0d20 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -26,7 +26,7 @@ class SwFormatFootnote; namespace docx { -typedef ::std::vector< const SwFormatFootnote* > FootnotesVector; +typedef std::vector< const SwFormatFootnote* > FootnotesVector; /** Remember footnotes/endnotes so that we can dump them in one go. diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 6599d344e150..ad109615836f 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -104,7 +104,7 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule ) // Is this list now duplicated into a new list which we should use // #i77812# - perform 'deep' search in duplication map - ::std::map<sal_uInt16,sal_uInt16>::const_iterator aResult = m_aRuleDuplicates.end(); + std::map<sal_uInt16,sal_uInt16>::const_iterator aResult = m_aRuleDuplicates.end(); do { aResult = m_aRuleDuplicates.find(nRet); if ( aResult != m_aRuleDuplicates.end() ) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 21fcf6290e02..3373bec0b3d1 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -80,7 +80,7 @@ using namespace nsHdFtFlags; /// For the output of sections. struct WW8_PdAttrDesc { - ::std::unique_ptr<sal_uInt8[]> m_pData; + std::unique_ptr<sal_uInt8[]> m_pData; sal_uInt16 m_nLen; WW8_FC m_nSepxFcPos; WW8_PdAttrDesc() : m_nLen(0), m_nSepxFcPos(0xffffffff) /*default: none*/ @@ -828,7 +828,7 @@ bool operator<(const wwFont &r1, const wwFont &r2) sal_uInt16 wwFontHelper::GetId(const wwFont &rFont) { sal_uInt16 nRet; - ::std::map<wwFont, sal_uInt16>::const_iterator aIter = maFonts.find(rFont); + std::map<wwFont, sal_uInt16>::const_iterator aIter = maFonts.find(rFont); if (aIter != maFonts.end()) nRet = aIter->second; else @@ -888,11 +888,11 @@ sal_uInt16 wwFontHelper::GetId(const SvxFontItem& rFont) return GetId(aFont); } -::std::vector< const wwFont* > wwFontHelper::AsVector() const +std::vector< const wwFont* > wwFontHelper::AsVector() const { - ::std::vector<const wwFont *> aFontList( maFonts.size() ); + std::vector<const wwFont *> aFontList( maFonts.size() ); - typedef ::std::map<wwFont, sal_uInt16>::const_iterator myiter; + typedef std::map<wwFont, sal_uInt16>::const_iterator myiter; myiter aEnd = maFonts.end(); for ( myiter aIter = maFonts.begin(); aIter != aEnd; ++aIter ) aFontList[aIter->second] = &aIter->first; @@ -912,7 +912,7 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib) * Convert from fast insertion map to linear vector in the order that we * want to write. */ - ::std::vector<const wwFont *> aFontList( AsVector() ); + std::vector<const wwFont *> aFontList( AsVector() ); /* * Write them all to pTableStream @@ -929,7 +929,7 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib) void wwFontHelper::WriteFontTable( DocxAttributeOutput& rAttrOutput ) { - ::std::vector<const wwFont *> aFontList( AsVector() ); + std::vector<const wwFont *> aFontList( AsVector() ); for ( auto aFont : aFontList ) aFont->WriteDocx(&rAttrOutput); @@ -937,7 +937,7 @@ void wwFontHelper::WriteFontTable( DocxAttributeOutput& rAttrOutput ) void wwFontHelper::WriteFontTable( const RtfAttributeOutput& rAttrOutput ) { - ::std::vector<const wwFont *> aFontList( AsVector() ); + std::vector<const wwFont *> aFontList( AsVector() ); for ( auto aFont : aFontList ) aFont->WriteRtf(&rAttrOutput); @@ -2152,8 +2152,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, OSL_ENSURE( aCps.size() + 2 == pTextPos->Count(), "WritePlc: DeSync" ); - ::std::vector<std::pair<OUString,OUString> > aStrArr; - typedef ::std::vector<std::pair<OUString,OUString> >::iterator myiter; + std::vector<std::pair<OUString,OUString> > aStrArr; + typedef std::vector<std::pair<OUString,OUString> >::iterator myiter; WW8Fib& rFib = *rWrt.pFib; // n+1-th CP-Pos according to the manual sal_uInt16 i; bool bWriteCP = true; @@ -2183,8 +2183,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, } //sort and remove duplicates - ::std::sort(aStrArr.begin(), aStrArr.end(),&lcl_AuthorComp); - myiter aIter = ::std::unique(aStrArr.begin(), aStrArr.end()); + std::sort(aStrArr.begin(), aStrArr.end(),&lcl_AuthorComp); + myiter aIter = std::unique(aStrArr.begin(), aStrArr.end()); aStrArr.erase(aIter, aStrArr.end()); // Also sort the start and end positions. We need to reference @@ -2367,7 +2367,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]); //aStrArr is sorted - myiter aIter = ::std::lower_bound(aStrArr.begin(), + myiter aIter = std::lower_bound(aStrArr.begin(), aStrArr.end(), std::pair<OUString,OUString>(rAtn.msOwner,OUString()), &lcl_AuthorComp); OSL_ENSURE(aIter != aStrArr.end() && aIter->first == rAtn.msOwner, diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index de83fa4f4365..a5b2c16d4616 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2906,7 +2906,7 @@ void WW8Export::WriteFkpPlcUsw() if ( pSttbfAssoc ) // #i106057# { - ::std::vector<OUString> aStrings(pSttbfAssoc->getStrings()); + std::vector<OUString> aStrings(pSttbfAssoc->getStrings()); WriteAsStringTable(aStrings, pFib->fcSttbfAssoc, pFib->lcbSttbfAssoc); } diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 683076061470..91680a022f1a 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -233,7 +233,7 @@ public: class WW8_WrPlcSepx : public MSWordSections { std::vector<WW8_CP> aCps; - ::std::vector< std::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 @@ -310,10 +310,10 @@ class wwFontHelper { private: /// Keep track of fonts that need to be exported. - ::std::map<wwFont, sal_uInt16> maFonts; + std::map<wwFont, sal_uInt16> maFonts; /// Convert from fast insertion map to linear vector in the order that we want to write. - ::std::vector< const wwFont* > AsVector() const; + std::vector< const wwFont* > AsVector() const; public: wwFontHelper() : bLoadAllFonts(false) {} @@ -402,7 +402,7 @@ private: HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) = delete; }; -typedef ::std::pair<OUString, sal_uLong> aBookmarkPair; +typedef std::pair<OUString, sal_uLong> aBookmarkPair; class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor { @@ -559,7 +559,7 @@ public: SwPaM *m_pCurPam, *m_pOrigPam; /// Stack to remember the nesting (see MSWordSaveData for more) - ::std::stack< MSWordSaveData > m_aSaveData; + std::stack< MSWordSaveData > m_aSaveData; /// Used to split the runs according to the bookmarks start and ends typedef std::vector< ::sw::mark::IMark* > IMarkVector; @@ -1043,7 +1043,7 @@ public: void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo); - void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf, + void WriteAsStringTable(const std::vector<OUString>&, sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf); virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override; diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 1b62971817fe..55ca91e5c530 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -71,8 +71,8 @@ private: sal_uInt16 nStrings; static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile, - const ::std::vector<OUString>& rStrings, - const ::std::vector<ww::bytes>& rExtra); + const std::vector<OUString>& rStrings, + const std::vector<ww::bytes>& rExtra); static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx); WW8Glossary(const WW8Glossary&) = delete; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ac5379fc0492..b7501a5b049c 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1154,7 +1154,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, aMemStream.WriteUInt16( 0 ).WriteUInt16( nBufferSize ); // copy from DFF stream to memory stream - ::std::vector< sal_uInt8 > aBuffer( nBufferSize ); + std::vector< sal_uInt8 > aBuffer( nBufferSize ); sal_uInt8* pnData = &aBuffer.front(); sal_uInt8 nStreamSize; if (pnData && rSt.ReadBytes(pnData, nBufferSize) == nBufferSize) @@ -1396,7 +1396,7 @@ void SwWW8ReferencedFltEndStack::SetAttrInDoc( const SwPosition& rTmpPos, if ( pFltBookmark != nullptr && pFltBookmark->IsTOCBookmark() ) { const OUString& rName = pFltBookmark->GetName(); - ::std::set< OUString, SwWW8::ltstr >::const_iterator aResult = aReferencedTOCBookmarks.find(rName); + std::set< OUString, SwWW8::ltstr >::const_iterator aResult = aReferencedTOCBookmarks.find(rName); if ( aResult == aReferencedTOCBookmarks.end() ) { bInsertBookmarkIntoDoc = false; @@ -5973,7 +5973,7 @@ const OUString* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx) if (!m_pAtnNames && m_pWwFib->lcbGrpStAtnOwners) { // Determine authors: can be found in the TableStream - m_pAtnNames = new ::std::vector<OUString>; + m_pAtnNames = new std::vector<OUString>; SvStream& rStrm = *m_pTableStream; long nOldPos = rStrm.Tell(); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 250bbc8d113a..aa45c909be29 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -494,11 +494,11 @@ inline bool get_flag( Type nBitField, Type nMask ) template< typename ReturnType, typename Type > inline ReturnType ulimit_cast( Type nValue, ReturnType nMax ) -{ return static_cast< ReturnType >( ::std::min< Type >( nValue, nMax ) ); } +{ return static_cast< ReturnType >( std::min< Type >( nValue, nMax ) ); } template< typename ReturnType, typename Type > inline ReturnType ulimit_cast( Type nValue ) -{ return ulimit_cast( nValue, ::std::numeric_limits< ReturnType >::max() ); } +{ return ulimit_cast( nValue, std::numeric_limits< ReturnType >::max() ); } class SwMacroInfo : public SdrObjUserData { @@ -821,8 +821,8 @@ private: */ SwWW8ImplReader& mrReader; std::deque<wwSection> maSegments; - typedef ::std::deque<wwSection>::iterator mySegIter; - typedef ::std::deque<wwSection>::reverse_iterator mySegrIter; + typedef std::deque<wwSection>::iterator mySegIter; + typedef std::deque<wwSection>::reverse_iterator mySegrIter; //Num of page desc's entered into the document sal_uInt16 mnDesc; diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 7f2a884e0ee4..79482b5e2a7e 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -291,7 +291,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr) if ( pFieldmark != nullptr ) { uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size()); - ::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), vListEntries.begin()); + std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), vListEntries.begin()); (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries); sal_Int32 nIndex = aFormula.mfDropdownIndex < aFormula.maListEntries.size() ? aFormula.mfDropdownIndex : 0; (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(nIndex); diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 7c02c895b8ee..02f2e2f6ac98 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -447,7 +447,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, void SwWW8ImplReader::ReadRevMarkAuthorStrTabl( SvStream& rStrm, sal_Int32 nTablePos, sal_Int32 nTableSiz, SwDoc& rDocOut ) { - ::std::vector<OUString> aAuthorNames; + std::vector<OUString> aAuthorNames; WW8ReadSTTBF( !m_bVer67, rStrm, nTablePos, nTableSiz, m_bVer67 ? 2 : 0, m_eStructCharSet, aAuthorNames ); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index ab18387cfa26..306403b63fa8 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1273,7 +1273,7 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pField, { //Get the name of the ref field, and see if actually a variable const OUString sName = pField->GetPar1(); - ::std::map<OUString, OUString, SwWW8::ltstr>::const_iterator + std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult = aFieldVarNames.find(sName); if (aResult != aFieldVarNames.end()) @@ -1297,7 +1297,7 @@ OUString SwWW8ImplReader::GetMappedBookmark(const OUString &rOrigName) //See if there has been a variable set with this name, if so get //the pseudo bookmark name that was set with it. - ::std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult = + std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult = m_pReffingStck->aFieldVarNames.find(sName); return (aResult == m_pReffingStck->aFieldVarNames.end()) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 545605da7ea3..694ff1a2250c 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -3813,7 +3813,7 @@ bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF) // WW8PLCF_Book void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen, sal_uInt16 nExtraLen, rtl_TextEncoding eCS, std::vector<OUString> &rArray, - std::vector<ww::bytes>* pExtraArray, ::std::vector<OUString>* pValueArray) + std::vector<ww::bytes>* pExtraArray, std::vector<OUString>* pValueArray) { if (nLen==0) // Handle Empty STTBF return; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 11cb3f759878..c2f03bb1e1e1 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -169,8 +169,8 @@ class WW8PLCFx_PCD; attention: the *extra data* of each string are SKIPPED and ignored */ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen, - sal_uInt16 nExtraLen, rtl_TextEncoding eCS, ::std::vector<OUString> &rArray, - ::std::vector<ww::bytes>* pExtraArray = nullptr, ::std::vector<OUString>* pValueArray = nullptr); + sal_uInt16 nExtraLen, rtl_TextEncoding eCS, std::vector<OUString> &rArray, + std::vector<ww::bytes>* pExtraArray = nullptr, std::vector<OUString>* pValueArray = nullptr); struct WW8FieldDesc { @@ -851,7 +851,7 @@ enum ManTypes // enums for PLCFMan-ctor struct WW8PLCFxDesc { WW8PLCFx* pPLCFx; - ::std::stack<sal_uInt16>* pIdStack; // memory for Attr-Id for Attr-end(s) + std::stack<sal_uInt16>* pIdStack; // memory for Attr-Id for Attr-end(s) const sal_uInt8* pMemPos;// where are the Sprm(s) long nOrigSprmsLen; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index f78866b692f9..1fd0b9c2ae40 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } -typedef ::std::map< OUString, RedlineInfo* > RedlineMapType; +typedef std::map< OUString, RedlineInfo* > RedlineMapType; class XMLRedlineImportHelper { diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index d8e589c1e5db..e631a98e200d 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -410,7 +410,7 @@ void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps) } } -sal_Int32 SwXMLExport::GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) +sal_Int32 SwXMLExport::GetDocumentSpecificSettings( std::list< SettingsGroup >& _out_rSettings ) { // the only doc-specific settings group we know so far are the XForms settings uno::Sequence<beans::PropertyValue> aXFormsSettings; diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index b1bd141b27d0..e0729b4ad14d 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -43,7 +43,7 @@ class SwTableNode; class XMLPropertySetMapper; class SwXMLTableLines_Impl; -typedef ::std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl; +typedef std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl; class SwXMLExport : public SvXMLExport { @@ -95,7 +95,7 @@ class SwXMLExport : public SvXMLExport virtual void ExportContent_() override; virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; - virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override; + virtual sal_Int32 GetDocumentSpecificSettings( std::list< SettingsGroup >& _out_rSettings ) override; void setBlockMode(); private: diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index f50e8e21ebf9..e2ac39e0bffd 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -258,7 +258,7 @@ protected: virtual void exportStyleAttributes( SvXMLAttributeList& rAttrList, sal_Int32 nFamily, - const ::std::vector< XMLPropertyState >& rProperties, + const std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap @@ -272,7 +272,7 @@ public: void SwXMLAutoStylePoolP::exportStyleAttributes( SvXMLAttributeList& rAttrList, sal_Int32 nFamily, - const ::std::vector< XMLPropertyState >& rProperties, + const std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap @@ -282,7 +282,7 @@ void SwXMLAutoStylePoolP::exportStyleAttributes( if( XML_STYLE_FAMILY_TEXT_PARAGRAPH == nFamily ) { - for( ::std::vector< XMLPropertyState >::const_iterator + for( std::vector< XMLPropertyState >::const_iterator aProperty = rProperties.begin(); aProperty != rProperties.end(); ++aProperty ) diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index f4b89d1985eb..59a2f24db9dd 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -61,8 +61,8 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::xmloff::token; using table::XCell; -using ::std::vector; -using ::std::advance; +using std::vector; +using std::advance; // string constants for table cell export static const char g_sNumberFormat[] = "NumberFormat"; diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index a62c92cf45bf..461091f6ffe0 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -910,7 +910,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra void SwXMLTextImportHelper::endAppletOrPlugin( const uno::Reference < XPropertySet > &rPropSet, - ::std::map < const OUString, OUString > &rParamMap) + std::map < const OUString, OUString > &rParamMap) { // this method will modify the document directly -> lock SolarMutex SolarMutexGuard aGuard; @@ -935,8 +935,8 @@ void SwXMLTextImportHelper::endAppletOrPlugin( const sal_Int32 nCount = rParamMap.size(); uno::Sequence< beans::PropertyValue > aCommandSequence( nCount ); - ::std::map < const OUString, OUString > ::iterator aIter = rParamMap.begin(); - ::std::map < const OUString, OUString > ::iterator aEnd = rParamMap.end(); + std::map < const OUString, OUString > ::iterator aIter = rParamMap.begin(); + std::map < const OUString, OUString > ::iterator aEnd = rParamMap.end(); sal_Int32 nIndex=0; while (aIter != aEnd ) { diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 1d19ebf33e10..24f49912afac 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -79,7 +79,7 @@ public: virtual void endAppletOrPlugin( const css::uno::Reference < css::beans::XPropertySet > &rPropSet, - ::std::map < const OUString, OUString > &rParamMap) override; + std::map < const OUString, OUString > &rParamMap) override; virtual bool IsInHeaderFooter() const override; diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index af687914653f..c677afc681ce 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -146,7 +146,7 @@ void SwAddressControl_Impl::SetData(SwCSVData& rDBData) } //now create appropriate controls - ::std::vector< OUString >::iterator aHeaderIter; + std::vector< OUString >::iterator aHeaderIter; long nFTXPos = m_pWindow->LogicToPixel(Point(RSC_SP_CTRL_X, RSC_SP_CTRL_X), MAP_APPFONT).X(); long nFTHeight = m_pWindow->LogicToPixel(Size(RSC_BS_CHARHEIGHT, RSC_BS_CHARHEIGHT), MAP_APPFONT).Height(); @@ -455,7 +455,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( } while(pStream->ReadByteStringLine( sLine, RTL_TEXTENCODING_UTF8 )) { - ::std::vector<OUString> aNewData; + std::vector<OUString> aNewData; //analyze data line sal_Int32 nDataCount = comphelper::string::getTokenCount(sLine, '\t'); sal_Int32 nIndex = 0; @@ -480,7 +480,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( const sal_uInt32 nCount = rAddressHeader.Count(); for(sal_uInt32 nHeader = 0; nHeader < nCount; ++nHeader) m_pCSVData->aDBColumnHeaders.push_back( rAddressHeader.GetString(nHeader)); - ::std::vector<OUString> aNewData; + std::vector<OUString> aNewData; OUString sTemp; aNewData.insert(aNewData.begin(), nCount, sTemp); m_pCSVData->aDBData.push_back(aNewData); @@ -518,7 +518,7 @@ void SwCreateAddressListDialog::dispose() IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); - ::std::vector<OUString> aNewData; + std::vector<OUString> aNewData; OUString sTemp; aNewData.insert(aNewData.begin(), m_pCSVData->aDBColumnHeaders.size(), sTemp); m_pCSVData->aDBData.insert(m_pCSVData->aDBData.begin() + ++nCurrent, aNewData); @@ -557,7 +557,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) { m_pFindDlg = VclPtr<SwFindEntryDialog>::Create(this); ListBox& rColumnBox = m_pFindDlg->GetFieldsListBox(); - ::std::vector< OUString >::iterator aHeaderIter; + std::vector< OUString >::iterator aHeaderIter; for(aHeaderIter = m_pCSVData->aDBColumnHeaders.begin(); aHeaderIter != m_pCSVData->aDBColumnHeaders.end(); ++aHeaderIter) @@ -586,7 +586,7 @@ IMPL_LINK_TYPED(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, { ListBox& rColumnBox = m_pFindDlg->GetFieldsListBox(); rColumnBox.Clear(); - ::std::vector< OUString >::iterator aHeaderIter; + std::vector< OUString >::iterator aHeaderIter; for(aHeaderIter = m_pCSVData->aDBColumnHeaders.begin(); aHeaderIter != m_pCSVData->aDBColumnHeaders.end(); ++aHeaderIter) @@ -597,12 +597,12 @@ IMPL_LINK_TYPED(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, namespace { -void lcl_WriteValues(const ::std::vector<OUString> *pFields, SvStream* pStream) +void lcl_WriteValues(const std::vector<OUString> *pFields, SvStream* pStream) { OUString sLine; - const ::std::vector< OUString >::const_iterator aBegin = pFields->begin(); - const ::std::vector< OUString >::const_iterator aEnd = pFields->end(); - for(::std::vector< OUString >::const_iterator aIter = aBegin; aIter != aEnd; ++aIter) + const std::vector< OUString >::const_iterator aBegin = pFields->begin(); + const std::vector< OUString >::const_iterator aEnd = pFields->end(); + for(std::vector< OUString >::const_iterator aIter = aBegin; aIter != aEnd; ++aIter) { if (aIter==aBegin) { @@ -648,7 +648,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) lcl_WriteValues(&(m_pCSVData->aDBColumnHeaders), pStream); - ::std::vector< ::std::vector< OUString > >::iterator aDataIter; + std::vector< std::vector< OUString > >::iterator aDataIter; for( aDataIter = m_pCSVData->aDBData.begin(); aDataIter != m_pCSVData->aDBData.end(); ++aDataIter) { lcl_WriteValues(&(*aDataIter), pStream); @@ -714,7 +714,7 @@ void SwCreateAddressListDialog::Find(const OUString& rSearch, sal_Int32 nColumn) { for(nPos = nStart; nPos < nEnd; ++nPos) { - ::std::vector< OUString> aData = m_pCSVData->aDBData[nPos]; + std::vector< OUString> aData = m_pCSVData->aDBData[nPos]; if(nColumn >=0) bFound = -1 != aData[(sal_uInt32)nColumn].toAsciiLowerCase().indexOf(sSearch); else diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 0fced148e5fe..6398cc89fddc 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -33,8 +33,8 @@ class SwMailMergeConfigItem; // container of the created database struct SwCSVData { - ::std::vector< OUString > aDBColumnHeaders; - ::std::vector< ::std::vector< OUString> > aDBData; + std::vector< OUString > aDBColumnHeaders; + std::vector< std::vector< OUString> > aDBData; }; class SwFindEntryDialog; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index dcec0a444d56..097e1d435b60 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -684,7 +684,7 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address { //search in ListBox if it's one of the first entries OUString sSelect; - ::std::vector<OUString>* pVector = nullptr; + std::vector<OUString>* pVector = nullptr; switch(nSelected) { case USER_DATA_SALUTATION: sSelect = m_sCurrentSalutation; @@ -700,7 +700,7 @@ IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, SelectionChangedHdl_Impl, Address } m_pFieldCB->Clear(); if(pVector) { - ::std::vector<OUString>::iterator aIterator; + std::vector<OUString>::iterator aIterator; for( aIterator = pVector->begin(); aIterator != pVector->end(); ++aIterator) m_pFieldCB->InsertEntry(*aIterator); } @@ -798,9 +798,9 @@ class SwAssignFieldsControl : public Control VclPtr<HeaderBar> m_aHeaderHB; VclPtr<Window> m_aWindow; - ::std::vector<VclPtr<FixedText> > m_aFieldNames; - ::std::vector<VclPtr<ListBox> > m_aMatches; - ::std::vector<VclPtr<FixedText> > m_aPreviews; + std::vector<VclPtr<FixedText> > m_aFieldNames; + std::vector<VclPtr<ListBox> > m_aMatches; + std::vector<VclPtr<FixedText> > m_aPreviews; SwMailMergeConfigItem* m_rConfigItem; diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index b1df29cc0a46..55fcb75fced0 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -210,8 +210,8 @@ private: VclPtr<OKButton> m_pOK; - ::std::vector<OUString> m_aSalutations; - ::std::vector<OUString> m_aPunctuations; + std::vector<OUString> m_aSalutations; + std::vector<OUString> m_aPunctuations; OUString m_sCurrentSalutation; OUString m_sCurrentPunctuation; diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index e176958d92a3..5239e643f263 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -92,7 +92,7 @@ struct SwSendMailDialog_Impl friend class SwSendMailDialog; ::osl::Mutex aDescriptorMutex; - ::std::vector< SwMailDescriptor > aDescriptors; + std::vector< SwMailDescriptor > aDescriptors; sal_uInt32 nCurrentDescriptor; sal_uInt32 nDocumentCount; ::rtl::Reference< MailDispatcher > xMailDispatcher; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index ac5956ff4184..df4760deb996 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -428,10 +428,10 @@ static size_t lcl_GetFrameMapCount( const FrameMap* pMap) } static void lcl_InsertVectors(ListBox& rBox, - const ::std::vector< OUString >& rPrev, const ::std::vector< OUString >& rThis, - const ::std::vector< OUString >& rNext, const ::std::vector< OUString >& rRemain) + const std::vector< OUString >& rPrev, const std::vector< OUString >& rThis, + const std::vector< OUString >& rNext, const std::vector< OUString >& rRemain) { - ::std::vector< OUString >::const_iterator aIt; + std::vector< OUString >::const_iterator aIt; sal_Int32 nEntry = 0; for(aIt = rPrev.begin(); aIt != rPrev.end(); ++aIt) nEntry = rBox.InsertEntry(*aIt); @@ -3012,10 +3012,10 @@ void SwFrameAddPage::Reset(const SfxItemSet *rSet ) sNextChain = pFlyFormat->GetName(); } //determine chainable frames - ::std::vector< OUString > aPrevPageFrames; - ::std::vector< OUString > aThisPageFrames; - ::std::vector< OUString > aNextPageFrames; - ::std::vector< OUString > aRemainFrames; + std::vector< OUString > aPrevPageFrames; + std::vector< OUString > aThisPageFrames; + std::vector< OUString > aNextPageFrames; + std::vector< OUString > aRemainFrames; m_pWrtSh->GetConnectableFrameFormats(*pFormat, sNextChain, false, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); lcl_InsertVectors(*m_pPrevLB, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); @@ -3214,10 +3214,10 @@ IMPL_LINK_TYPED(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) for(sal_Int32 nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) rChangeLB.RemoveEntry(nEntry - 1); //determine chainable frames - ::std::vector< OUString > aPrevPageFrames; - ::std::vector< OUString > aThisPageFrames; - ::std::vector< OUString > aNextPageFrames; - ::std::vector< OUString > aRemainFrames; + std::vector< OUString > aPrevPageFrames; + std::vector< OUString > aThisPageFrames; + std::vector< OUString > aNextPageFrames; + std::vector< OUString > aRemainFrames; m_pWrtSh->GetConnectableFrameFormats(*pFormat, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox, aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); lcl_InsertVectors(rChangeLB, diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 18945f4fb230..b3cb4d870e9f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3900,7 +3900,7 @@ void SwEntryBrowseBox::Resize() { long nWidth = GetSizePixel().Width(); std::vector<long> aWidths = GetOptimalColWidths(); - long nNaturalWidth(::std::accumulate(aWidths.begin(), aWidths.end(), 0)); + long nNaturalWidth(std::accumulate(aWidths.begin(), aWidths.end(), 0)); long nExcess = ((nWidth - nNaturalWidth) / aWidths.size()) - 1; for (size_t i = 0; i < aWidths.size(); ++i) @@ -3941,7 +3941,7 @@ Size SwEntryBrowseBox::GetOptimalSize() const std::vector<long> aWidths = GetOptimalColWidths(); - long nWidth(::std::accumulate(aWidths.begin(), aWidths.end(), 0)); + long nWidth(std::accumulate(aWidths.begin(), aWidths.end(), 0)); aSize.Width() = std::max(aSize.Width(), nWidth); diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index c25f853aa237..d4dc4746dfb6 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -3064,7 +3064,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Find(const OUString& rName) return nullptr; } -void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList, +void SwStyleSheetIterator::AppendStyleList(const std::vector<OUString>& rList, bool bTestUsed, bool bTestHidden, bool bOnlyHidden, sal_uInt16 nSection, char cType ) { diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index 2c04440e50ed..2464878b136b 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -326,7 +326,7 @@ class StoredChapterNumberingRootContext private: SwChapterNumRules & m_rNumRules; size_t m_nCounter; - ::std::vector<tools::SvRef<SvxXMLListStyleContext>> m_Contexts; + std::vector<tools::SvRef<SvxXMLListStyleContext>> m_Contexts; public: StoredChapterNumberingRootContext( diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 92782781756c..ec5c0f83fd4b 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1277,7 +1277,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, long nStartRow, nEndRow; bool bFreezedLayouts = false; // to collect temporary email files - ::std::vector< OUString> aFilesToRemove; + std::vector< OUString> aFilesToRemove; // The SfxObjectShell will be closed explicitly later but // it is more safe to use SfxObjectShellLock here diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 3ef954f53d4e..06f0a092d16b 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -165,7 +165,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( struct SwAddressPreview_Impl { - ::std::vector< OUString > aAddresses; + std::vector< OUString > aAddresses; sal_uInt16 nRows; sal_uInt16 nColumns; sal_uInt16 nSelectedAddress; @@ -598,7 +598,7 @@ SwMergeAddressItem SwAddressIterator::Next() nOpen = sAddress.getLength(); if (nReturn == -1) nReturn = sAddress.getLength(); - sal_Int32 nTarget = ::std::min(nOpen, nReturn); + sal_Int32 nTarget = std::min(nOpen, nReturn); aRet.sText = sAddress.copy(0, nTarget); sAddress = sAddress.copy(nTarget); } diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index fee73e958c69..287c647a4967 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -92,8 +92,8 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem OUString m_sFilter; sal_Int32 m_nResultSetCursorPos; - ::std::vector<DBAddressDataAssignment> m_aAddressDataAssignments; - ::std::vector< OUString> m_aAddressBlocks; + std::vector<DBAddressDataAssignment> m_aAddressDataAssignments; + std::vector< OUString> m_aAddressBlocks; sal_Int32 m_nCurrentAddressBlock; bool m_bIsAddressBlock; bool m_bIsHideEmptyParagraphs; @@ -104,11 +104,11 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem bool m_bIsGreetingLine; bool m_bIsIndividualGreetingLine; - ::std::vector< OUString> m_aFemaleGreetingLines; + std::vector< OUString> m_aFemaleGreetingLines; sal_Int32 m_nCurrentFemaleGreeting; - ::std::vector< OUString> m_aMaleGreetingLines; + std::vector< OUString> m_aMaleGreetingLines; sal_Int32 m_nCurrentMaleGreeting; - ::std::vector< OUString> m_aNeutralGreetingLines; + std::vector< OUString> m_aNeutralGreetingLines; sal_Int32 m_nCurrentNeutralGreeting; OUString m_sFemaleGenderValue; uno::Sequence< OUString> m_aSavedDocuments; @@ -142,7 +142,7 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem ResStringArray m_AddressHeaderSA; //these addresses are not stored in the configuration - ::std::vector< SwDocMergeInfo > m_aMergeInfos; + std::vector< SwDocMergeInfo > m_aMergeInfos; //we do overwrite the usersettings in a special case //than we do remind the usersettings here @@ -578,7 +578,7 @@ void SwMailMergeConfigItem_Impl::ImplCommit() //load the existing node names to find new names Sequence<OUString> aAssignments = GetNodeNames(OUString::createFromAscii(cAddressDataAssignments)); - ::std::vector<DBAddressDataAssignment>::iterator aAssignIter; + std::vector<DBAddressDataAssignment>::iterator aAssignIter; for(aAssignIter = m_aAddressDataAssignments.begin(); aAssignIter != m_aAddressDataAssignments.end(); ++aAssignIter) { @@ -649,7 +649,7 @@ void SwMailMergeConfigItem_Impl::SetAddressBlocks( const Sequence< OUString> SwMailMergeConfigItem_Impl::GetGreetings( SwMailMergeConfigItem::Gender eType, bool bConvertToConfig) const { - const ::std::vector< OUString>& rGreetings = + const std::vector< OUString>& rGreetings = eType == SwMailMergeConfigItem::FEMALE ? m_aFemaleGreetingLines : eType == SwMailMergeConfigItem::MALE ? m_aMaleGreetingLines : m_aNeutralGreetingLines; @@ -669,7 +669,7 @@ void SwMailMergeConfigItem_Impl::SetGreetings( const Sequence< OUString>& rSetGreetings, bool bConvertFromConfig) { - ::std::vector< OUString>& rGreetings = + std::vector< OUString>& rGreetings = eType == SwMailMergeConfigItem::FEMALE ? m_aFemaleGreetingLines : eType == SwMailMergeConfigItem::MALE ? m_aMaleGreetingLines : m_aNeutralGreetingLines; @@ -1146,7 +1146,7 @@ Sequence< OUString> SwMailMergeConfigItem::GetColumnAssignment( const SwDBData& rDBData ) const { Sequence< OUString> aRet; - ::std::vector<DBAddressDataAssignment>::iterator aAssignIter; + std::vector<DBAddressDataAssignment>::iterator aAssignIter; for(aAssignIter = m_pImpl->m_aAddressDataAssignments.begin(); aAssignIter != m_pImpl->m_aAddressDataAssignments.end(); ++aAssignIter) { @@ -1174,7 +1174,7 @@ OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData, const Sequence< OUString>& rList) { - ::std::vector<DBAddressDataAssignment>::iterator aAssignIter; + std::vector<DBAddressDataAssignment>::iterator aAssignIter; bool bFound = false; for(aAssignIter = m_pImpl->m_aAddressDataAssignments.begin(); aAssignIter != m_pImpl->m_aAddressDataAssignments.end(); ++aAssignIter) diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index c6c98aa34ddc..c6b6da2109ae 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -885,7 +885,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) { IDocumentMarkAccess* const pMarkAccess = pTmpDoc->getIDocumentMarkAccess(); - ::std::vector< ::sw::mark::IMark* > vDdeMarks; + std::vector< ::sw::mark::IMark* > vDdeMarks; // find all DDE-Bookmarks for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin(); ppMark != pMarkAccess->getAllMarksEnd(); @@ -895,7 +895,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) vDdeMarks.push_back(ppMark->get()); } // remove all DDE-Bookmarks, they are invalid inside the clipdoc! - for(::std::vector< ::sw::mark::IMark* >::iterator ppMark = vDdeMarks.begin(); + for(std::vector< ::sw::mark::IMark* >::iterator ppMark = vDdeMarks.begin(); ppMark != vDdeMarks.end(); ++ppMark) pMarkAccess->deleteMark(*ppMark); diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 69e53842a0b4..4f8d0e147788 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -127,7 +127,7 @@ drawinglayer::primitive2d::Primitive2DContainer AnchorPrimitive::create2DDecompo } else { - ::std::vector< double > aDotDashArray; + std::vector< double > aDotDashArray; const double fDistance(3.0 * 15.0); const double fDashLen(5.0 * 15.0); diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx index a664362e0abe..228dbf1523f8 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx @@ -48,7 +48,7 @@ namespace { } }; - typedef ::std::map < SidebarWinKey, VclPtr<sw::sidebarwindows::SwSidebarWin>, SidebarWinOrder > SidebarWinContainer; + typedef std::map < SidebarWinKey, VclPtr<sw::sidebarwindows::SwSidebarWin>, SidebarWinOrder > SidebarWinContainer; struct FrameKey { @@ -73,7 +73,7 @@ namespace { } }; - typedef ::std::map < FrameKey, SidebarWinContainer, FrameOrder > FrameSidebarWinContainer_; + typedef std::map < FrameKey, SidebarWinContainer, FrameOrder > FrameSidebarWinContainer_; } namespace sw { namespace sidebarwindows { diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx index 64eab46ea637..7996f48c85b7 100644 --- a/sw/source/uibase/inc/glosdoc.hxx +++ b/sw/source/uibase/inc/glosdoc.hxx @@ -35,8 +35,8 @@ typedef tools::SvRef<SwDocShell> SwDocShellRef; #include <vector> #include "swdllapi.h" -typedef ::std::vector< css::uno::WeakReference< css::text::XAutoTextGroup > > UnoAutoTextGroups; -typedef ::std::vector< css::uno::WeakReference< css::text::XAutoTextEntry > > UnoAutoTextEntries; +typedef std::vector< css::uno::WeakReference< css::text::XAutoTextGroup > > UnoAutoTextGroups; +typedef std::vector< css::uno::WeakReference< css::text::XAutoTextEntry > > UnoAutoTextEntries; #define GLOS_DELIM (sal_Unicode)'*' diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index c0a6dec4f498..34f0cda32bea 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -142,8 +142,8 @@ private: private: css::uno::Reference< css::mail::XSmtpService> mailserver_; - ::std::list< css::uno::Reference< css::mail::XMailMessage > > messages_; - ::std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_; + std::list< css::uno::Reference< css::mail::XMailMessage > > messages_; + std::list< ::rtl::Reference<IMailDispatcherListener> > listeners_; ::osl::Mutex message_container_mutex_; ::osl::Mutex listener_container_mutex_; ::osl::Mutex thread_status_mutex_; diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx index 9caf27cb6236..9101b0e45e1f 100644 --- a/sw/source/uibase/inc/navmgr.hxx +++ b/sw/source/uibase/inc/navmgr.hxx @@ -33,7 +33,7 @@ private: * (e.g. click a link, or double click an entry from the navigator). * Every use of the back/forward buttons results in moving the stack pointer within the navigation history */ - typedef ::std::vector< sw::UnoCursorPointer > Stack_t; + typedef std::vector< sw::UnoCursorPointer > Stack_t; Stack_t m_entries; Stack_t::size_type m_nCurrent; /* Current position within the navigation history */ SwWrtShell & m_rMyShell; /* The active shell within which the navigation occurs */ diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index b6da39f2f056..a7d02171204e 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -259,7 +259,7 @@ public: class SwInsertSectionTabDialog : public SfxTabDialog { SwWrtShell& rWrtSh; - ::std::unique_ptr<SwSectionData> m_pSectionData; + std::unique_ptr<SwSectionData> m_pSectionData; sal_uInt16 m_nSectionPageId; sal_uInt16 m_nColumnPageId; diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index ae5f8388725d..110d09165c1d 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -86,7 +86,7 @@ class SwGrfShell::SwExternalToolEdit { private: SwWrtShell *const m_pShell; - ::std::shared_ptr<SwUnoCursor> const m_pCursor; + std::shared_ptr<SwUnoCursor> const m_pCursor; public: explicit SwExternalToolEdit(SwWrtShell *const pShell) diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 606e01c551bc..7d6285cc53e7 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -92,9 +92,9 @@ private: ::sfx2::sidebar::ControllerItem maSwPageLRControl; ::sfx2::sidebar::ControllerItem maSwPageULControl; - ::std::unique_ptr<SvxPageItem> mpPageItem; - ::std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem; - ::std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem; + std::unique_ptr<SvxPageItem> mpPageItem; + std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem; + std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem; FieldUnit meFUnit, meLastFUnit; SfxMapUnit meUnit; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index b1456a9540fa..baa225714980 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -162,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. - ::std::unique_ptr<SvxPageItem> mpPageItem; + std::unique_ptr<SvxPageItem> mpPageItem; // item keeping the page style's left and right margins - ::std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem; + std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem; // item keeping the page style's top and bottom margins - ::std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem; + std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem; // item keeping the page style's page size - ::std::unique_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 - ::std::unique_ptr<SfxInt16Item> mpPageColumnTypeItem; + std::unique_ptr<SfxInt16Item> mpPageColumnTypeItem; FieldUnit meFUnit; SfxMapUnit meUnit; diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 20b3c8a3b449..a6a30e92de68 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -90,7 +90,7 @@ PageSizeControl::PageSizeControl( OUString aWidthStr; OUString aHeightStr; OUString aItemText2; - for ( ::std::vector< Paper >::size_type nPaperIdx = 0; + for ( std::vector< Paper >::size_type nPaperIdx = 0; nPaperIdx < maPaperList.size(); ++nPaperIdx ) { diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index f434b2b2ca55..54cc4697c9bd 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -58,7 +58,7 @@ private: VclPtr<MetricField> maWidthHeightField; Paper mePaper; - ::std::vector< Paper > maPaperList; + std::vector< Paper > maPaperList; PagePropertyPanel& mrPagePropPanel; diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index f440f31669d9..121a77a554bb 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -324,7 +324,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) // pool formats - const ::std::vector<OUString>& rFramePoolArr( + const std::vector<OUString>& rFramePoolArr( SwStyleNameMapper::GetFrameFormatUINameArray()); for(const auto & i : rFramePoolArr) { diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 33812bb0beed..1cd00ba5aec7 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -384,7 +384,7 @@ IMPL_LINK_TYPED( SwView, MoveNavigationHdl, void*, p, void ) // collect navigator reminders IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); - ::std::vector< const ::sw::mark::IMark* > vNavMarks; + std::vector< const ::sw::mark::IMark* > vNavMarks; for( IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin(); ppMark != pMarkAccess->getAllMarksEnd(); ++ppMark) diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index ed63dbb30d31..3256047eb187 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3485,7 +3485,7 @@ void SwXTextDocument::resetSelection() pWrtShell->ResetSelect(nullptr, false); } -void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, ::std::exception) +void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) { SystemGraphicsData aData; aData.nSize = sizeof(SystemGraphicsData); diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index 37f2828e683c..408181cc86a9 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -108,7 +108,7 @@ void SwBookmarkControl::Command( const CommandEvent& rCEvt ) IDocumentMarkAccess* const pMarkAccess = pWrtShell->getIDocumentMarkAccess(); IDocumentMarkAccess::const_iterator_t ppBookmarkStart = pMarkAccess->getBookmarksBegin(); sal_uInt16 nPopupId = 1; - ::std::map<sal_Int32, sal_uInt16> aBookmarkIdx; + std::map<sal_Int32, sal_uInt16> aBookmarkIdx; for(IDocumentMarkAccess::const_iterator_t ppBookmark = ppBookmarkStart; ppBookmark != pMarkAccess->getBookmarksEnd(); ++ppBookmark) diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index a90970c13787..f87e656b6801 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -504,13 +504,13 @@ void SwNavigationPI::MakeMark() IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); // collect and sort navigator reminder names - ::std::vector< OUString > vNavMarkNames; + std::vector< OUString > vNavMarkNames; for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin(); ppMark != pMarkAccess->getAllMarksEnd(); ++ppMark) if( IDocumentMarkAccess::GetType(**ppMark) == IDocumentMarkAccess::MarkType::NAVIGATOR_REMINDER ) vNavMarkNames.push_back(ppMark->get()->GetName()); - ::std::sort(vNavMarkNames.begin(), vNavMarkNames.end()); + std::sort(vNavMarkNames.begin(), vNavMarkNames.end()); // we are maxed out and delete one // nAutoMarkIdx rotates through the available MarkNames diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx index 13888fc5bcab..3c5aa8c9ae16 100644 --- a/sw/source/uibase/wrtsh/navmgr.cxx +++ b/sw/source/uibase/wrtsh/navmgr.cxx @@ -157,7 +157,7 @@ bool SwNavigationMgr::addEntry(const SwPosition& rPos) { int curr = m_nCurrent; // Index from which we'll twist the tail. int n = (number_ofm_entries - curr) / 2; // Number of entries that will swap places for (int i = 0; i < n; i++) { - ::std::swap(m_entries[curr + i], m_entries[number_ofm_entries -1 - i]); + std::swap(m_entries[curr + i], m_entries[number_ofm_entries -1 - i]); } if (*m_entries.back()->GetPoint() != rPos) |