diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-03-27 04:37:26 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-03-27 04:37:26 +0000 |
commit | ed9a9504befcd4070a25cafbb5f22c55df17dec3 (patch) | |
tree | 7aaed82e48587788d5ff3f552b0fdab8c1f11617 | |
parent | a644a56cbca28d3ce704fdffed4bec498f2ae1b7 (diff) |
CWS-TOOLING: integrate CWS hb21
2009-03-24 17:48:22 +0100 hbrinkm r269985 : #i100449# OutWW8TableDefinition: nSz sums the widths of columns. nTblOffset is added to the current width for every cellx.
2009-03-24 16:28:31 +0100 mav r269966 : #i100505# fix the wrapper ole-handler
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 20d3b56504..6c6bd690d8 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2155,7 +2155,7 @@ void SwWW8Writer::OutWW8TableDefinition } } - SwTwips nSz = nTblOffset; + SwTwips nSz = 0; sal_uInt32 n = 0; InsUInt16(nTblOffset); @@ -2167,6 +2167,8 @@ void SwWW8Writer::OutWW8TableDefinition SwTwips nCalc = nSz; if (bRelBoxSize) nCalc = (nCalc * nPageSize) / nTblSz; + + nCalc += nTblOffset; InsUInt16(static_cast<USHORT>(nCalc)); } |