mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to store these text objects separately.

Browse Source 
Change-Id: I0ee63480fa0f15f42c81818d89ff5b5a3407ece4
This commit is contained in:
Kohei Yoshida
2014-05-09 10:09:24 -04:00
parent 1d188294fd
commit aa26f8b6c7
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
chart2/source/view/charttypes/GL3DBarChart.cxx
View File

@@ -55,9 +55,6 @@ void GL3DBarChart::create3DShapes()
const float nBarDistanceY = nBarSizeY / 2; const float nBarDistanceY = nBarSizeY / 2;
sal_uInt32 nId = 1; sal_uInt32 nId = 1;
std::vector<opengl3D::Text*> aYAxisTexts;
float nYPos = 0.0; float nYPos = 0.0;
maShapes.clear(); maShapes.clear();
@@ -76,8 +73,8 @@ void GL3DBarChart::create3DShapes()
DataSeriesHelper::getDataSeriesLabel( DataSeriesHelper::getDataSeriesLabel(
rDataSeries.getModel(), mxChartType->getRoleOfSequenceForSeriesLabel()); rDataSeries.getModel(), mxChartType->getRoleOfSequenceForSeriesLabel());
aYAxisTexts.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName, nId++)); maShapes.push_back(new opengl3D::Text(mpRenderer.get(), aSeriesName, nId++));
opengl3D::Text* p = aYAxisTexts.back(); opengl3D::Text* p = static_cast<opengl3D::Text*>(&maShapes.back());
Size aTextSize = p->getSize(); Size aTextSize = p->getSize();
glm::vec3 aTopLeft, aTopRight, aBottomRight; glm::vec3 aTopLeft, aTopRight, aBottomRight;
aTopLeft.x = aTextSize.getWidth() * -1.0; aTopLeft.x = aTextSize.getWidth() * -1.0;
@@ -124,15 +121,6 @@ void GL3DBarChart::create3DShapes()
aBottomRight.y += aTextSize.getHeight(); aBottomRight.y += aTextSize.getHeight();
p->setPosition(aTopLeft, aTopRight, aBottomRight); p->setPosition(aTopLeft, aTopRight, aBottomRight);
} }
{
// Transfer all Y-axis text objects to the shape collection.
std::vector<opengl3D::Text*>::iterator itText = aYAxisTexts.begin(), itTextEnd = aYAxisTexts.end();
for (; itText != itTextEnd; ++itText)
maShapes.push_back(*itText);
}
aYAxisTexts.clear();
} }
void GL3DBarChart::render() void GL3DBarChart::render()