summaryrefslogtreecommitdiff
path: root/sw/source/filter
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/source/filter
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/source/filter')
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/html/svxcss1.hxx4
-rw-r--r--sw/source/filter/html/swhtml.hxx2
-rw-r--r--sw/source/filter/writer/writer.cxx2
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx2
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx14
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx30
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx2
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx26
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx12
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par.hxx8
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx6
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.hxx4
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx6
-rw-r--r--sw/source/filter/xml/xmltble.cxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx6
-rw-r--r--sw/source/filter/xml/xmltexti.hxx2
28 files changed, 81 insertions, 81 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 9c09330a3feb..e04bc3564f1f 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1083,7 +1083,7 @@ class HTMLEndPosLst
// but the text length
// the script that is valid up to the position
// contained in aScriptChgList at the same index
- ::std::vector<sal_uInt16> aScriptLst;
+ std::vector<sal_uInt16> aScriptLst;
SwDoc *pDoc; // das aktuelle Dokument
SwDoc* pTemplate; // die HTML-Vorlage (oder 0)
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 89f19c538bd9..6c9e57668dcf 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -177,8 +177,8 @@ public:
class SvxCSS1Parser : public CSS1Parser
{
- typedef ::std::vector<std::unique_ptr<CSS1Selector>> CSS1Selectors;
- typedef ::std::map<OUString, std::unique_ptr<SvxCSS1MapEntry>> CSS1Map;
+ typedef std::vector<std::unique_ptr<CSS1Selector>> CSS1Selectors;
+ typedef std::map<OUString, std::unique_ptr<SvxCSS1MapEntry>> CSS1Map;
CSS1Selectors m_Selectors; // List of "open" Selectors
CSS1Map m_Ids;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 41d7c73dc1c2..c82ba953fa39 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -331,7 +331,7 @@ class HTMLTable;
class SwCSS1Parser;
class SwHTMLNumRuleInfo;
-typedef ::std::vector<std::unique_ptr<ImageMap>> ImageMaps;
+typedef std::vector<std::unique_ptr<ImageMap>> ImageMaps;
#define HTML_CNTXT_PROTECT_STACK 0x0001
#define HTML_CNTXT_STRIP_PARA 0x0002
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 222f76db7560..2ffbe0074239 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -184,7 +184,7 @@ bool Writer::CopyNextPam( SwPaM ** ppPam )
sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const
{
const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
- const IDocumentMarkAccess::const_iterator_t ppBkmk = ::std::lower_bound(
+ const IDocumentMarkAccess::const_iterator_t ppBkmk = std::lower_bound(
pMarkAccess->getAllMarksBegin(),
pMarkAccess->getAllMarksEnd(),
rPos,
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx
index a0cf156cb6dc..8a2392d643ab 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -146,7 +146,7 @@ void WW8FFData::Write(SvStream * pDataStrm)
sal_uInt32 nListboxEntries = msListEntries.size();
pDataStrm->WriteUInt32( nListboxEntries );
- ::std::vector< OUString >::const_iterator aIt = msListEntries.begin();
+ std::vector< OUString >::const_iterator aIt = msListEntries.begin();
while (aIt != msListEntries.end())
{
diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx
index f861a07753c2..eaa7afc0f935 100644
--- a/sw/source/filter/ww8/WW8FFData.hxx
+++ b/sw/source/filter/ww8/WW8FFData.hxx
@@ -60,7 +60,7 @@ private:
OUString msMacroEnter;
OUString msMacroExit;
- ::std::vector< OUString > msListEntries;
+ std::vector< OUString > msListEntries;
protected:
static void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero);
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index ba2f094e5135..327d1cf555a6 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -346,7 +346,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow()
#ifdef DBG_UTIL
-::std::string WW8TableNodeInfoInner::toString() const
+std::string WW8TableNodeInfoInner::toString() const
{
static char buffer[256];
snprintf(buffer, sizeof(buffer),
@@ -365,7 +365,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow()
mnShadowsAfter,
mbVertMerge ? "yes" : "no");
- return ::std::string(buffer);
+ return std::string(buffer);
}
#endif
@@ -384,14 +384,14 @@ WW8TableNodeInfo::~WW8TableNodeInfo()
}
#ifdef DBG_UTIL
-::std::string WW8TableNodeInfo::toString() const
+std::string WW8TableNodeInfo::toString() const
{
static char buffer[1024];
snprintf(buffer, sizeof(buffer),
"<tableNodeInfo p=\"%p\" depth=\"%" SAL_PRIuUINT32 "\">"
,this, getDepth());
- ::std::string sResult(buffer);
+ std::string sResult(buffer);
Inners_t::const_iterator aIt(mInners.begin());
Inners_t::const_iterator aEnd(mInners.end());
@@ -1006,7 +1006,7 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const
}
#ifdef DBG_UTIL
-::std::string CellInfo::toString() const
+std::string CellInfo::toString() const
{
static char sBuffer[256];
@@ -1287,9 +1287,9 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells(RowEndInners_t &rLastRowEnds)
}
#ifdef DBG_UTIL
-::std::string WW8TableCellGrid::toString()
+std::string WW8TableCellGrid::toString()
{
- ::std::string sResult = "<WW8TableCellGrid>";
+ std::string sResult = "<WW8TableCellGrid>";
RowTops_t::const_iterator aTopsIt = getRowTopsBegin();
static char sBuffer[1024];
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index f77c3ec14e95..10378cc3837c 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -40,13 +40,13 @@ namespace ww8
const unsigned int MAXTABLECELLS = 63;
class WW8TableNodeInfo;
-typedef ::std::vector<const SwTableBox *> TableBoxVector;
+typedef std::vector<const SwTableBox *> TableBoxVector;
typedef std::shared_ptr<TableBoxVector> TableBoxVectorPtr;
-typedef ::std::vector<sal_uInt32> GridCols;
+typedef std::vector<sal_uInt32> GridCols;
typedef std::shared_ptr<GridCols> GridColsPtr;
-typedef ::std::vector<sal_Int32> RowSpans;
+typedef std::vector<sal_Int32> RowSpans;
typedef std::shared_ptr<RowSpans> RowSpansPtr;
-typedef ::std::vector<sal_uInt32> Widths;
+typedef std::vector<sal_uInt32> Widths;
typedef std::shared_ptr<Widths> WidthsPtr;
class WW8TableNodeInfoInner
@@ -108,7 +108,7 @@ public:
RowSpansPtr getRowSpansOfRow();
#ifdef DBG_UTIL
- ::std::string toString() const;
+ std::string toString() const;
#endif
};
@@ -152,21 +152,21 @@ public:
}
#ifdef DBG_UTIL
- ::std::string toString() const;
+ std::string toString() const;
#endif
};
-typedef ::std::multiset<CellInfo, ::std::less<CellInfo> > CellInfoMultiSet;
-typedef ::std::map<sal_uInt32, WW8TableNodeInfoInner*,
- ::std::greater<sal_uInt32> > RowEndInners_t;
+typedef std::multiset<CellInfo, std::less<CellInfo> > CellInfoMultiSet;
+typedef std::map<sal_uInt32, WW8TableNodeInfoInner*,
+ std::greater<sal_uInt32> > RowEndInners_t;
class WW8TableInfo;
class WW8TableNodeInfo
{
public:
- typedef ::std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
- ::std::greater<sal_uInt32> > Inners_t;
+ typedef std::map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t,
+ std::greater<sal_uInt32> > Inners_t;
private:
WW8TableInfo * mpParent;
@@ -212,7 +212,7 @@ public:
sal_uInt32 getRow() const;
#ifdef DBG_UTIL
- ::std::string toString() const;
+ std::string toString() const;
#endif
bool operator < (const WW8TableNodeInfo & rInfo) const;
@@ -257,8 +257,8 @@ public:
class WW8TableCellGrid
{
- typedef ::std::set<long> RowTops_t;
- typedef ::std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t;
+ typedef std::set<long> RowTops_t;
+ typedef std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t;
RowTops_t m_aRowTops;
Rows_t m_aRows;
@@ -281,7 +281,7 @@ public:
WW8TableNodeInfo *connectCells(RowEndInners_t &rLastRowEnds);
#ifdef DBG_UTIL
- ::std::string toString();
+ std::string toString();
#endif
TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo);
diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx
index 87593aa80e13..c2ec261d0d20 100644
--- a/sw/source/filter/ww8/docxfootnotes.hxx
+++ b/sw/source/filter/ww8/docxfootnotes.hxx
@@ -26,7 +26,7 @@ class SwFormatFootnote;
namespace docx {
-typedef ::std::vector< const SwFormatFootnote* > FootnotesVector;
+typedef std::vector< const SwFormatFootnote* > FootnotesVector;
/** Remember footnotes/endnotes so that we can dump them in one go.
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 6599d344e150..ad109615836f 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -104,7 +104,7 @@ sal_uInt16 MSWordExportBase::GetId( const SwNumRule& rNumRule )
// Is this list now duplicated into a new list which we should use
// #i77812# - perform 'deep' search in duplication map
- ::std::map<sal_uInt16,sal_uInt16>::const_iterator aResult = m_aRuleDuplicates.end();
+ std::map<sal_uInt16,sal_uInt16>::const_iterator aResult = m_aRuleDuplicates.end();
do {
aResult = m_aRuleDuplicates.find(nRet);
if ( aResult != m_aRuleDuplicates.end() )
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 21fcf6290e02..3373bec0b3d1 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -80,7 +80,7 @@ using namespace nsHdFtFlags;
/// For the output of sections.
struct WW8_PdAttrDesc
{
- ::std::unique_ptr<sal_uInt8[]> m_pData;
+ std::unique_ptr<sal_uInt8[]> m_pData;
sal_uInt16 m_nLen;
WW8_FC m_nSepxFcPos;
WW8_PdAttrDesc() : m_nLen(0), m_nSepxFcPos(0xffffffff) /*default: none*/
@@ -828,7 +828,7 @@ bool operator<(const wwFont &r1, const wwFont &r2)
sal_uInt16 wwFontHelper::GetId(const wwFont &rFont)
{
sal_uInt16 nRet;
- ::std::map<wwFont, sal_uInt16>::const_iterator aIter = maFonts.find(rFont);
+ std::map<wwFont, sal_uInt16>::const_iterator aIter = maFonts.find(rFont);
if (aIter != maFonts.end())
nRet = aIter->second;
else
@@ -888,11 +888,11 @@ sal_uInt16 wwFontHelper::GetId(const SvxFontItem& rFont)
return GetId(aFont);
}
-::std::vector< const wwFont* > wwFontHelper::AsVector() const
+std::vector< const wwFont* > wwFontHelper::AsVector() const
{
- ::std::vector<const wwFont *> aFontList( maFonts.size() );
+ std::vector<const wwFont *> aFontList( maFonts.size() );
- typedef ::std::map<wwFont, sal_uInt16>::const_iterator myiter;
+ typedef std::map<wwFont, sal_uInt16>::const_iterator myiter;
myiter aEnd = maFonts.end();
for ( myiter aIter = maFonts.begin(); aIter != aEnd; ++aIter )
aFontList[aIter->second] = &aIter->first;
@@ -912,7 +912,7 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib)
* Convert from fast insertion map to linear vector in the order that we
* want to write.
*/
- ::std::vector<const wwFont *> aFontList( AsVector() );
+ std::vector<const wwFont *> aFontList( AsVector() );
/*
* Write them all to pTableStream
@@ -929,7 +929,7 @@ void wwFontHelper::WriteFontTable(SvStream *pTableStream, WW8Fib& rFib)
void wwFontHelper::WriteFontTable( DocxAttributeOutput& rAttrOutput )
{
- ::std::vector<const wwFont *> aFontList( AsVector() );
+ std::vector<const wwFont *> aFontList( AsVector() );
for ( auto aFont : aFontList )
aFont->WriteDocx(&rAttrOutput);
@@ -937,7 +937,7 @@ void wwFontHelper::WriteFontTable( DocxAttributeOutput& rAttrOutput )
void wwFontHelper::WriteFontTable( const RtfAttributeOutput& rAttrOutput )
{
- ::std::vector<const wwFont *> aFontList( AsVector() );
+ std::vector<const wwFont *> aFontList( AsVector() );
for ( auto aFont : aFontList )
aFont->WriteRtf(&rAttrOutput);
@@ -2152,8 +2152,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
OSL_ENSURE( aCps.size() + 2 == pTextPos->Count(), "WritePlc: DeSync" );
- ::std::vector<std::pair<OUString,OUString> > aStrArr;
- typedef ::std::vector<std::pair<OUString,OUString> >::iterator myiter;
+ std::vector<std::pair<OUString,OUString> > aStrArr;
+ typedef std::vector<std::pair<OUString,OUString> >::iterator myiter;
WW8Fib& rFib = *rWrt.pFib; // n+1-th CP-Pos according to the manual
sal_uInt16 i;
bool bWriteCP = true;
@@ -2183,8 +2183,8 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
}
//sort and remove duplicates
- ::std::sort(aStrArr.begin(), aStrArr.end(),&lcl_AuthorComp);
- myiter aIter = ::std::unique(aStrArr.begin(), aStrArr.end());
+ std::sort(aStrArr.begin(), aStrArr.end(),&lcl_AuthorComp);
+ myiter aIter = std::unique(aStrArr.begin(), aStrArr.end());
aStrArr.erase(aIter, aStrArr.end());
// Also sort the start and end positions. We need to reference
@@ -2367,7 +2367,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
const WW8_Annotation& rAtn = *static_cast<const WW8_Annotation*>(aContent[i]);
//aStrArr is sorted
- myiter aIter = ::std::lower_bound(aStrArr.begin(),
+ myiter aIter = std::lower_bound(aStrArr.begin(),
aStrArr.end(), std::pair<OUString,OUString>(rAtn.msOwner,OUString()),
&lcl_AuthorComp);
OSL_ENSURE(aIter != aStrArr.end() && aIter->first == rAtn.msOwner,
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index de83fa4f4365..a5b2c16d4616 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2906,7 +2906,7 @@ void WW8Export::WriteFkpPlcUsw()
if ( pSttbfAssoc ) // #i106057#
{
- ::std::vector<OUString> aStrings(pSttbfAssoc->getStrings());
+ std::vector<OUString> aStrings(pSttbfAssoc->getStrings());
WriteAsStringTable(aStrings, pFib->fcSttbfAssoc,
pFib->lcbSttbfAssoc);
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 683076061470..91680a022f1a 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -233,7 +233,7 @@ public:
class WW8_WrPlcSepx : public MSWordSections
{
std::vector<WW8_CP> aCps;
- ::std::vector< std::shared_ptr<WW8_PdAttrDesc> > m_SectionAttributes;
+ std::vector< std::shared_ptr<WW8_PdAttrDesc> > m_SectionAttributes;
// hack to prevent adding sections in endnotes
bool m_bHeaderFooterWritten;
WW8_WrPlc0* pTextPos; // Position of the headers/footers
@@ -310,10 +310,10 @@ class wwFontHelper
{
private:
/// Keep track of fonts that need to be exported.
- ::std::map<wwFont, sal_uInt16> maFonts;
+ std::map<wwFont, sal_uInt16> maFonts;
/// Convert from fast insertion map to linear vector in the order that we want to write.
- ::std::vector< const wwFont* > AsVector() const;
+ std::vector< const wwFont* > AsVector() const;
public:
wwFontHelper() : bLoadAllFonts(false) {}
@@ -402,7 +402,7 @@ private:
HdFtPlcDrawObj& operator=(const HdFtPlcDrawObj&) = delete;
};
-typedef ::std::pair<OUString, sal_uLong> aBookmarkPair;
+typedef std::pair<OUString, sal_uLong> aBookmarkPair;
class WW8_WrtRedlineAuthor : public sw::util::WrtRedlineAuthor
{
@@ -559,7 +559,7 @@ public:
SwPaM *m_pCurPam, *m_pOrigPam;
/// Stack to remember the nesting (see MSWordSaveData for more)
- ::std::stack< MSWordSaveData > m_aSaveData;
+ std::stack< MSWordSaveData > m_aSaveData;
/// Used to split the runs according to the bookmarks start and ends
typedef std::vector< ::sw::mark::IMark* > IMarkVector;
@@ -1043,7 +1043,7 @@ public:
void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo);
- void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf,
+ void WriteAsStringTable(const std::vector<OUString>&, sal_Int32& rfcSttbf,
sal_Int32& rlcbSttbf);
virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx
index 1b62971817fe..55ca91e5c530 100644
--- a/sw/source/filter/ww8/ww8glsy.hxx
+++ b/sw/source/filter/ww8/ww8glsy.hxx
@@ -71,8 +71,8 @@ private:
sal_uInt16 nStrings;
static bool MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, bool bSaveRelFile,
- const ::std::vector<OUString>& rStrings,
- const ::std::vector<ww::bytes>& rExtra);
+ const std::vector<OUString>& rStrings,
+ const std::vector<ww::bytes>& rExtra);
static bool HasBareGraphicEnd(SwDoc *pD,SwNodeIndex &rIdx);
WW8Glossary(const WW8Glossary&) = delete;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ac5379fc0492..b7501a5b049c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1154,7 +1154,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
aMemStream.WriteUInt16( 0 ).WriteUInt16( nBufferSize );
// copy from DFF stream to memory stream
- ::std::vector< sal_uInt8 > aBuffer( nBufferSize );
+ std::vector< sal_uInt8 > aBuffer( nBufferSize );
sal_uInt8* pnData = &aBuffer.front();
sal_uInt8 nStreamSize;
if (pnData && rSt.ReadBytes(pnData, nBufferSize) == nBufferSize)
@@ -1396,7 +1396,7 @@ void SwWW8ReferencedFltEndStack::SetAttrInDoc( const SwPosition& rTmpPos,
if ( pFltBookmark != nullptr && pFltBookmark->IsTOCBookmark() )
{
const OUString& rName = pFltBookmark->GetName();
- ::std::set< OUString, SwWW8::ltstr >::const_iterator aResult = aReferencedTOCBookmarks.find(rName);
+ std::set< OUString, SwWW8::ltstr >::const_iterator aResult = aReferencedTOCBookmarks.find(rName);
if ( aResult == aReferencedTOCBookmarks.end() )
{
bInsertBookmarkIntoDoc = false;
@@ -5973,7 +5973,7 @@ const OUString* SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx)
if (!m_pAtnNames && m_pWwFib->lcbGrpStAtnOwners)
{
// Determine authors: can be found in the TableStream
- m_pAtnNames = new ::std::vector<OUString>;
+ m_pAtnNames = new std::vector<OUString>;
SvStream& rStrm = *m_pTableStream;
long nOldPos = rStrm.Tell();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 250bbc8d113a..aa45c909be29 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -494,11 +494,11 @@ inline bool get_flag( Type nBitField, Type nMask )
template< typename ReturnType, typename Type >
inline ReturnType ulimit_cast( Type nValue, ReturnType nMax )
-{ return static_cast< ReturnType >( ::std::min< Type >( nValue, nMax ) ); }
+{ return static_cast< ReturnType >( std::min< Type >( nValue, nMax ) ); }
template< typename ReturnType, typename Type >
inline ReturnType ulimit_cast( Type nValue )
-{ return ulimit_cast( nValue, ::std::numeric_limits< ReturnType >::max() ); }
+{ return ulimit_cast( nValue, std::numeric_limits< ReturnType >::max() ); }
class SwMacroInfo : public SdrObjUserData
{
@@ -821,8 +821,8 @@ private:
*/
SwWW8ImplReader& mrReader;
std::deque<wwSection> maSegments;
- typedef ::std::deque<wwSection>::iterator mySegIter;
- typedef ::std::deque<wwSection>::reverse_iterator mySegrIter;
+ typedef std::deque<wwSection>::iterator mySegIter;
+ typedef std::deque<wwSection>::reverse_iterator mySegrIter;
//Num of page desc's entered into the document
sal_uInt16 mnDesc;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 7f2a884e0ee4..79482b5e2a7e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -291,7 +291,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
if ( pFieldmark != nullptr )
{
uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size());
- ::std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), vListEntries.begin());
+ std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), vListEntries.begin());
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
sal_Int32 nIndex = aFormula.mfDropdownIndex < aFormula.maListEntries.size() ? aFormula.mfDropdownIndex : 0;
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(nIndex);
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 7c02c895b8ee..02f2e2f6ac98 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -447,7 +447,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
void SwWW8ImplReader::ReadRevMarkAuthorStrTabl( SvStream& rStrm,
sal_Int32 nTablePos, sal_Int32 nTableSiz, SwDoc& rDocOut )
{
- ::std::vector<OUString> aAuthorNames;
+ std::vector<OUString> aAuthorNames;
WW8ReadSTTBF( !m_bVer67, rStrm, nTablePos, nTableSiz, m_bVer67 ? 2 : 0,
m_eStructCharSet, aAuthorNames );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index ab18387cfa26..306403b63fa8 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1273,7 +1273,7 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pField,
{
//Get the name of the ref field, and see if actually a variable
const OUString sName = pField->GetPar1();
- ::std::map<OUString, OUString, SwWW8::ltstr>::const_iterator
+ std::map<OUString, OUString, SwWW8::ltstr>::const_iterator
aResult = aFieldVarNames.find(sName);
if (aResult != aFieldVarNames.end())
@@ -1297,7 +1297,7 @@ OUString SwWW8ImplReader::GetMappedBookmark(const OUString &rOrigName)
//See if there has been a variable set with this name, if so get
//the pseudo bookmark name that was set with it.
- ::std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult =
+ std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult =
m_pReffingStck->aFieldVarNames.find(sName);
return (aResult == m_pReffingStck->aFieldVarNames.end())
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 545605da7ea3..694ff1a2250c 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3813,7 +3813,7 @@ bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF)
// WW8PLCF_Book
void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen,
sal_uInt16 nExtraLen, rtl_TextEncoding eCS, std::vector<OUString> &rArray,
- std::vector<ww::bytes>* pExtraArray, ::std::vector<OUString>* pValueArray)
+ std::vector<ww::bytes>* pExtraArray, std::vector<OUString>* pValueArray)
{
if (nLen==0) // Handle Empty STTBF
return;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 11cb3f759878..c2f03bb1e1e1 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -169,8 +169,8 @@ class WW8PLCFx_PCD;
attention: the *extra data* of each string are SKIPPED and ignored
*/
void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, sal_uInt32 nStart, sal_Int32 nLen,
- sal_uInt16 nExtraLen, rtl_TextEncoding eCS, ::std::vector<OUString> &rArray,
- ::std::vector<ww::bytes>* pExtraArray = nullptr, ::std::vector<OUString>* pValueArray = nullptr);
+ sal_uInt16 nExtraLen, rtl_TextEncoding eCS, std::vector<OUString> &rArray,
+ std::vector<ww::bytes>* pExtraArray = nullptr, std::vector<OUString>* pValueArray = nullptr);
struct WW8FieldDesc
{
@@ -851,7 +851,7 @@ enum ManTypes // enums for PLCFMan-ctor
struct WW8PLCFxDesc
{
WW8PLCFx* pPLCFx;
- ::std::stack<sal_uInt16>* pIdStack; // memory for Attr-Id for Attr-end(s)
+ std::stack<sal_uInt16>* pIdStack; // memory for Attr-Id for Attr-end(s)
const sal_uInt8* pMemPos;// where are the Sprm(s)
long nOrigSprmsLen;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index f78866b692f9..1fd0b9c2ae40 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
namespace frame { class XModel; }
} } }
-typedef ::std::map< OUString, RedlineInfo* > RedlineMapType;
+typedef std::map< OUString, RedlineInfo* > RedlineMapType;
class XMLRedlineImportHelper
{
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index d8e589c1e5db..e631a98e200d 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -410,7 +410,7 @@ void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps)
}
}
-sal_Int32 SwXMLExport::GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings )
+sal_Int32 SwXMLExport::GetDocumentSpecificSettings( std::list< SettingsGroup >& _out_rSettings )
{
// the only doc-specific settings group we know so far are the XForms settings
uno::Sequence<beans::PropertyValue> aXFormsSettings;
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index b1bd141b27d0..e0729b4ad14d 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -43,7 +43,7 @@ class SwTableNode;
class XMLPropertySetMapper;
class SwXMLTableLines_Impl;
-typedef ::std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl;
+typedef std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl;
class SwXMLExport : public SvXMLExport
{
@@ -95,7 +95,7 @@ class SwXMLExport : public SvXMLExport
virtual void ExportContent_() override;
virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
- virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ) override;
+ virtual sal_Int32 GetDocumentSpecificSettings( std::list< SettingsGroup >& _out_rSettings ) override;
void setBlockMode();
private:
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index f50e8e21ebf9..e2ac39e0bffd 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -258,7 +258,7 @@ protected:
virtual void exportStyleAttributes(
SvXMLAttributeList& rAttrList,
sal_Int32 nFamily,
- const ::std::vector< XMLPropertyState >& rProperties,
+ const std::vector< XMLPropertyState >& rProperties,
const SvXMLExportPropertyMapper& rPropExp
, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
@@ -272,7 +272,7 @@ public:
void SwXMLAutoStylePoolP::exportStyleAttributes(
SvXMLAttributeList& rAttrList,
sal_Int32 nFamily,
- const ::std::vector< XMLPropertyState >& rProperties,
+ const std::vector< XMLPropertyState >& rProperties,
const SvXMLExportPropertyMapper& rPropExp
, const SvXMLUnitConverter& rUnitConverter,
const SvXMLNamespaceMap& rNamespaceMap
@@ -282,7 +282,7 @@ void SwXMLAutoStylePoolP::exportStyleAttributes(
if( XML_STYLE_FAMILY_TEXT_PARAGRAPH == nFamily )
{
- for( ::std::vector< XMLPropertyState >::const_iterator
+ for( std::vector< XMLPropertyState >::const_iterator
aProperty = rProperties.begin();
aProperty != rProperties.end();
++aProperty )
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index f4b89d1985eb..59a2f24db9dd 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -61,8 +61,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::xmloff::token;
using table::XCell;
-using ::std::vector;
-using ::std::advance;
+using std::vector;
+using std::advance;
// string constants for table cell export
static const char g_sNumberFormat[] = "NumberFormat";
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index a62c92cf45bf..461091f6ffe0 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -910,7 +910,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
void SwXMLTextImportHelper::endAppletOrPlugin(
const uno::Reference < XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString > &rParamMap)
+ std::map < const OUString, OUString > &rParamMap)
{
// this method will modify the document directly -> lock SolarMutex
SolarMutexGuard aGuard;
@@ -935,8 +935,8 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
const sal_Int32 nCount = rParamMap.size();
uno::Sequence< beans::PropertyValue > aCommandSequence( nCount );
- ::std::map < const OUString, OUString > ::iterator aIter = rParamMap.begin();
- ::std::map < const OUString, OUString > ::iterator aEnd = rParamMap.end();
+ std::map < const OUString, OUString > ::iterator aIter = rParamMap.begin();
+ std::map < const OUString, OUString > ::iterator aEnd = rParamMap.end();
sal_Int32 nIndex=0;
while (aIter != aEnd )
{
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 1d19ebf33e10..24f49912afac 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -79,7 +79,7 @@ public:
virtual void endAppletOrPlugin(
const css::uno::Reference < css::beans::XPropertySet > &rPropSet,
- ::std::map < const OUString, OUString > &rParamMap) override;
+ std::map < const OUString, OUString > &rParamMap) override;
virtual bool IsInHeaderFooter() const override;