diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-02-13 11:24:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-02-13 15:09:38 +0100 |
| commit | ebf27c92e5743053fdfecb7709f017ffdced1b5a (patch) | |
| tree | 2beee7e267cc123db93d352d8c5b3c6fee759370 /hwpfilter/source | |
| parent | 88931161db5ce8c70415590702981fcfe31d92ed (diff) | |
PicDefOle and PicDefEmbed have the same layout now
so just use PicDefEmbed
Change-Id: I1b797b69e5c2137553ac24a73c229359ca3d935b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163301
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'hwpfilter/source')
| -rw-r--r-- | hwpfilter/source/hbox.h | 9 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 3f91d7267f24..e07027882350 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -532,14 +532,6 @@ struct PicDefEmbed char embname[16]; }; -/** - * @short Win32 ole object - */ -struct PicDefOle -{ - char embname[16]; -}; - struct HWPDrawingObject; /** @@ -564,7 +556,6 @@ struct PicDefUnknown typedef union { PicDefEmbed picembed; - PicDefOle picole; PicDefDraw picdraw; PicDefUnknown picun; } PicDef; diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 0f248d8c9651..2400192bb959 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -3840,7 +3840,7 @@ void HwpReader::makePicture(Picture * hbox) LPUNKNOWN pObj; wchar_t pathname[200]; - MultiByteToWideChar(CP_ACP, 0, hbox->picinfo.picole.embname, -1, pathname, 200); + MultiByteToWideChar(CP_ACP, 0, hbox->picinfo.picembed.embname, -1, pathname, 200); int rc = hwpfile.oledata->pis->OpenStorage(pathname, nullptr, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, nullptr, 0, &srcsto); if (rc != S_OK) { |