diff options
Diffstat (limited to 'hwpfilter/source/hbox.h')
| -rw-r--r-- | hwpfilter/source/hbox.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index 869fedd8ba90..e07027882350 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -25,6 +25,7 @@ #include <array> #include <memory> +#include <rtl/ustring.hxx> #include <sal/types.h> #include "hwplib.h" @@ -360,7 +361,9 @@ struct TxtBox: public FBox /** * Paragraph list */ - std::vector<std::vector<std::unique_ptr<HWPPara>>> plists; + typedef std::vector<std::unique_ptr<HWPPara>> plist_t; + typedef std::vector<plist_t> plists_t; + plists_t plists; /** * Caption @@ -520,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 @@ -538,15 +532,6 @@ struct PicDefEmbed char embname[16]; }; -/** - * @short Win32 ole object - */ -struct PicDefOle -{ - char embname[16]; - void *hwpole; -}; - struct HWPDrawingObject; /** @@ -570,9 +555,7 @@ struct PicDefUnknown typedef union { - PicDefFile picfile; PicDefEmbed picembed; - PicDefOle picole; PicDefDraw picdraw; PicDefUnknown picun; } PicDef; @@ -617,7 +600,7 @@ struct Picture: public FBox * Ratio of magnification or reduction. */ hunit scale[2]; - PicDef picinfo = {}; + PicDef picinfo; char reserved3[9]; std::vector<std::unique_ptr<HWPPara>> caption; @@ -969,7 +952,7 @@ class Outline: public HBox Outline(); virtual bool Read(HWPFile &hwpf) override; - hchar_string GetUnicode() const; + OUString GetUnicode() const; }; /* Bundle of spaces (30) */ |