summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-02 16:41:21 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-02 16:41:21 +0000
commit24ee9419887e47b6717b1ab3969ace6b65235baa (patch)
treea8706c77bc9f3ad24677561bdb7e2775970d7cf2
parentb8401334da954f36558afa1ecc34998a436af13d (diff)
CWS-TOOLING: integrate CWS hb21_DEV300
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.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index f8e783a02188..0f5372b1f7a0 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);
@@ -2168,6 +2168,8 @@ void SwWW8Writer::OutWW8TableDefinition
if (bRelBoxSize)
nCalc = (nCalc * nPageSize) / nTblSz;
+ nCalc += nTblOffset;
+
InsUInt16(static_cast<USHORT>(nCalc));
}