summaryrefslogtreecommitdiffstats
path: root/hwpfilter/source/hwpfile.h
diff options
context:
space:
mode:
Diffstat (limited to 'hwpfilter/source/hwpfile.h')
-rw-r--r--hwpfilter/source/hwpfile.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 867a05fb7418..126b7edf0fd8 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -68,11 +68,11 @@ class HWPStyle;
class HWPPara;
class HStream;
-struct ColumnInfo{
+struct HWPColumnInfo{
int start_page;
bool bIsSet;
std::shared_ptr<ColumnDef> xColdef;
- explicit ColumnInfo(int num){
+ explicit HWPColumnInfo(int num){
start_page = num;
bIsSet = false;
}
@@ -130,6 +130,7 @@ class DLLEXPORT HWPFile
* Reads two byte from HIODev
*/
bool Read2b(unsigned short &out);
+ bool Read2b(char16_t &out);
/**
* Reads four byte from HIODev
*/
@@ -202,7 +203,6 @@ class DLLEXPORT HWPFile
A3Paper = 8
};
- void AddBox(FBox *);
void AddPage(){ m_nCurrentPage++;}
void AddColumnInfo();
void SetColumnDef(std::shared_ptr<ColumnDef> const &);
@@ -253,6 +253,8 @@ class DLLEXPORT HWPFile
}
void pop_hpara_type() { element_import_stack.pop_back(); }
+ void move_to_failed(std::unique_ptr<HWPPara> rPara);
+
private:
int compareCharShape(CharShape const *shape);
int compareParaShape(ParaShape const *shape);
@@ -277,11 +279,13 @@ class DLLEXPORT HWPFile
HWPInfo _hwpInfo;
HWPFont _hwpFont;
HWPStyle _hwpStyle;
- std::vector<std::unique_ptr<ColumnInfo>> columnlist;
+ std::vector<std::unique_ptr<HWPColumnInfo>> columnlist;
// paragraph list
std::vector<std::unique_ptr<HWPPara>> plist;
- // floating box list
- std::vector<FBox*> blist;
+ // keep paragraph's that failed to load until
+ // import is complete to avoid dangling references
+ // elsewhere
+ std::vector<std::unique_ptr<HWPPara>> pfailedlist;
// embedded picture list(tag data)
std::vector<std::unique_ptr<EmPicture>> emblist;
std::vector<std::unique_ptr<HyperText>> hyperlist;