[Libreoffice-commits] .: 2 commits - l10ntools/source sw/source

[Caolán McNamara]

 l10ntools/source/makefile.mk     |    6 +++++-
 sw/source/filter/ww8/ww8par.cxx  |    2 +-
 sw/source/filter/ww8/ww8scan.cxx |   14 +++++++-------
 sw/source/filter/ww8/ww8scan.hxx |    2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit d88ba9af3546973355ff3d6f40bc1243b15a8656
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 31 13:02:24 2011 +0100

    rename this odd operator++ to just 'advance'

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 663d80b..4cc6323 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4570,7 +4570,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
         WW8_CP nStart, nEnd;
         void* pDummy;
 
-        for (int i=0;i<pGloss->GetNoStrings();i++,aPlc++)
+        for (int i = 0; i < pGloss->GetNoStrings(); ++i, aPlc.advance())
         {
             SwNodeIndex aIdx( rDoc.GetNodes().GetEndOfContent());
             SwTxtFmtColl* pColl =
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index ac92dd2..3e2e74c 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2930,7 +2930,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp()
         pFkp = 0;
         return false;                           // PLCF fertig abgearbeitet
     }
-    (*pPLCF)++;
+    pPLCF->advance();
     long nPo = SVBT16ToShort( (sal_uInt8 *)pPage );
     nPo <<= 9;                                  // shift als LONG
 
@@ -3550,8 +3550,8 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p)
 
 WW8PLCFx& WW8PLCFx_SEPX::operator ++( int )
 {
-    if( pPLCF )
-        (*pPLCF)++;
+    if (pPLCF)
+        pPLCF->advance();
     return *this;
 }
 
@@ -3723,10 +3723,10 @@ void WW8PLCFx_SubDoc::GetSprms(WW8PLCFxDesc* p)
 
 WW8PLCFx& WW8PLCFx_SubDoc::operator ++( int )
 {
-    if( pRef && pTxt )
+    if (pRef && pTxt)
     {
-        (*pRef)++;
-        (*pTxt)++;
+        pRef->advance();
+        pTxt->advance();
     }
     return *this;
 }
@@ -6617,7 +6617,7 @@ bool WW8PLCF_HdFt::GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rSta
     aPLCF.SetIdx( nIdx );               // Lookup suitable CP
     aPLCF.Get( rStart, nEnd, pData );
     rLen = nEnd - rStart;
-    aPLCF++;
+    aPLCF.advance();
 
     return true;
 }
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 956a0cc..a24f23a 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -313,7 +313,7 @@ public:
     bool SeekPos(WW8_CP nPos);
     WW8_CP Where() const;
     bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const;
-    WW8PLCF& operator ++( int ) { if( nIdx < nIMax ) nIdx++; return *this; }
+    void advance() { if( nIdx < nIMax ) ++nIdx; }
 
     const void* GetData( sal_Int32 nInIdx ) const
     {
commit b8eec102530c755a748957ee313f6b6112c9fcd1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 31 13:00:17 2011 +0100

    just add it wholesale

diff --git a/l10ntools/source/makefile.mk b/l10ntools/source/makefile.mk
index 303671c..60832f6 100644
--- a/l10ntools/source/makefile.mk
+++ b/l10ntools/source/makefile.mk
@@ -99,14 +99,15 @@ APP3RPATH=  NONE
 APP3STDLIBS+= \
             $(COMPHELPERLIB) \
             $(TOOLSLIB) \
+            $(COMPHELPERLIB) \
             $(SALLIB)
 
 # tag checker for *.gsi
 APP5TARGET= gsicheck
 APP5OBJS=   $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj
 APP5STDLIBS+= \
-            $(COMPHELPERLIB) \
             $(TOOLSLIB) \
+            $(COMPHELPERLIB) \
             $(SALLIB)
 
 # extractor and merger for *.cfg
@@ -115,6 +116,7 @@ APP6OBJS=   $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj  $(OBJ)$/merge.obj $
 APP6STDLIBS+= \
             $(COMPHELPERLIB) \
             $(TOOLSLIB) \
+            $(COMPHELPERLIB) \
             $(SALLIB)
 
 # extractor and merger for *.xrm
@@ -124,6 +126,7 @@ APP7RPATH=  NONE
 APP7STDLIBS+= \
             $(COMPHELPERLIB) \
             $(TOOLSLIB) \
+            $(COMPHELPERLIB) \
             $(SALLIB)
 
 # localizer for l10n framework
@@ -135,6 +138,7 @@ APP9OBJS=   $(OBJ)$/localize.obj $(OBJ)$/srciter.obj $(OBJ)$/export2.obj $(OBJ)$
 APP9STDLIBS+= \
             $(COMPHELPERLIB) \
             $(TOOLSLIB) \
+            $(COMPHELPERLIB) \
             $(ICUINLIB) \
             $(ICUUCLIB) \
             $(SALLIB)