diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-19 21:11:47 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-19 21:23:27 +0200 |
| commit | debea9d3250e809e323461324514e9d073d06e3a (patch) | |
| tree | 4898e2ab3e89062562b8e5294818d23d2c10850b /oox | |
| parent | 96682a78cfe076714616a880f214248b4498ebf3 (diff) | |
no matching function for call to 'max(int, long int)'
Change-Id: I7533098781b0b6987cd852d74a688aac6e0af056
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index efbb1de64a97..7b3d72268629 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1075,7 +1075,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa } else { if( nBulletRelSize && nBulletRelSize != 100 ) mpFS->singleElementNS( XML_a, XML_buSzPct, - XML_val, IS( std::min( 25000, std::max( 400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND ); + XML_val, IS( std::min( (sal_Int32)25000, std::max( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND ); if( bHasFontDesc ) mpFS->singleElementNS( XML_a, XML_buFont, XML_typeface, OUStringToOString( aFontDesc.Name, RTL_TEXTENCODING_UTF8 ).getStr(), |