[Libreoffice-commits] core.git: 2 commits - vcl/inc writerfilter/source

[Herbert Dürr]

 vcl/inc/unx/saldisp.hxx                 |    2 --
 writerfilter/source/doctok/WW8Sttbf.cxx |    4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 91843f612208fc7d2641072a095efc6de0d0babf
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Jun 18 08:18:36 2012 +0000

    c#708653# remove unused member SalXLib::pYieldEntries_
    
    Change-Id: I0d562f102d5159c0711922ff0c2997a560304eba

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index d5e6240..2bfddda 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -159,7 +159,6 @@ public:
 
 // -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 typedef int(*YieldFunc)(int fd, void* data);
-struct YieldEntry;
 
 class VCLPLUG_GEN_PUBLIC SalXLib
 {
@@ -171,7 +170,6 @@ protected:
     int             nFDs_;
     fd_set          aReadFDS_;
     fd_set          aExceptionFDS_;
-    YieldEntry      *pYieldEntries_;
 
 public:
     SalXLib();
commit 037c606d6e973efa1fea47a3fc3a2985f9406b69
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 7 13:33:31 2013 +0000

    surely this is the true intent of this lunatic loop
    
    Change-Id: I6d7963b2b416fe19cc1274780c2aea0c24c25bbb

diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx
index c090b52..68b1c92 100644
--- a/writerfilter/source/doctok/WW8Sttbf.cxx
+++ b/writerfilter/source/doctok/WW8Sttbf.cxx
@@ -128,12 +128,10 @@ WW8SttbRgtplc::getEntry(sal_uInt32 nIndex)
 
     sal_uInt32 nOffset = 6;
 
-    while (nIndex > 0)
+    for (sal_uInt32 i = 0; i < nIndex; ++i)
     {
         sal_uInt16 nCount = getU16(nOffset);
-
         nOffset = nOffset + 2 + nCount;
-        ++nIndex;
     }
 
     sal_uInt16 nCount = getU16(nOffset);