summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-07-23 23:12:08 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-07-24 02:04:40 +0200
commitbaaa55f5f7fc04713eb3ad2c9dd7b437dfab3074 (patch)
tree6721abf16d2ff0bde40b3272daaad9ab47671659
parent71ebaba4d283daa8a4b626f8fe1e7ff9c0e5598e (diff)
we don't need blocking user input anymore with the threaded rendering
Change-Id: I9cde4c5629f2970b9c24d98897580a2442661bc2
-rw-r--r--chart2/source/view/charttypes/GL3DBarChart.cxx10
-rw-r--r--chart2/source/view/inc/GL3DBarChart.hxx1
2 files changed, 0 insertions, 11 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 51b1297660e9..ebd77693add2 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -196,7 +196,6 @@ GL3DBarChart::GL3DBarChart(
mnMaxY(0),
mnDistance(0.0),
mnCornerId(0),
- mbBlockUserInput(false),
mbNeedsNewRender(true),
mbCameraInit(false),
mbRenderDie(false)
@@ -535,9 +534,6 @@ void GL3DBarChart::moveToDefault()
void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 nButtons)
{
- if(mbBlockUserInput)
- return;
-
if (nButtons == MOUSE_RIGHT)
{
moveToDefault();
@@ -567,8 +563,6 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 nButtons)
if(itr == maBarMap.end())
return;
- mbBlockUserInput = true;
-
const BarInformation& rBarInfo = itr->second;
maShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), *mpTextCache,
@@ -607,10 +601,6 @@ void GL3DBarChart::render()
void GL3DBarChart::mouseDragMove(const Point& rStartPos, const Point& rEndPos, sal_uInt16 )
{
- if(mbBlockUserInput)
- return;
-
- mbBlockUserInput = true;
long direction = rEndPos.X() - rStartPos.X();
if(direction < 0)
{
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index fcc7908b24ad..6066c6e400ef 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -113,7 +113,6 @@ private:
};
std::map<sal_uInt32, const BarInformation> maBarMap;
- bool mbBlockUserInput;
bool mbNeedsNewRender;
bool mbCameraInit;