summaryrefslogtreecommitdiff
path: root/hwpfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-21 10:51:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-18 15:06:58 +0200
commit77282b66b27f8e3156b2fb68a9a3a363643ff2f8 (patch)
tree7bb732b5c0a0fce6c3cb9edfa51574e46ce56940 /hwpfilter
parenteeb9e60fb88ec44884938003d7d11771c7fffd78 (diff)
ofz#1193 we only set these values, never read them
Change-Id: Ia2f54b536a4262e19abe260e8e19c9b15cc2d0ec Reviewed-on: https://gerrit.libreoffice.org/37761 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hbox.cxx2
-rw-r--r--hwpfilter/source/hbox.h2
-rw-r--r--hwpfilter/source/hwpfile.cxx10
-rw-r--r--hwpfilter/source/hwpread.cxx1
4 files changed, 1 insertions, 14 deletions
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);