diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:50:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:50:23 +0000 |
| commit | 94f498c3ba6db74837bb1d92fdd0491fc7f344b5 (patch) | |
| tree | 80b5c8183cb83490566d1a6047a9152ee94e1c57 /xmloff/source/style/lspachdl.cxx | |
| parent | 22379eb6a0a6909fd69143102bee7f4ffecab470 (diff) | |
INTEGRATION: CWS sb59 (1.4.152); FILE MERGED
2006/08/09 12:53:56 sb 1.4.152.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'xmloff/source/style/lspachdl.cxx')
| -rw-r--r-- | xmloff/source/style/lspachdl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index 439a123cd096..9fb587d5dcbd 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: lspachdl.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 10:55:31 $ + * last change: $Author: obo $ $Date: 2006-10-12 14:50:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -98,7 +98,7 @@ sal_Bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV aLSp.Mode = style::LineSpacingMode::PROP; if(!rUnitConverter.convertPercent( nTemp, rStrImpValue )) return sal_False; - aLSp.Height = nTemp; + aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); } else if( IsXMLToken( rStrImpValue, XML_CASEMAP_NORMAL) ) { @@ -110,7 +110,7 @@ sal_Bool XMLLineHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV aLSp.Mode = style::LineSpacingMode::FIX; if(!rUnitConverter.convertMeasure( nTemp, rStrImpValue, 0x0000, 0xffff )) return sal_False; - aLSp.Height = nTemp; + aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); } rValue <<= aLSp; @@ -159,7 +159,7 @@ sal_Bool XMLLineHeightAtLeastHdl::importXML( const OUString& rStrImpValue, uno:: aLSp.Mode = style::LineSpacingMode::MINIMUM; if(!rUnitConverter.convertMeasure( nTemp, rStrImpValue, 0x0000, 0xffff )) return sal_False; - aLSp.Height = nTemp; + aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); rValue <<= aLSp; return sal_True; @@ -200,7 +200,7 @@ sal_Bool XMLLineSpacingHdl::importXML( const OUString& rStrImpValue, uno::Any& r aLSp.Mode = style::LineSpacingMode::LEADING; if(!rUnitConverter.convertMeasure( nTemp, rStrImpValue, 0x0000, 0xffff )) return sal_False; - aLSp.Height = nTemp; + aLSp.Height = sal::static_int_cast< sal_Int16 >(nTemp); rValue <<= aLSp; return sal_True; |