[Libreoffice-commits] core.git: oox/source

Caolán McNamara caolanm at redhat.com
Sun Dec 31 14:06:21 UTC 2017


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

New commits:
commit 1b0ef94e222019e78c77f40bdae17e74d83a2aaf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 31 14:05:29 2017 +0000

    try to fix android build
    
    Change-Id: I80c01fbf839c6980bc8dab40267d1407ca8e1398

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 62688e9b8d42..bb60a5697c57 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1991,7 +1991,7 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS
             {
                 Size aDestSize(64, 64);
                 float fBulletSizeRelX = fBulletSizeRel / aGraphicSize.Height * aGraphicSize.Width;
-                long nPaddingX = std::max(static_cast<long>(0), std::lround((aDestSize.Width() - fBulletSizeRelX * aDestSize.Width()) / 2.f));
+                long nPaddingX = std::max<long>(0, std::lround((aDestSize.Width() - fBulletSizeRelX * aDestSize.Width()) / 2.f));
                 long nPaddingY = std::lround((aDestSize.Height() - fBulletSizeRel * aDestSize.Height()) / 2.f);
                 tools::Rectangle aDestRect(nPaddingX, nPaddingY, aDestSize.Width() - nPaddingX, aDestSize.Height() - nPaddingY);
 


More information about the Libreoffice-commits mailing list