summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMark Page <aptitude@btconnect.com>2016-06-15 13:44:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-06-16 08:02:23 +0000
commitd2106d8c8c1af64924f5423223388dbbe99af352 (patch)
tree14b7998527b8a7058df86a110442b1ff08561f30 /sw/inc
parentbd4ef2734b60d2188874178f173c9163ced09ce7 (diff)
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@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/IDocumentListItems.hxx2
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx4
-rw-r--r--sw/inc/IDocumentOutlineNodes.hxx2
-rw-r--r--sw/inc/IMark.hxx2
-rw-r--r--sw/inc/SwStyleNameMapper.hxx56
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/inc/docstyle.hxx2
-rw-r--r--sw/inc/fesh.hxx8
-rw-r--r--sw/inc/fmtmeta.hxx4
-rw-r--r--sw/inc/ndarr.hxx4
-rw-r--r--sw/inc/ndtxt.hxx4
-rw-r--r--sw/inc/shellio.hxx2
-rw-r--r--sw/inc/swtable.hxx2
-rw-r--r--sw/inc/swundo.hxx2
-rw-r--r--sw/inc/tblsel.hxx2
-rw-r--r--sw/inc/undobj.hxx2
-rw-r--r--sw/inc/unobaseclass.hxx2
-rw-r--r--sw/inc/unotxdoc.hxx2
18 files changed, 52 insertions, 52 deletions
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index e0e1679814ac..e8573e59879f 100644
--- a/sw/inc/IDocumentListItems.hxx
+++ b/sw/inc/IDocumentListItems.hxx
@@ -29,7 +29,7 @@ class SwNodeNum;
class IDocumentListItems
{
public:
- typedef ::std::vector< const SwNodeNum* > tSortedNodeNumList;
+ typedef std::vector< const SwNodeNum* > tSortedNodeNumList;
virtual void addListItem( const SwNodeNum& rNodeNum ) = 0;
virtual void removeListItem( const SwNodeNum& rNodeNum ) = 0;
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index a0bdeb6a8fac..6bd844d0c59f 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -51,7 +51,7 @@ class IDocumentMarkAccess
};
typedef std::shared_ptr< ::sw::mark::IMark> pMark_t;
- typedef ::std::vector< pMark_t > container_t;
+ typedef std::vector< pMark_t > container_t;
typedef container_t::iterator iterator_t;
typedef container_t::const_iterator const_iterator_t;
typedef container_t::const_reverse_iterator const_reverse_iterator_t;
@@ -170,7 +170,7 @@ class IDocumentMarkAccess
virtual void deleteMarks(
const SwNodeIndex& rStt,
const SwNodeIndex& rEnd,
- ::std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, // Ugly: SaveBookmark is core-internal
+ std::vector< ::sw::mark::SaveBookmark>* pSaveBkmk, // Ugly: SaveBookmark is core-internal
const SwIndex* pSttIdx,
const SwIndex* pEndIdx) =0;
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index 5803f7077482..f4aa9b2fb259 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -30,7 +30,7 @@ class SwTextNode;
class IDocumentOutlineNodes
{
public:
- typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList;
+ typedef std::vector< const SwTextNode* > tSortedOutlineNodeList;
virtual sal_Int32 getOutlineNodesCount() const = 0;
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index a132b6a3c0a4..9ae6fb81d486 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -98,7 +98,7 @@ namespace sw { namespace mark
IFieldmark() = default;
public:
- typedef ::std::map< OUString, css::uno::Any> parameter_map_t;
+ typedef std::map< OUString, css::uno::Any> parameter_map_t;
//getters
virtual OUString GetFieldname() const =0;
virtual OUString GetFieldHelptext() const =0;
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index d4fd06e72ff8..2c34d80eb088 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -82,7 +82,7 @@ class SwStyleNameMapper
protected:
// UI Name tables
- static ::std::vector<OUString> *m_pTextUINameArray,
+ static std::vector<OUString> *m_pTextUINameArray,
*m_pListsUINameArray,
*m_pExtraUINameArray,
*m_pRegisterUINameArray,
@@ -173,33 +173,33 @@ public:
const OUString& rExtraUIName);
static const OUString GetSpecialExtraUIName(const OUString& rExtraProgName);
- static const ::std::vector<OUString>& GetTextUINameArray();
- static const ::std::vector<OUString>& GetListsUINameArray();
- static const ::std::vector<OUString>& GetExtraUINameArray();
- static const ::std::vector<OUString>& GetRegisterUINameArray();
- static const ::std::vector<OUString>& GetDocUINameArray();
- static const ::std::vector<OUString>& GetHTMLUINameArray();
- static const ::std::vector<OUString>& GetFrameFormatUINameArray();
- static const ::std::vector<OUString>& GetChrFormatUINameArray();
- static const ::std::vector<OUString>& GetHTMLChrFormatUINameArray();
- static const ::std::vector<OUString>& GetPageDescUINameArray();
- static const ::std::vector<OUString>& GetNumRuleUINameArray();
- static const ::std::vector<OUString>& GetTableStyleUINameArray();
- static const ::std::vector<OUString>& GetCellStyleUINameArray();
-
- static const ::std::vector<OUString>& GetTextProgNameArray();
- static const ::std::vector<OUString>& GetListsProgNameArray();
- static const ::std::vector<OUString>& GetExtraProgNameArray();
- static const ::std::vector<OUString>& GetRegisterProgNameArray();
- static const ::std::vector<OUString>& GetDocProgNameArray();
- static const ::std::vector<OUString>& GetHTMLProgNameArray();
- static const ::std::vector<OUString>& GetFrameFormatProgNameArray();
- static const ::std::vector<OUString>& GetChrFormatProgNameArray();
- static const ::std::vector<OUString>& GetHTMLChrFormatProgNameArray();
- static const ::std::vector<OUString>& GetPageDescProgNameArray();
- static const ::std::vector<OUString>& GetNumRuleProgNameArray();
- static const ::std::vector<OUString>& GetTableStyleProgNameArray();
- static const ::std::vector<OUString>& GetCellStyleProgNameArray();
+ static const std::vector<OUString>& GetTextUINameArray();
+ static const std::vector<OUString>& GetListsUINameArray();
+ static const std::vector<OUString>& GetExtraUINameArray();
+ static const std::vector<OUString>& GetRegisterUINameArray();
+ static const std::vector<OUString>& GetDocUINameArray();
+ static const std::vector<OUString>& GetHTMLUINameArray();
+ static const std::vector<OUString>& GetFrameFormatUINameArray();
+ static const std::vector<OUString>& GetChrFormatUINameArray();
+ static const std::vector<OUString>& GetHTMLChrFormatUINameArray();
+ static const std::vector<OUString>& GetPageDescUINameArray();
+ static const std::vector<OUString>& GetNumRuleUINameArray();
+ static const std::vector<OUString>& GetTableStyleUINameArray();
+ static const std::vector<OUString>& GetCellStyleUINameArray();
+
+ static const std::vector<OUString>& GetTextProgNameArray();
+ static const std::vector<OUString>& GetListsProgNameArray();
+ static const std::vector<OUString>& GetExtraProgNameArray();
+ static const std::vector<OUString>& GetRegisterProgNameArray();
+ static const std::vector<OUString>& GetDocProgNameArray();
+ static const std::vector<OUString>& GetHTMLProgNameArray();
+ static const std::vector<OUString>& GetFrameFormatProgNameArray();
+ static const std::vector<OUString>& GetChrFormatProgNameArray();
+ static const std::vector<OUString>& GetHTMLChrFormatProgNameArray();
+ static const std::vector<OUString>& GetPageDescProgNameArray();
+ static const std::vector<OUString>& GetNumRuleProgNameArray();
+ static const std::vector<OUString>& GetTableStyleProgNameArray();
+ static const std::vector<OUString>& GetCellStyleProgNameArray();
};
#endif // _NAME_MAPPER_HXX
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 412b419edbb1..71d4886a4610 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -348,7 +348,7 @@ class SW_DLLPUBLIC SwDoc :
/// Cell Styles not assigned to a Table Style
std::unique_ptr<SwCellStyleTable> mpCellStyles;
private:
- ::std::unique_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
+ std::unique_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
// other
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 56a756865c41..2e9355c8d935 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -166,7 +166,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
sal_uInt32 nLastPos;
bool bFirstCalled;
- void AppendStyleList(const ::std::vector<OUString>& rLst,
+ void AppendStyleList(const std::vector<OUString>& rLst,
bool bUsed,
bool bTestHidden,
bool bOnlyHidden,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index c66cb9a7da42..bd68cb12ad5e 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -769,10 +769,10 @@ public:
void GetConnectableFrameFormats
(SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors,
- ::std::vector< OUString > & aPrevPageVec,
- ::std::vector< OUString > & aThisPageVec,
- ::std::vector< OUString > & aNextPageVec,
- ::std::vector< OUString > & aRestVec);
+ std::vector< OUString > & aPrevPageVec,
+ std::vector< OUString > & aThisPageVec,
+ std::vector< OUString > & aNextPageVec,
+ std::vector< OUString > & aRestVec);
/** SwFEShell::GetShapeBackgrd
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index d660f9973153..1ac8c050b3c5 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -194,7 +194,7 @@ public:
class SW_DLLPUBLIC MetaFieldManager
{
private:
- typedef ::std::vector< std::weak_ptr<MetaField> > MetaFieldList_t;
+ typedef std::vector< std::weak_ptr<MetaField> > MetaFieldList_t;
MetaFieldList_t m_MetaFields;
/// Document properties of a clipboard document, empty for non-clipboard documents.
css::uno::Reference<css::document::XDocumentProperties> m_xDocumentProperties;
@@ -209,7 +209,7 @@ public:
const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
const bool bIsFixedLanguage = false );
/// get all meta fields
- ::std::vector< css::uno::Reference<css::text::XTextField> > getMetaFields();
+ std::vector< css::uno::Reference<css::text::XTextField> > getMetaFields();
/// Copy document properties from rSource to m_xDocumentProperties.
void copyDocumentProperties(const SwDoc& rSource);
const css::uno::Reference<css::document::XDocumentProperties>& getDocumentProperties();
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 39078e7f627f..abbf27e53a7b 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -135,8 +135,8 @@ protected:
public:
~SwNodes();
- typedef ::std::vector<SwNodeRange> NodeRanges_t;
- typedef ::std::vector<NodeRanges_t> TableRanges_t;
+ typedef std::vector<SwNodeRange> NodeRanges_t;
+ typedef std::vector<NodeRanges_t> TableRanges_t;
SwNodePtr operator[]( sal_uLong n ) const; // defined in node.hxx
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 14d189e39d42..2abdf1149e40 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -110,7 +110,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
/// pointer to the list, to whose the text node is added to
SwList* mpList;
- ::std::unique_ptr< OUString > m_pNumStringCache;
+ std::unique_ptr< OUString > m_pNumStringCache;
css::uno::WeakReference<css::text::XTextContent> m_wXParagraph;
@@ -385,7 +385,7 @@ public:
@param nWhich only attributes with this id are returned.
@param eMode the predicate for matching (@see GetTextAttrMode).
*/
- ::std::vector<SwTextAttr *> GetTextAttrsAt(
+ std::vector<SwTextAttr *> GetTextAttrsAt(
sal_Int32 const nIndex,
RES_TXTATR const nWhich ) const;
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index ebd19461cc42..dd1ceae91f47 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -361,7 +361,7 @@ class SW_DLLPUBLIC Writer
void AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont );
void AddFontItems_( SfxItemPool& rPool, sal_uInt16 nWhichId );
- ::std::unique_ptr<Writer_Impl> m_pImpl;
+ std::unique_ptr<Writer_Impl> m_pImpl;
Writer(Writer const&) = delete;
Writer& operator=(Writer const&) = delete;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 309f7e34b259..665d7ff86276 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -490,7 +490,7 @@ class SwCellFrame;
class SW_DLLPUBLIC SwTableCellInfo
{
struct Impl;
- ::std::unique_ptr<Impl> m_pImpl;
+ std::unique_ptr<Impl> m_pImpl;
const SwCellFrame * getCellFrame() const;
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 5c5f197fe53b..26170310c1fe 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -23,7 +23,7 @@
#include <rtl/ustring.hxx>
-typedef ::std::vector< OUString > SwUndoComments_t;
+typedef std::vector< OUString > SwUndoComments_t;
// The IDs for StdActions.
enum SwUndoId
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 4e50bb39e674..f49fc29babdc 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -43,7 +43,7 @@ class SwTable;
class SwUndoTableMerge;
class SwCellFrame;
-typedef ::std::deque< SwCellFrame* > SwCellFrames;
+typedef std::deque< SwCellFrame* > SwCellFrames;
struct CompareSwSelBoxes
{
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index d83db238ecc5..79d890cf022a 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -221,7 +221,7 @@ class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
{
SwTextFormatColl *pTextFormatColl, *pLastNdColl;
std::vector<SwFrameFormat*>* pFrameFormats;
- ::std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
+ std::vector< std::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
SwRedlineData* pRedlData;
bool bSttWasTextNd;
protected:
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 367af0c47b23..119bccb77875 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -101,7 +101,7 @@ namespace sw {
};
/// Smart pointer class ensuring that the pointed object is deleted with a locked SolarMutex.
template<typename T>
- using UnoImplPtr = ::std::unique_ptr<T, UnoImplPtrDeleter<T> >;
+ using UnoImplPtr = std::unique_ptr<T, UnoImplPtrDeleter<T> >;
template< class C > C *
UnoTunnelGetImplementation( css::uno::Reference< css::lang::XUnoTunnel > const & xUnoTunnel)
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 8ab856777a4a..7fc6b2dedaaf 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -442,7 +442,7 @@ public:
virtual Pointer getPointer() override;
// css::tiledrendering::XTiledRenderable
- virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, std::exception) override;
void Invalidate();
void Reactivate(SwDocShell* pNewDocShell);