hwpfilter/source/hwpfile.cxx | 4 ++-- hwpfilter/source/hwpfile.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 37bc6ca4bbdfa355440183f54e9fe35e8d23cae2 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 1 08:54:29 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Mar 1 14:46:13 2024 +0100 fix ODR violation which causes a segfault in CppunitTest_hwpfilter_test_hwpfilter when building with --enable-mergelibs=more Change-Id: I4310060e28ee092bf7831d5dfd71e98ad3724bbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164177 Tested-by: Noel Grandin <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx index 637489aee04b..c186ad8609a4 100644 --- a/hwpfilter/source/hwpfile.cxx +++ b/hwpfilter/source/hwpfile.cxx @@ -566,13 +566,13 @@ void HWPFile::AddCharShape(std::shared_ptr<CharShape> const & cshape) void HWPFile::AddColumnInfo() { - columnlist.emplace_back(new ColumnInfo(m_nCurrentPage)); + columnlist.emplace_back(new HWPColumnInfo(m_nCurrentPage)); setMaxSettedPage(); } void HWPFile::SetColumnDef(const std::shared_ptr<ColumnDef>& rColdef) { - ColumnInfo *cinfo = columnlist.back().get(); + HWPColumnInfo *cinfo = columnlist.back().get(); if( cinfo->bIsSet ) return; cinfo->xColdef = rColdef; diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index 2c4d7e7bdc9e..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; } @@ -279,7 +279,7 @@ 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; // keep paragraph's that failed to load until
