hwpfilter/source/hbox.h | 20 -------------------- hwpfilter/source/hwpreader.cxx | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-)
New commits: commit ebf27c92e5743053fdfecb7709f017ffdced1b5a Author: Caolán McNamara <[email protected]> AuthorDate: Tue Feb 13 11:24:54 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 13 15:09:38 2024 +0100 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 <[email protected]> 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) { commit 88931161db5ce8c70415590702981fcfe31d92ed Author: Caolán McNamara <[email protected]> AuthorDate: Tue Feb 13 11:23:42 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 13 15:09:31 2024 +0100 drop unused hwpole member Change-Id: I86fbe74c7d7faf66fcab63c2dcd24e13149c1671 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163300 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 5136d281bba1..3f91d7267f24 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -538,7 +538,6 @@ struct PicDefEmbed struct PicDefOle { char embname[16]; - void *hwpole; }; struct HWPDrawingObject; commit 6e4e2ff4dcef937652f0ce502f60bd11073525d7 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Feb 13 11:22:16 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 13 15:09:25 2024 +0100 drop unused PicDefFile union member Change-Id: Ib9b62595012c7220a849a54d0d61200ac0b132c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163299 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index f7813b225dd5..5136d281bba1 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -523,15 +523,6 @@ enum pictype PICTYPE_FILE, PICTYPE_OLE, PICTYPE_EMBED, PICTYPE_DRAW, PICTYPE_UNKNOWN }; -/** - * @short External image file - */ -struct PicDefFile -{ - char path[256]; - void *img; - bool skipfind; -}; /** * @short Embedded image file @@ -573,7 +564,6 @@ struct PicDefUnknown typedef union { - PicDefFile picfile; PicDefEmbed picembed; PicDefOle picole; PicDefDraw picdraw;
