sw/qa/core/data/html/fail/ofz6891-1.html | 1 +
sw/source/filter/html/htmltab.cxx | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 724d34d58b437843e40aaa74008d94cac1465cea
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 13 14:19:46 2018 +0000
ofz#6891 empty vector access
Change-Id: Ic36d03d2646ebd90bea5fa91bc4dac3596a55d4a
Reviewed-on: https://gerrit.libreoffice.org/51224
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/qa/core/data/html/fail/ofz6891-1.html
b/sw/qa/core/data/html/fail/ofz6891-1.html
new file mode 100644
index 000000000000..7d767d72a135
--- /dev/null
+++ b/sw/qa/core/data/html/fail/ofz6891-1.html
@@ -0,0 +1 @@
+<table align=left><td><table><S STYLE="position:absolute;width: 6">
\ No newline at end of file
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 9865974cd44e..be3776cb1846 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2404,7 +2404,10 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16
nAbsAvail,
// Only tables with relative width or without width should be modified
m_xLayoutInfo->SetMustResize( m_bPrcWidth || !m_nWidth );
- m_xLayoutInfo->SetWidths();
+ if (!pLine1->GetTabBoxes().empty())
+ m_xLayoutInfo->SetWidths();
+ else
+ SAL_WARN("sw.html", "no table box");
const_cast<SwTable *>(m_pSwTable)->SetHTMLTableLayout(m_xLayoutInfo);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
