diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-20 13:56:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-20 13:59:13 +0100 |
| commit | f19b91445546223cb3eacaec2925e51171cb0c85 (patch) | |
| tree | ff51f8ff930ae139c89d8aca00934564245d6ad9 | |
| parent | d7374d4812316a79916956f03c8bd4a281fdbdec (diff) | |
WaE: -Werror=shadow and -Werror=unused-but-set-variable
Change-Id: Ic42d506db8fe065cb8f01e17f18a1238d1eff651
| -rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index f786c095cdcb..0d12c4f6185f 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -146,7 +146,7 @@ GL3DBarChart::GL3DBarChart( if (mpWindow) { mpWindow->setRenderer(this); - Size aSize = mpWindow->GetSizePixel(); + aSize = mpWindow->GetSizePixel(); } mpRenderer->SetSize(aSize); mpRenderer->init(); @@ -222,9 +222,9 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer float nXEnd = 0.0; float nYPos = 0.0; - const Color aSeriesColor[] = { - COL_RED, COL_GREEN, COL_YELLOW, COL_BROWN, COL_BLUE - }; + //const Color aSeriesColor[] = { + // COL_RED, COL_GREEN, COL_YELLOW, COL_BROWN, COL_BLUE + //}; maCategories.clear(); maSeriesNames.clear(); @@ -246,7 +246,7 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer sal_Int32 nPointCount = rDataSeries.getTotalPointCount(); nMaxPointCount = std::max(nMaxPointCount, nPointCount); - bool bMappedFillProperty = rDataSeries.hasPropertyMapping("FillColor"); + //bool bMappedFillProperty = rDataSeries.hasPropertyMapping("FillColor"); // Create series name text object. OUString aSeriesName = @@ -271,22 +271,22 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer p->setPosition(aTopLeft, aTopRight, aBottomRight); } - sal_Int32 nColor = aSeriesColor[nSeriesIndex % SAL_N_ELEMENTS(aSeriesColor)].GetColor(); + //sal_Int32 nColor = aSeriesColor[nSeriesIndex % SAL_N_ELEMENTS(aSeriesColor)].GetColor(); for(sal_Int32 nIndex = 0; nIndex < nPointCount; ++nIndex) { - if(bMappedFillProperty) - { - double nPropVal = rDataSeries.getValueByProperty(nIndex, "FillColor"); - if(!rtl::math::isNan(nPropVal)) - nColor = static_cast<sal_uInt32>(nPropVal); - } + //if(bMappedFillProperty) + //{ + // double nPropVal = rDataSeries.getValueByProperty(nIndex, "FillColor"); + // if(!rtl::math::isNan(nPropVal)) + // nColor = static_cast<sal_uInt32>(nPropVal); + //} float nVal = rDataSeries.getYValue(nIndex); float nXPos = nIndex * (BAR_SIZE_X + BAR_DISTANCE_X) + BAR_DISTANCE_X; - glm::mat4 aScaleMatrix = glm::scale(glm::vec3(BAR_SIZE_X, BAR_SIZE_Y, float(nVal/nMaxVal))); - glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(nXPos, nYPos, 0.0f)); - glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix; + //glm::mat4 aScaleMatrix = glm::scale(glm::vec3(BAR_SIZE_X, BAR_SIZE_Y, float(nVal/nMaxVal))); + //glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(nXPos, nYPos, 0.0f)); + //glm::mat4 aBarPosition = aTranslationMatrix * aScaleMatrix; maBarMap.insert(std::pair<sal_uInt32, BarInformation>(nId, BarInformation(glm::vec3(nXPos, nYPos, float(nVal/nMaxVal)), |