[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source

[Muthu Subramanian]

 oox/source/export/drawingml.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4d59251a4ef911d794c4d01edbec64310fc8676
Author: Muthu Subramanian <sumuthu at collabora.com>
Date:   Thu Dec 19 16:48:20 2013 +0530

    n#828390: Bullet sizes set wrong.
    
    (cherry picked from commit e5cd547846663c69bd66aa1ba94e3b4dcce30a89)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 75bfc56..a8c5741 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1118,7 +1118,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa
                     } else {
                         if( nBulletRelSize && nBulletRelSize != 100 )
                             mpFS->singleElementNS( XML_a, XML_buSzPct,
-                                                   XML_val, IS( std::min( (sal_Int32)25000, std::max( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND );
+                                                   XML_val, IS( std::max( (sal_Int32)25000, std::min( (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(),