sw/source/filter/html/htmltab.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit ee2392460a24a7478794531bc891d3bee8984ac4 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Dec 8 15:30:06 2017 +0000 we only check for the presense of m_pCnts, not use it Change-Id: I298a188cc236c5f6bbc1d3be04630fce03ca62d4 Reviewed-on: https://gerrit.libreoffice.org/46103 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 11d47a4514f0..447fa867e766 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2975,7 +2975,7 @@ public: bool bReadOpt ); void AddContents( HTMLTableCnts *pNewCnts ); - HTMLTableCnts *GetFirstContents() { return m_pCnts; } + bool HasFirstContents() const { return m_pCnts != nullptr; } void ClearIsInSection() { m_pCurrCnts = nullptr; } bool IsInSection() const { return m_pCurrCnts!=nullptr; } @@ -3910,10 +3910,10 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, // We also create an empty content if the cell ended with a table and had no // COL tags. Otherwise, it was probably exported by us and we don't // want to have an additional paragraph - if( !pSaveStruct->GetFirstContents() || + if( !pSaveStruct->HasFirstContents() || (!pSaveStruct->IsInSection() && !pCurTable->HasColTags()) ) { - OSL_ENSURE( pSaveStruct->GetFirstContents() || + OSL_ENSURE( pSaveStruct->HasFirstContents() || !pSaveStruct->IsInSection(), "Section or not, that is the question here" ); const SwStartNode *pStNd =
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits