[Libreoffice-commits] core.git: 2 commits - hwpfilter/source sw/source

[Caolán McNamara]

 hwpfilter/source/hbox.cxx        |    2 --
 hwpfilter/source/hbox.h          |    2 --
 hwpfilter/source/hwpfile.cxx     |   10 ----------
 hwpfilter/source/hwpread.cxx     |    1 +
 sw/source/filter/ww8/ww8graf.cxx |    2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit dfe317b490025550d82cbd6bb46685171a864d7a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 24 15:06:10 2017 +0100

    ofz#1220 sanitize nTyp to legal values
    
    Change-Id: Iad71c4f79dbe03e2e325453eb0506a2d92d67c2d
    Reviewed-on: https://gerrit.libreoffice.org/36891
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 121f605f34dd..d404d6c9c29c 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1295,7 +1295,7 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD* pHd, SfxAllItemSet &rSet)
     else                                                // no -> take lines
         SetStdAttr( rSet, aCallB.dpPolyLine.aLnt, aCallB.dptxbx.aShd );
     SetFill( rSet, aCallB.dptxbx.aFill );
-    rSet.Put( SdrCaptionTypeItem( aCaptA[nTyp] ) );
+    rSet.Put(SdrCaptionTypeItem(aCaptA[nTyp % SAL_N_ELEMENTS(aCaptA)]));
 
     return pObj;
 }
commit 630ae53e3657423cb7eeda6f8e8160b75d497f8d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 21 10:51:19 2017 +0100

    ofz#1193 we only set these values, never read them
    
    Change-Id: Ia2f54b536a4262e19abe260e8e19c9b15cc2d0ec
    Reviewed-on: https://gerrit.libreoffice.org/36779
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 3bfe57662656..ef6348817f48 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -328,8 +328,6 @@ FBox::FBox(hchar hch)
     , pgy(0)
     , pgno(0)
     , showpg(0)
-    , prev(nullptr)
-    , next(nullptr)
 {
 }
 
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index a110d70d0f32..8824a0911ded 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -316,8 +316,6 @@ struct FBox: public HBox
     short     pgx, pgy;                           // physical xpos, ypos
     short     pgno, showpg;                       // pageno where code is
 
-    FBox      *prev, *next;
-
     explicit FBox( hchar hch );
     virtual ~FBox() override;
 };
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 729f31a9e317..00c45475fdf1 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -466,18 +466,8 @@ EmPicture *HWPFile::GetEmPictureByName(char * name)
     return nullptr;
 }
 
-
 void HWPFile::AddBox(FBox * box)
 {
-// LATER if we don't use box->next(),
-// AddBox() and GetBoxHead() are useless;
-    if (!blist.empty())
-    {
-        box->prev = blist.back();
-        box->prev->next = box;
-    }
-    else
-        box->prev = nullptr;
     blist.push_back(box);
 }
 
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 92f484b1d10d..90564df487b9 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -219,6 +219,7 @@ bool TxtBox::Read(HWPFile & hwpf)
     hwpf.AddBox(this);
     hwpf.Read2b(&style.cap_len, 1);
     hwpf.Read2b(&dummy1, 1);
+    unsigned short next;
     hwpf.Read2b(&next, 1);
     hwpf.Read2b(&dummy2, 1);