[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-7' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hbox.cxx    |    2 --
 hwpfilter/source/hbox.h      |    2 --
 hwpfilter/source/hwpfile.cxx |   10 ----------
 hwpfilter/source/hwpread.cxx |    1 +
 4 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 7864690ac1fc1b9d390b853da408f3520f64afda
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/36783
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 3d912b5c85d5..6b39021cf2b4 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -331,8 +331,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 d29c02752e4f..69e14f638e15 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();
 };
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 5e4edc951145..a6f97f9f1a87 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -446,18 +446,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 d3bedc3baeec..ffe8d2eca455 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -221,6 +221,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);