[Libreoffice-commits] core.git: 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 030a9bfd42184c868bcc61b91af58f70b1c02677
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Mar 17 09:39:27 2014 +0100

    fix another wrong transparency calculation
    
    Change-Id: I963e6c69f34f07f797dd98810195fd58e79e494f

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 9f79dd3..e0b5f21 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -741,7 +741,7 @@ void DummyRectangle::render()
         if(itr != maProperties.end())
         {
             uno::Any al = itr->second;
-            nAlpha = al.get<sal_Int32>();
+            nAlpha = 255 - al.get<sal_Int32>()/100.0*255;
         }
         pChart->m_GLRender.SetBackGroundColor(nColorValue, nColorValue, nAlpha);
     }
commit 217731165a0d8ee512919dcb9ecec296c6ee4b4c
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Mon Mar 17 09:36:52 2014 +0100

    fix rendering of invisible bubble
    
    Change-Id: Iee14035b44ef808cca2ee426684733f20c1771ac

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 72c2139..9f79dd3 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -546,8 +546,11 @@ void DummyCircle::render()
     std::map<OUString, uno::Any>::const_iterator itr = maProperties.find("FillTransparence");
     if(itr != maProperties.end())
     {
-        sal_Int32 nTrans = itr->second.get<sal_Int32>();
+        sal_Int32 nTrans = itr->second.get<sal_Int32>()/100.0*255;
         nAlpha = 255 - static_cast<sal_uInt8>(nTrans & 0xFF);
+
+        if(nAlpha == 0)
+            return;
     }
 
     itr = maProperties.find("FillColor");