diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-02-24 20:43:12 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-25 01:00:13 +0100 |
commit | 05bd9ed45d7a985ba7a53d0c122d6dbcd6cb2652 (patch) | |
tree | 1e65368cb3e0f7c922a77860924273c1e9cc3f07 /hwpfilter/source/hwpfile.h | |
parent | 86a5c40b4ab4cdf20733dbbb1698472c9a0eeded (diff) |
forcepoint #8 ensure ColumnDef lifetime
Change-Id: Idb0c7b1530dc57f4d7c14751f1b76caecc3b03a6
Reviewed-on: https://gerrit.libreoffice.org/50288
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'hwpfilter/source/hwpfile.h')
-rw-r--r-- | hwpfilter/source/hwpfile.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index f39681ffad84..442b442e0514 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -72,11 +72,10 @@ class HStream; struct ColumnInfo{ int start_page; bool bIsSet; - ColumnDef *coldef; + std::shared_ptr<ColumnDef> xColdef; explicit ColumnInfo(int num){ start_page = num; bIsSet = false; - coldef = nullptr; } }; @@ -211,7 +210,7 @@ class DLLEXPORT HWPFile void AddBox(FBox *); void AddPage(){ m_nCurrentPage++;} void AddColumnInfo(); - void SetColumnDef(ColumnDef *coldef); + void SetColumnDef(std::shared_ptr<ColumnDef> const &); void AddParaShape(std::shared_ptr<ParaShape> const &); void AddCharShape(std::shared_ptr<CharShape> const &); void AddFBoxStyle(FBoxStyle *); |