summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-01-22 06:20:18 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-01-29 08:09:55 +0100
commit06f4573a87d861c50c0017702aed75a389619b46 (patch)
treee5215e913e6c870f4fbe0c457923f760d59178f8
parent070bab44fb97e08f6e9b694b95c6924c3487cb37 (diff)
enable transparency again
Change-Id: I5c3464995f3ef6bfe6c4e6895fa9f73e801a31b5
-rw-r--r--chart2/source/view/main/DummyXShape.cxx4
-rwxr-xr-xchart2/source/view/main/OpenGLRender.cxx1
2 files changed, 1 insertions, 4 deletions
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 51b2bcca4a8f..6213d8d97fb7 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -354,14 +354,12 @@ void DummyPieSegment2D::render()
sal_Int32 nColor = itr->second.get<sal_Int32>();
pChart->m_GLRender.SetColor(nColor);
}
- /*
itr = maProperties.find(UNO_NAME_FILL_TRANSPARENCE);
if(itr != maProperties.end())
{
sal_Int32 transparency = itr->second.get<sal_Int32>();
- pChart->m_GLRender.SetTransparency(transparency&(0xFF));
+ pChart->m_GLRender.SetTransparency(255-(transparency&(0xFF)));
}
- */
float nSize = std::max<float>(maUnitCircleToScene.Line1.Column1, maUnitCircleToScene.Line2.Column2);
pChart->m_GLRender.RenderPieSegment2DShape(nSize, maUnitCircleToScene.Line1.Column4 + maOffset.DirectionX,
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index e570a9e972ca..980c074cda80 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1806,7 +1806,6 @@ int OpenGLRender::RenderPieSegment2DShape(float fSize, float fPosX, float fPosY)
CHECK_GL_ERROR();
}
- glEnable(GL_MULTISAMPLE);
m_fZStep += 0.01f;
CHECK_GL_ERROR();