[Libreoffice-commits] .: Branch 'libreoffice-3-5' - hwpfilter/source

Petr Mladek pmladek at kemper.freedesktop.org
Wed Aug 8 05:50:58 PDT 2012


 hwpfilter/source/hwpreader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fca6d16394bdf11bfcc55d67e40f28f619e5e5ba
Author: Andras Timar <atimar at suse.com>
Date:   Wed Aug 8 10:27:00 2012 +0200

    Fix windows build where min and max are macros
    
    Change-Id: I265e0fddc12a40cff0b6a6172bfca96eda0842ec
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 318d4f8..056495d 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -4347,7 +4347,7 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
 
                     if ((drawobj->u.freeform.npt > 2) &&
                         (static_cast<size_t>(drawobj->u.freeform.npt) <
-                         (::std::numeric_limits<int>::max() / sizeof(double))))
+                         ((::std::numeric_limits<int>::max)() / sizeof(double))))
                     {
                               int n, i;
                               if( bIsNatural == sal_True )


More information about the Libreoffice-commits mailing list