strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PicDefOle and PicDefEmbed have the same layout now

Browse source 
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>
This commit is contained in:
Caolán McNamara 2024-02-13 11:24:54 +00:00
parent 88931161db
commit ebf27c92e5
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hwpfilter/source/hbox.h
View file

@ -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;

2
hwpfilter/source/hwpreader.cxx
View file

@ -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) {