[Libreoffice-commits] core.git: sw/inc sw/source
Mark Page
aptitude at btconnect.com
Thu Jun 16 08:02:57 UTC 2016
sw/inc/IDocumentListItems.hxx | 2
sw/inc/IDocumentMarkAccess.hxx | 4
sw/inc/IDocumentOutlineNodes.hxx | 2
sw/inc/IMark.hxx | 2
sw/inc/SwStyleNameMapper.hxx | 56 ++++++------
sw/inc/doc.hxx | 2
sw/inc/docstyle.hxx | 2
sw/inc/fesh.hxx | 8 -
sw/inc/fmtmeta.hxx | 4
sw/inc/ndarr.hxx | 4
sw/inc/ndtxt.hxx | 4
sw/inc/shellio.hxx | 2
sw/inc/swtable.hxx | 2
sw/inc/swundo.hxx | 2
sw/inc/tblsel.hxx | 2
sw/inc/undobj.hxx | 2
sw/inc/unobaseclass.hxx | 2
sw/inc/unotxdoc.hxx | 2
sw/source/core/access/accframe.cxx | 4
sw/source/core/access/accframe.hxx | 4
sw/source/core/access/accfrmobjmap.cxx | 4
sw/source/core/access/accfrmobjmap.hxx | 8 -
sw/source/core/access/acchypertextdata.hxx | 2
sw/source/core/access/accmap.cxx | 8 -
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/accselectionhelper.cxx | 24 ++---
sw/source/core/access/acctable.cxx | 38 ++++----
sw/source/core/access/acctable.hxx | 2
sw/source/core/access/textmarkuphelper.cxx | 4
sw/source/core/crsr/crstrvl.cxx | 4
sw/source/core/crsr/swcrsr.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 30 +++---
sw/source/core/doc/DocumentStatisticsManager.cxx | 2
sw/source/core/doc/SwStyleNameMapper.cxx | 74 ++++++++--------
sw/source/core/doc/doc.cxx | 8 -
sw/source/core/doc/docbm.cxx | 16 +--
sw/source/core/doc/doccomp.cxx | 2
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/docsort.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 12 +-
sw/source/core/frmedt/fetab.cxx | 4
sw/source/core/inc/DocumentListItemsManager.hxx | 2
sw/source/core/inc/DocumentOutlineNodesManager.hxx | 2
sw/source/core/inc/MarkManager.hxx | 2
sw/source/core/inc/UndoAttribute.hxx | 26 ++---
sw/source/core/inc/UndoBookmark.hxx | 2
sw/source/core/inc/UndoInsert.hxx | 2
sw/source/core/inc/UndoSection.hxx | 12 +-
sw/source/core/inc/mvsave.hxx | 4
sw/source/core/inc/rolbck.hxx | 12 +-
sw/source/core/inc/swthreadmanager.hxx | 2
sw/source/core/inc/unometa.hxx | 6 -
sw/source/core/inc/unoparaframeenum.hxx | 4
sw/source/core/inc/unoport.hxx | 10 +-
sw/source/core/layout/paintfrm.cxx | 6 -
sw/source/core/table/swnewtable.cxx | 4
sw/source/core/table/swtable.cxx | 2
sw/source/core/text/EnhancedPDFExportHelper.cxx | 2
sw/source/core/text/inftxt.hxx | 4
sw/source/core/txtnode/fmtatr2.cxx | 10 +-
sw/source/core/txtnode/ndtxt.cxx | 6 -
sw/source/core/txtnode/thints.cxx | 4
sw/source/core/txtnode/txtedt.cxx | 4
sw/source/core/undo/unsect.cxx | 10 +-
sw/source/core/unocore/XMLRangeHelper.cxx | 8 -
sw/source/core/unocore/unocoll.cxx | 8 -
sw/source/core/unocore/unocrsrhelper.cxx | 4
sw/source/core/unocore/unodraw.cxx | 4
sw/source/core/unocore/unofield.cxx | 4
sw/source/core/unocore/unoidx.cxx | 18 +--
sw/source/core/unocore/unoobj.cxx | 10 +-
sw/source/core/unocore/unoobj2.cxx | 12 +-
sw/source/core/unocore/unoportenum.cxx | 14 +--
sw/source/core/unocore/unorefmk.cxx | 20 ++--
sw/source/core/unocore/unosect.cxx | 30 +++---
sw/source/core/unocore/unosett.cxx | 4
sw/source/core/unocore/unotext.cxx | 8 -
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/svxcss1.hxx | 4
sw/source/filter/html/swhtml.hxx | 2
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/WW8FFData.cxx | 2
sw/source/filter/ww8/WW8FFData.hxx | 2
sw/source/filter/ww8/WW8TableInfo.cxx | 14 +--
sw/source/filter/ww8/WW8TableInfo.hxx | 30 +++---
sw/source/filter/ww8/docxfootnotes.hxx | 2
sw/source/filter/ww8/wrtw8num.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 26 ++---
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/wrtww8.hxx | 12 +-
sw/source/filter/ww8/ww8glsy.hxx | 4
sw/source/filter/ww8/ww8par.cxx | 6 -
sw/source/filter/ww8/ww8par.hxx | 8 -
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par4.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 4
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/ww8/ww8scan.hxx | 6 -
sw/source/filter/xml/XMLRedlineImportHelper.hxx | 2
sw/source/filter/xml/xmlexp.cxx | 2
sw/source/filter/xml/xmlexp.hxx | 4
sw/source/filter/xml/xmlfmte.cxx | 6 -
sw/source/filter/xml/xmltble.cxx | 4
sw/source/filter/xml/xmltexti.cxx | 6 -
sw/source/filter/xml/xmltexti.hxx | 2
sw/source/ui/dbui/createaddresslistdialog.cxx | 24 ++---
sw/source/ui/dbui/createaddresslistdialog.hxx | 4
sw/source/ui/dbui/mmaddressblockpage.cxx | 10 +-
sw/source/ui/dbui/mmaddressblockpage.hxx | 4
sw/source/ui/dbui/mmoutputtypepage.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 22 ++--
sw/source/ui/index/cnttab.cxx | 4
sw/source/uibase/app/docstyle.cxx | 2
sw/source/uibase/config/StoredChapterNumbering.cxx | 2
sw/source/uibase/dbui/dbmgr.cxx | 2
sw/source/uibase/dbui/mailmergehelper.cxx | 4
sw/source/uibase/dbui/mmconfigitem.cxx | 22 ++--
sw/source/uibase/dochdl/swdtflvr.cxx | 4
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 2
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 4
sw/source/uibase/inc/glosdoc.hxx | 4
sw/source/uibase/inc/maildispatcher.hxx | 4
sw/source/uibase/inc/navmgr.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 2
sw/source/uibase/shells/grfsh.cxx | 2
sw/source/uibase/sidebar/PageFormatPanel.hxx | 6 -
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 10 +-
sw/source/uibase/sidebar/PageSizeControl.cxx | 2
sw/source/uibase/sidebar/PageSizeControl.hxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewmdi.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 2
sw/source/uibase/utlui/bookctrl.cxx | 2
sw/source/uibase/utlui/navipi.cxx | 4
sw/source/uibase/wrtsh/navmgr.cxx | 2
135 files changed, 484 insertions(+), 484 deletions(-)
New commits:
commit d2106d8c8c1af64924f5423223388dbbe99af352
Author: Mark Page <aptitude at btconnect.com>
Date: Wed Jun 15 13:44:28 2016 +0100
Remove the :: prefix in ::std for sw
This patch was created using a script
Variable name textual alignment is preserved to the same level
Change-Id: I6b4858f8059b8cf71fc253e87d6df634362d62e9
Reviewed-on: https://gerrit.libreoffice.org/26306
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index e0e1679..e8573e5 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 a0bdeb6..6bd844d 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 5803f70..f4aa9b2 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 a132b6a..9ae6fb8 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 d4fd06e..2c34d80 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 412b419..71d4886 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 56a7568..2e9355c 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 c66cb9a..bd68cb1 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 d660f99..1ac8c05 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 39078e7..abbf27e 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 14d189e..2abdf11 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 ebd19461..dd1ceae 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 309f7e3..665d7ff 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 5c5f197..2617031 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 4e50bb39..f49fc29 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 d83db23..79d890c 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 367af0c..119bccb7 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 8ab8567..7fc6b2d 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 aafafd8..b4beb8c 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 337ecb3..8a4ef37 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 fc492a7..28511ab 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 84c113a..819c331 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 1a02729..ea1d349 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 4c2aaae..2f902ad 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 beef3e2..d497cfe 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 8827404..dccc35d 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 c626b09..28611e2 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 8afd565..84930ef 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 5f7ae08..960c14e 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 7dd29d4..bebb41b 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 dab51af..e86bef3 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 f15934d..7f21526 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 81ed9f4..90bc30b 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 2cdd353..5a4044b 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 f58f8bc..ea80892 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 89252fb..7fb4fdcf 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 fa2ca52..ce48a9d 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 db6ccf9..1b55385 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 220e3cb..cbf5c9a 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 302c706..17c69b8 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 fc6108b..5d0538f 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 ca557cf..77b80ab 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 8afafe4..76dccf69 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 ac93ab3..bc0aecd 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 f0320d9..c68a4bc 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 7cfb462..401c15e 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 8192d32..b72f9d0 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 fa70a73..1cfbef5 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 fe926d3..c7a06b0 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 a756779..f4b412b 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 a57c916..3d29867 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 d5447f5..bd9268f 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 9c33589..9584ab9 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 3931230..39c0569 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 612b1be..8de9ddb 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 a456fdc..b3278a9 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 0ac496b..2cf4c4c 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 24ece60..d953c20 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 c473980..9ab99f1 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 bfca271..9e8f5f4 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 13064a1..b8660b8 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 b2228ec5..f4094c5 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 2e8a57e..cff5b54 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 982c7f5..06097f7 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 8047e00..3c4b828 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 2cbd5fe..44e7b63 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 f3a725a..4e935d6 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 bd54a96..7a2896c 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 6eabb37..e2efdad 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 cb901d5..fbf4059 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(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list