summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx1
-rw-r--r--sw/source/core/layout/movedfwdfrmsbyobjpos.cxx6
-rw-r--r--sw/source/filter/inc/msfilter.hxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx6
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx10
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx16
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx3
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par.hxx1
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx4
12 files changed, 25 insertions, 37 deletions
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index aec68040cbea..98b3f3f288a9 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -28,7 +28,6 @@ class SwTextFrame;
class SwRowFrame;
typedef std::map< const SwTextNode*, const sal_uInt32 > NodeMap;
-typedef std::map< const SwTextNode*, const sal_uInt32 >::const_iterator NodeMapIter;
typedef NodeMap::value_type NodeMapEntry;
class SwMovedFwdFramesByObjPos
diff --git a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
index c57d2f830361..0ba8984d4765 100644
--- a/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
+++ b/sw/source/core/layout/movedfwdfrmsbyobjpos.cxx
@@ -53,7 +53,7 @@ bool SwMovedFwdFramesByObjPos::FrameMovedFwdByObjPos( const SwTextFrame& _rTextF
{
// sw_redlinehide: assumption: this wants to uniquely identify all
// SwTextFrame belonging to the same paragraph, so just use first one as key
- NodeMapIter aIter = maMovedFwdFrames.find( _rTextFrame.GetTextNodeFirst() );
+ auto aIter = maMovedFwdFrames.find( _rTextFrame.GetTextNodeFirst() );
if ( maMovedFwdFrames.end() != aIter )
{
_ornToPageNum = (*aIter).second;
@@ -70,10 +70,8 @@ bool SwMovedFwdFramesByObjPos::DoesRowContainMovedFwdFrame( const SwRowFrame& _r
const sal_uInt32 nPageNumOfRow = _rRowFrame.FindPageFrame()->GetPhyPageNum();
- NodeMapIter aIter = maMovedFwdFrames.begin();
- for ( ; aIter != maMovedFwdFrames.end(); ++aIter )
+ for ( const auto & rEntry : maMovedFwdFrames )
{
- const NodeMapEntry& rEntry = *aIter;
if ( rEntry.second >= nPageNumOfRow )
{
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aFrameIter(*rEntry.first);
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index c9c1a142aadf..9cd6dec4455f 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -281,7 +281,6 @@ namespace sw
{
public:
typedef std::map<InsertedTableClient *, SwNodeIndex *> TableMap;
- typedef TableMap::iterator TableMapIter;
void DelAndMakeTableFrames();
void InsertTable(SwTableNode &rTableNode, SwPaM &rPaM);
explicit InsertedTablesManager(const SwDoc &rDoc);
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 3c07721e2564..2ce34d4f8d98 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -416,7 +416,7 @@ namespace sw
const SfxPoolItem *SearchPoolItems(const ww8::PoolItems &rItems,
sal_uInt16 eType)
{
- ww8::cPoolItemIter aIter = rItems.find(eType);
+ auto aIter = rItems.find(eType);
if (aIter != rItems.end())
return aIter->second;
return nullptr;
@@ -865,8 +865,8 @@ namespace sw
{
if (!mbHasRoot)
return;
- TableMapIter aEnd = maTables.end();
- for (TableMapIter aIter = maTables.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = maTables.end();
+ for (auto aIter = maTables.begin(); aIter != aEnd; ++aIter)
{
// If already a layout exists, then the BoxFrames must recreated at this table
SwTableNode *pTable = aIter->first->GetTableNode();
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 28a76c3097cc..f91f32baa5fe 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -67,8 +67,6 @@ namespace ww8
typedef std::vector<SwTextFormatColl *> ParaStyles;
/// STL container of SfxPoolItems (Attributes)
typedef std::map<sal_uInt16, const SfxPoolItem *, sw::util::ItemSort> PoolItems;
- /// STL const iterator for ParaStyles
- typedef PoolItems::const_iterator cPoolItemIter;
/** Make exporting a Writer Frame easy
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 0444d89745e8..16d0336fbb55 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -551,11 +551,9 @@ namespace sw
typedef std::pair<int32_t, bool> DirEntry;
typedef std::vector<DirEntry> DirChanges;
- typedef DirChanges::const_iterator cDirIter;
typedef std::pair<sal_Int32, sal_uInt16> ScriptEntry;
typedef std::vector<ScriptEntry> ScriptChanges;
- typedef ScriptChanges::const_iterator cScriptIter;
DirChanges aDirChanges;
ScriptChanges aScripts;
@@ -606,11 +604,11 @@ namespace sw
nScript = g_pBreakIt->GetBreakIter()->getScriptType(rText, nPos);
}
- cDirIter aBiDiEnd = aDirChanges.end();
- cScriptIter aScriptEnd = aScripts.end();
+ auto aBiDiEnd = aDirChanges.cend();
+ auto aScriptEnd = aScripts.cend();
- cDirIter aBiDiIter = aDirChanges.begin();
- cScriptIter aScriptIter = aScripts.begin();
+ auto aBiDiIter = aDirChanges.cbegin();
+ auto aScriptIter = aScripts.cbegin();
bool bCharIsRTL = bParaIsRTL;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 75d480e4cb5b..2949accdce54 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -639,16 +639,16 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
WW8Fib& rFib = *rWrt.pFib;
WW8_CP nCpOffs = GetCpOffset(rFib);
- cDrawObjIter aEnd = maDrawObjs.end();
- cDrawObjIter aIter;
+ auto aEnd = maDrawObjs.cend();
+ auto aIter = maDrawObjs.cbegin();
- for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
+ for ( ; aIter < aEnd; ++aIter)
SwWW8Writer::WriteLong(*rWrt.pTableStrm, aIter->mnCp - nCpOffs);
SwWW8Writer::WriteLong(*rWrt.pTableStrm, rFib.m_ccpText + rFib.m_ccpFootnote +
rFib.m_ccpHdr + rFib.m_ccpEdn + rFib.m_ccpTxbx + rFib.m_ccpHdrTxbx + 1);
- for (aIter = maDrawObjs.begin(); aIter < aEnd; ++aIter)
+ for (aIter = maDrawObjs.cbegin(); aIter < aEnd; ++aIter)
{
// write the fspa-struct
const ww8::Frame &rFrameFormat = aIter->maContent;
@@ -2266,8 +2266,8 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
MakeZOrderArrAndFollowIds(pSdrObjs->GetObjArr(), aSorted);
sal_uInt32 nShapeId=0;
- DrawObjPointerIter aEnd = aSorted.end();
- for (DrawObjPointerIter aIter = aSorted.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = aSorted.end();
+ for (auto aIter = aSorted.begin(); aIter != aEnd; ++aIter)
{
sal_Int32 nBorderThick=0;
DrawObj *pObj = (*aIter);
@@ -2857,8 +2857,8 @@ sal_Int32 SwEscherEx::WriteFlyFrame(const DrawObj &rObj, sal_uInt32 &rShapeId,
sal_uInt16 FindPos(const SwFrameFormat &rFormat, unsigned int nHdFtIndex,
DrawObjPointerVector &rPVec)
{
- DrawObjPointerIter aEnd = rPVec.end();
- for (DrawObjPointerIter aIter = rPVec.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = rPVec.end();
+ for (auto aIter = rPVec.begin(); aIter != aEnd; ++aIter)
{
const DrawObj *pObj = (*aIter);
OSL_ENSURE(pObj, "Impossible");
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 50216cf52d63..a063825432ad 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -495,8 +495,8 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby , bool bWriteCombChars
if( rNd.GetpSwpHints() == nullptr )
m_rExport.SetCurItemSet(&aExportSet);
- ww8::cPoolItemIter aEnd = aRangeItems.end();
- for ( ww8::cPoolItemIter aI = aRangeItems.begin(); aI != aEnd; ++aI )
+ auto aEnd = aRangeItems.cend();
+ for ( auto aI = aRangeItems.cbegin(); aI != aEnd; ++aI )
{
if ( !bRuby || !lcl_isFontsizeItem( *aI->second ) )
aExportItems[aI->first] = aI->second;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 4db4d19550ff..a60b21f12c86 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -360,10 +360,7 @@ public:
};
typedef std::vector<DrawObj> DrawObjVector;
-typedef DrawObjVector::const_iterator cDrawObjIter;
-
typedef std::vector<DrawObj *> DrawObjPointerVector;
-typedef DrawObjPointerVector::iterator DrawObjPointerIter;
class PlcDrawObj // PC for DrawObjects and Text-/OLE-/GRF-Boxes
{
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c45a7d9546c1..003afcb5cf1c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -208,8 +208,8 @@ bool WW8Export::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich
void MSWordExportBase::ExportPoolItemsToCHP( ww8::PoolItems &rItems, sal_uInt16 nScript, const SvxFontItem *pFont, bool bWriteCombChars )
{
- ww8::cPoolItemIter aEnd = rItems.end();
- for ( ww8::cPoolItemIter aI = rItems.begin(); aI != aEnd; ++aI )
+ auto aEnd = rItems.cend();
+ for ( auto aI = rItems.cbegin(); aI != aEnd; ++aI )
{
const SfxPoolItem *pItem = aI->second;
sal_uInt16 nWhich = pItem->Which();
@@ -296,8 +296,8 @@ void MSWordExportBase::OutputItemSet( const SfxItemSet& rSet, bool bPapFormat, b
ExportPoolItemsToCHP(aItems, nScript, nullptr);
if ( bPapFormat )
{
- ww8::cPoolItemIter aEnd = aItems.end();
- for ( ww8::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI )
+ auto aEnd = aItems.cend();
+ for ( auto aI = aItems.cbegin(); aI != aEnd; ++aI )
{
pItem = aI->second;
sal_uInt16 nWhich = pItem->Which();
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 37d74e6c0d26..c22b79841e0a 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1127,7 +1127,6 @@ private:
main logic of the filter itself.
*/
std::deque<WW8FieldEntry> m_aFieldStack;
- typedef std::deque<WW8FieldEntry>::const_iterator mycFieldIter;
/*
A stack of open footnotes. Should only be one in it at any time.
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index fdfdc2cd085f..9173f37edfaf 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -871,8 +871,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
bool bNested = false;
if (!m_aFieldStack.empty())
{
- mycFieldIter aEnd = m_aFieldStack.end();
- for(mycFieldIter aIter = m_aFieldStack.begin(); aIter != aEnd; ++aIter)
+ auto aEnd = m_aFieldStack.cend();
+ for(auto aIter = m_aFieldStack.cbegin(); aIter != aEnd; ++aIter)
{
bNested = !AcceptableNestedField(aIter->mnFieldId);
if (bNested)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-22 22:05:07 +0000