diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-02-22 15:56:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-02-23 09:32:11 +0100 |
| commit | 445c38d0ea247e48055d770df2fe9fffe5a80e0e (patch) | |
| tree | 1016874c4afba619992b69d141f0da96a7a99252 | |
| parent | CppunitTest_sfx2_classification: remove duplicated dispatchCommand (diff) | |
| download | core-445c38d0ea247e48055d770df2fe9fffe5a80e0e.tar.gz core-445c38d0ea247e48055d770df2fe9fffe5a80e0e.zip | |
blist is written to but not read from and storing pointers has no sideeffect
Change-Id: I45221eda3d8536df75c4471888f35fb1b89e0a54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130358
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | hwpfilter/source/hwpfile.cxx | 5 | ||||
| -rw-r--r-- | hwpfilter/source/hwpfile.h | 3 | ||||
| -rw-r--r-- | hwpfilter/source/hwpread.cxx | 3 |
3 files changed, 0 insertions, 11 deletions
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 5f32a38c0633..528f00a12f5f 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -450,11 +450,6 @@ EmPicture *HWPFile::GetEmPictureByName(char * name) return nullptr; } -void HWPFile::AddBox(FBox * box) -{ - blist.push_back(box); -} - ParaShape *HWPFile::getParaShape(int index) { if (index < 0 || o3tl::make_unsigned(index) >= pslist.size()) diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index 867a05fb7418..7cb693d948ca 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -202,7 +202,6 @@ class DLLEXPORT HWPFile A3Paper = 8 }; - void AddBox(FBox *); void AddPage(){ m_nCurrentPage++;} void AddColumnInfo(); void SetColumnDef(std::shared_ptr<ColumnDef> const &); @@ -280,8 +279,6 @@ class DLLEXPORT HWPFile std::vector<std::unique_ptr<ColumnInfo>> columnlist; // paragraph list std::vector<std::unique_ptr<HWPPara>> plist; - // floating box list - std::vector<FBox*> blist; // embedded picture list(tag data) std::vector<std::unique_ptr<EmPicture>> emblist; std::vector<std::unique_ptr<HyperText>> hyperlist; diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index 8e4a96c726d0..9cffef46d17e 100644 --- a/hwpfilter/source/hwpread.cxx +++ b/hwpfilter/source/hwpread.cxx @@ -221,7 +221,6 @@ bool TxtBox::Read(HWPFile & hwpf) if (hh != dummy || CH_TEXT_BOX != dummy) { return hwpf.SetState(HWP_InvalidFileFormat); } - hwpf.AddBox(this); hwpf.Read2b(&style.cap_len, 1); hwpf.Read2b(&dummy1, 1); unsigned short next; @@ -400,7 +399,6 @@ bool Picture::Read(HWPFile & hwpf) if (hh != dummy || CH_PICTURE != dummy) { return hwpf.SetState(HWP_InvalidFileFormat); } - hwpf.AddBox(this); hwpf.Read4b(follow_block_size); @@ -541,7 +539,6 @@ bool Line::Read(HWPFile & hwpf) if (hh != dummy || CH_LINE != dummy) { return hwpf.SetState(HWP_InvalidFileFormat); } - hwpf.AddBox(this); style.boxnum = fboxnum++; zorder = zindex++; |