diff options
author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:48:02 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:48:02 +0000 |
commit | 28c3b69f91b79b977e6fc62958bb5b8a8ab1402b (patch) | |
tree | 496562b9db033c7fa63939520a9ab75f0fc01070 /sw/source/core | |
parent | ad9ff08b44d6f64e66198767e5323bab1a5cf77b (diff) |
INTEGRATION: CWS geordi2q04 (1.37.192); FILE MERGED
2003/09/02 10:38:07 rt 1.37.192.1: #111934#: Join CWS sw7pp1.
Diffstat (limited to 'sw/source/core')
-rw-r--r-- | sw/source/core/text/porfld.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index f2ace8102433..543cdc7b035f 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porfld.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: vg $ $Date: 2003-04-17 16:08:57 $ + * last change: $Author: obo $ $Date: 2003-09-04 11:48:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -623,6 +623,9 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo &rInf ) nDiff = 0; else if ( nDiff > rInf.X() ) nDiff -= rInf.X(); + else + nDiff = 0; + if( nDiff < nFixWidth + nMinDist ) nDiff = nFixWidth + nMinDist; // 2739: Numerierung weicht Fly aus, kein nDiff in der zweiten Runde |