oox/source/export/drawingml.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 46d2e0023360f0e69514ad039b05796a222bc3cc
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Nov 19 21:11:47 2012 +0200
no matching function for call to 'max(int, long int)'
Change-Id: I7533098781b0b6987cd852d74a688aac6e0af056
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 58decbd..07d0172 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(),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
