summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-21 10:51:19 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-05-02 17:35:44 +0200
commit0dae5454104c568d73ce108a1003a382e2a2d418 (patch)
tree7591ca1a50256da7936bd4edb379bb82af4b527e
parent0b1c1447d11178e96297e82bc99650727a6b9cad (diff)
ofz#1193 we only set these values, never read them
Change-Id: Ia2f54b536a4262e19abe260e8e19c9b15cc2d0ec Reviewed-on: https://gerrit.libreoffice.org/36782 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-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 04d5497ce1f3..0cde055d7345 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -332,8 +332,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 a9aa2b452892..b642665dc520 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 929a783d0761..96395da5c6da 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -441,18 +441,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 abeaca660d53..608fd0371da2 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);