diff options
| author | Peilin <peilin@multicorewareinc.com> | 2014-01-15 16:07:26 +0800 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-29 08:09:49 +0100 |
| commit | 8aad6d47fa81edfc427dd3b4c4ffe8b28aad5d20 (patch) | |
| tree | c99ecd2edfd8401b16c382f7883bf577021bca05 | |
| parent | 240a2b05c576945794a01365b06fe05023d48318 (diff) | |
modify the color property and adjust bitmap pos&size
Change-Id: I487d2b12acda6fe25913d2488110afc63ba1e37e
| -rw-r--r-- | chart2/source/view/main/DummyXShape.cxx | 2 | ||||
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index b1d446b927a7..eea1f584f615 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -447,7 +447,7 @@ void setProperties( const VLineProperties& rLineProperties, std::map<OUString, u //LineColor if(rLineProperties.Color.hasValue()) rTargetProps.insert(std::pair<OUString, uno::Any>( - UNO_NAME_LINECOLOR, rLineProperties.Transparence)); + UNO_NAME_LINECOLOR, rLineProperties.Color)); //LineDashName if(rLineProperties.DashName.hasValue()) diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 95594983f559..9bd3e49fe2e4 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -525,7 +525,7 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow) BitmapEx OpenGLRender::GetAsBitmap() { boost::scoped_array<sal_uInt8> buf(new sal_uInt8[m_iWidth * m_iHeight * 4]); - glReadPixels(0, 0, m_iWidth, m_iHeight, GL_RGBA, GL_UNSIGNED_BYTE, buf.get()); + glReadPixels(0, 0, m_iWidth, m_iHeight, GL_BGRA, GL_UNSIGNED_BYTE, buf.get()); Bitmap aBitmap( Size(m_iWidth, m_iHeight), 24 ); AlphaMask aAlpha( Size(m_iWidth, m_iHeight) ); |