summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-11-19 21:11:47 +0200
committerPetr Mladek <pmladek@suse.cz>2012-11-22 10:29:20 +0100
commit46d2e0023360f0e69514ad039b05796a222bc3cc (patch)
treec2080d03c41e94d5f8d2d2f09c7f57869e3c64ce
parent274f3085ff15657d23dec7b9a1aa01fdfad6846c (diff)
no matching function for call to 'max(int, long int)'
Change-Id: I7533098781b0b6987cd852d74a688aac6e0af056
-rw-r--r--oox/source/export/drawingml.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 58decbd92681..07d0172cb8cb 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1084,7 +1084,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(),