diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-21 10:51:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-04-21 17:48:41 +0200 |
| commit | 35673b8d82ff5d8d95e2d0315b7577ac28345bed (patch) | |
| tree | 9b35baba9f1f3952f5c85dec78e8860c8770f224 | |
| parent | 3430b5610b9740a592d9c2ca0634ddd04e1e3ca1 (diff) | |
ofz#1193 we only set these values, never read them
Change-Id: Ia2f54b536a4262e19abe260e8e19c9b15cc2d0ec
Reviewed-on: https://gerrit.libreoffice.org/36781
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | hwpfilter/source/hbox.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hbox.h | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hwpfile.cxx | 10 | ||||
| -rw-r--r-- | hwpfilter/source/hwpread.cxx | 1 |
4 files changed, 1 insertions, 14 deletions
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); |