Kaydet (Commit) 9893de67 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

forcepoint #28 missing cell on abw import

Change-Id: I7633a17afab5aa2eb9e47a552bd5d92c87d383c7
Reviewed-on: https://gerrit.libreoffice.org/51853Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 671e9453)
üst 71858d86
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "hintids.hxx" #include "hintids.hxx"
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTable.hpp>
#include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/table/XCellRange.hpp>
...@@ -1646,8 +1647,10 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName, ...@@ -1646,8 +1647,10 @@ void SwXMLTableContext::InsertCell( const OUString& rStyleName,
for( sal_uInt32 j=nRowSpan; j>0; --j ) for( sal_uInt32 j=nRowSpan; j>0; --j )
{ {
const bool bCovered = i != nColSpan || j != nRowSpan; const bool bCovered = i != nColSpan || j != nRowSpan;
GetCell( nRowsReq-j, nColsReq-i ) SwXMLTableCell_Impl *pCell = GetCell( nRowsReq-j, nColsReq-i );
->Set( sStyleName, j, i, pStartNode, if (!pCell)
throw css::lang::IndexOutOfBoundsException();
pCell->Set( sStyleName, j, i, pStartNode,
pTable, bProtect, pFormula, bHasValue, bCovered, fValue, pTable, bProtect, pFormula, bHasValue, bCovered, fValue,
pStringValue, i_rXmlId ); pStringValue, i_rXmlId );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment