diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-11 10:34:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-11 10:34:15 +0000 |
| commit | d2a1e81bc0689f36fd3e190e7e9a8bd7b54b8650 (patch) | |
| tree | bc24d9f1074c108f6a191e5a7ee7c041ff02b10d /xmloff/source/style | |
| parent | a69bc115e3407d455b07ca5ab8055cd434432abd (diff) | |
INTEGRATION: CWS num04 (1.30.84); FILE MERGED
2004/04/14 15:03:46 hbrinkm 1.30.84.1: #i23727# numbering indent can be negative
Diffstat (limited to 'xmloff/source/style')
| -rw-r--r-- | xmloff/source/style/xmlnumi.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 253506e29bb8..b9509dab453a 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnumi.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2003-12-01 12:04:56 $ + * last change: $Author: hr $ $Date: 2004-05-11 11:34:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -513,14 +513,11 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( pProps[nPos++].Value <<= eAdjust; sal_Int32 nLeftMargin = nSpaceBefore + nMinLabelWidth; - if( nLeftMargin < 0 ) - nLeftMargin = 0; pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_LEFT_MARGIN ); pProps[nPos++].Value <<= (sal_Int32)nLeftMargin; - sal_Int32 nFirstLineOffset = - nMinLabelWidth <= nLeftMargin ? -nMinLabelWidth : -nLeftMargin; + sal_Int32 nFirstLineOffset = -nMinLabelWidth; pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_FIRST_LINE_OFFSET ); @@ -736,7 +733,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( switch( aTokenMap.Get( nPrefix, aLocalName ) ) { case XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE: - if( rUnitConv.convertMeasure( nVal, rValue, 0, USHRT_MAX ) ) + if( rUnitConv.convertMeasure( nVal, rValue, SHRT_MIN, SHRT_MAX ) ) rListLevel.SetSpaceBefore( nVal ); break; case XML_TOK_STYLE_ATTRIBUTES_ATTR_MIN_LABEL_WIDTH: |