diff options
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/hbox.h | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index cc3b13963a31..2c8489a14d0f 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -833,7 +833,7 @@ struct MailMerge: public HBox MailMerge(); virtual bool Read(HWPFile &hwpf) override; - hchar_string GetString(); + static hchar_string GetString(); }; // char composition(23) diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 49e819b84cd2..dea71b5ea4e9 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -4758,9 +4758,9 @@ void HwpReader::makeShowPageNum() * mail merge operation using hwp addressbook and hwp data form. * not support operation in OO writer. */ -void HwpReader::makeMailMerge(MailMerge * hbox) +void HwpReader::makeMailMerge(MailMerge *) { - hchar_string const boxstr = hbox->GetString(); + hchar_string const boxstr = MailMerge::GetString(); rchars(reinterpret_cast<sal_Unicode const *>(hconv(boxstr.c_str()))); } |