Kaydet (Commit) 05e17ac4 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS sixtyfour04 (1.34.34); FILE MERGED

2006/03/14 13:09:43 cmc 1.34.34.1: #i60372# fix scaling when exporting/importing on 64bit platforms
üst 73bfcd8b
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: xmlnumi.cxx,v $ * $RCSfile: xmlnumi.cxx,v $
* *
* $Revision: 1.34 $ * $Revision: 1.35 $
* *
* last change: $Author: obo $ $Date: 2006-01-16 15:07:00 $ * last change: $Author: vg $ $Date: 2006-04-07 08:12:01 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -757,11 +757,11 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( ...@@ -757,11 +757,11 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
sVerticalRel = rValue; sVerticalRel = rValue;
break; break;
case XML_TOK_STYLE_ATTRIBUTES_ATTR_WIDTH: case XML_TOK_STYLE_ATTRIBUTES_ATTR_WIDTH:
if( rUnitConv.convertMeasure( nVal, rValue, 0, LONG_MAX ) ) if( rUnitConv.convertMeasure( nVal, rValue, 0, SAL_MAX_INT32) )
rListLevel.SetImageWidth( nVal ); rListLevel.SetImageWidth( nVal );
break; break;
case XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT: case XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT:
if( rUnitConv.convertMeasure( nVal, rValue, 0, LONG_MAX ) ) if( rUnitConv.convertMeasure( nVal, rValue, 0, SAL_MAX_INT32) )
rListLevel.SetImageHeight( nVal ); rListLevel.SetImageHeight( nVal );
break; break;
case XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR: case XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment