summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-01-01 22:10:17 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-01-29 08:09:26 +0100
commite48cf6cd50051cae5c029138bbab736c6a22ad27 (patch)
tree271178feec4cc763016ba0e8b57e5d30be75533f /chart2
parent53974db1db1fccac4ca89027f48ee42f8f35fc38 (diff)
add color to bubbles
Change-Id: Id851916a160b65360ee0dd4bbe67b5246067b659
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/main/DummyXShape.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index ec1d19381d35..c11e57d5f06b 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -372,9 +372,16 @@ DummyCircle::DummyCircle(const awt::Point& rPos, const awt::Size& rSize)
void DummyCircle::render()
{
debugProperties(maProperties);
+ std::map<OUString, uno::Any> itr = maProperties.find("FillColor");
+ if(itr != maProperties.end())
+ {
+ sal_Int32 nColor = itr->second.get<sal_Int32>();
+ pChart->m_GLRender.SetColor(nColor);
+ }
+ else
+ SAL_WARN("chart2.opengl", "missing color");
long color = 0x3465AF;
DummyChart* pChart = getRootShape();
- pChart->m_GLRender.SetColor(color);
pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
maSize.Width, maSize.Height);
pChart->m_GLRender.RenderBubble2FBO(GL_TRUE);