diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-20 13:59:06 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-20 13:59:06 +0100 |
| commit | 6715e1c1572d6b8902d841389ba9fbf162174f66 (patch) | |
| tree | 7655e27137cb9089af5b50e232e476c282ba628d | |
| parent | f5c9ac62777729d3ec756bda5f49d51168687978 (diff) | |
fdo#43105 related: patch does not help for the supposed testcase
| -rw-r--r-- | patches/dev300/apply | 5 | ||||
| -rw-r--r-- | patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff | 47 |
2 files changed, 0 insertions, 52 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index ee2f3d55c..37041fec5 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -189,11 +189,6 @@ svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer sd-slideshow-slideshowview-transformation-fix.diff, rodo -# temporary fix. does no harm and gets the job done but its not -# beautiful. Since the whole section needs to be refactored anyway decided not -# to waste for time with this fix but to focus on the refactoring -sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr - # FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr # FIXME: 2009-09-11: I wonder when this has been commented out, and diff --git a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff b/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff deleted file mode 100644 index 2fe086ce2..000000000 --- a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- - sw/source/filter/ww8/ww8par.cxx | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx -index 1101227..e89e330 100644 ---- sw/source/filter/ww8/ww8par.cxx -+++ sw/source/filter/ww8/ww8par.cxx -@@ -2075,6 +2075,8 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) - nCellLevel = 0 != pPlcxMan->HasParaSprm(0x244B); - } - -+ mark: -+ - WW8_TablePos *pTabPos=0; - WW8_TablePos aTabPos; - if (nCellLevel && !bVer67) -@@ -2088,7 +2090,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) - if (const BYTE *pLevel = pPlcxMan->HasParaSprm(0x6649)) - nCellLevel = *pLevel; - -- bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1); -+ bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, (nInTable<nCellLevel?nInTable:nCellLevel-1)); - - //Bad Table, remain unchanged in level, e.g. #i19667# - if (!bHasRowEnd) -@@ -2169,12 +2171,16 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) - // in Tabellen - while (nInTable < nCellLevel) - { -- if (StartTable(nStartCp)) -+ if (StartTable(nStartCp)) { - ++nInTable; -+ } - else - break; - - maApos.push_back(false); -+ if (nInTable<nCellLevel) -+ goto mark; -+ - } - // nach StartTable ist ein ReSync noetig ( eigentlich nur, falls die - // Tabelle ueber eine FKP-Grenze geht --- -1.7.0.1 - |