diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-05 20:51:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-05 21:55:31 +0200 |
| commit | 42132debf46d9ace4c4b33aead31e59b7d43d1ef (patch) | |
| tree | 103bac4733c4fc5e32685926ab6bedea34935dc3 /sw | |
| parent | 1b4b3db429555c48dd800f175f92040b73cece65 (diff) | |
unconflicting commits stomped on eachother
commit 7f94c09b8bad0d8d31e126a95ede4fa937a8981a
Date: Mon Oct 5 11:31:47 2020 +0100
SwUndoTableMerge::MoveBoxContent always dereferences its SwDoc* arg
and...
commit e366c928819c44b5c253c45dca6dae40b71c9808
Date: Thu Oct 1 17:31:21 2020 +0200
sw: ODF import: convert the simplest sub-tables to rowspan tables
Change-Id: I2b5d12f1c08171d4f8382f64361f4e52fa70d5b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103998
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/table/swnewtable.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index ecd3bee01d1d..005b9ec40c3b 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -2198,7 +2198,7 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox) assert(pSourceBox->getRowSpan() == 1); // import filter (xmltbli.cxx) converts all box widths to absolute assert(pSourceBox->GetFrameFormat()->GetFrameSize().GetWidthPercent() == 0); - ::InsTableBox(pDoc, GetTableNode(), pNewLine, + ::InsTableBox(*pDoc, GetTableNode(), pNewLine, static_cast<SwTableBoxFormat*>(pSourceBox->GetFrameFormat()), pSourceBox, j+k, 1); // insert dummy text node... @@ -2237,7 +2237,7 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox) SwTableBox *const pSourceBox(pSourceLine->GetTabBoxes()[j]); assert(pSourceBox->GetTabLines().empty()); // checked for that sal_uInt16 const nInsPos(j < nBox ? j : j + pSubLine->GetTabBoxes().size() - 1); - ::InsTableBox(pDoc, GetTableNode(), pNewLine, + ::InsTableBox(*pDoc, GetTableNode(), pNewLine, static_cast<SwTableBoxFormat*>(pSourceBox->GetFrameFormat()), pSourceBox, nInsPos, 1); // adjust row span: |