diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:46:37 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:46:37 +0000 |
| commit | 5c94356d32233d0ed95eeec8a2bbd1a05c4e359b (patch) | |
| tree | b5c16154f8a44027dedc41248b1258c5b1ae069e /sw/source/core | |
| parent | 01b29d8ec5f91d5126d910759b48ecac425143f2 (diff) | |
INTEGRATION: CWS geordi2q04 (1.14.154); FILE MERGED
2003/09/02 10:38:00 rt 1.14.154.1: #111934#: Join CWS sw7pp1.
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 3dd291cdd098..e4fb0c4a8fb6 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtbl.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2003-05-28 12:51:10 $ + * last change: $Author: obo $ $Date: 2003-09-04 11:46:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,10 @@ #ifndef _SVX_BOXITEM_HXX //autogen #include <svx/boxitem.hxx> #endif +// OD 06.08.2003 #i17174# +#ifndef _SVX_SHADITEM_HXX +#include <svx/shaditem.hxx> +#endif #ifndef _FMTFSIZE_HXX //autogen #include <fmtfsize.hxx> @@ -2307,12 +2311,16 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly, // dann muss es jetzt auf absolute umgerechnet werden. SwTable& rTab = *pTab->GetTable(); const SwFmtFrmSize& rTblFrmSz = rTab.GetFrmFmt()->GetFrmSize(); -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) - long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)(); -#else - long nPrtWidth = pTab->Prt().Width(); -#endif + // OD 06.08.2003 #i17174# - With fix for #i9040# the shadow size is taken + // from the table width. Thus, add its left and right size to current table + // printing area width in order to get the correct table size attribute. + SwTwips nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)(); + { + SvxShadowItem aShadow( rTab.GetFrmFmt()->GetShadow() ); + nPrtWidth += aShadow.CalcShadowSpace( SHADOW_LEFT ) + + aShadow.CalcShadowSpace( SHADOW_RIGHT ); + } if( nPrtWidth != rTblFrmSz.GetWidth() ) { SwFmtFrmSize aSz( rTblFrmSz ); |