diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-23 22:54:00 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-23 22:58:10 +0200 |
commit | 453aeef36c8455ecbb5ef4e58109b4610d5ba243 (patch) | |
tree | ff8a61addcb74844c309dbd627709e25b295278f /chart2/source | |
parent | 96f373e26ca4632c15dfcb30b14d92714c484313 (diff) |
avoid deadlocks in BENCHMARK_MODE
Change-Id: I1f994ecb6efbd302430062421ccc953dee904741
Diffstat (limited to 'chart2/source')
-rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index e3aef22c79e1..16ace2395fcb 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -509,6 +509,12 @@ public: void GL3DBarChart::moveToDefault() { + if(BENCH_MARK_MODE) + { + // add correct handling here!! + return; + } + if(mpRenderThread.is()) mpRenderThread->join(); @@ -540,6 +546,12 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 nButtons) if(nButtons != MOUSE_LEFT) return; + if (BENCH_MARK_MODE) + { + // add correct handling here !! + return; + } + sal_uInt32 nId = 5; { PickingModeSetter aPickingModeSetter(mpRenderer.get()); @@ -592,6 +604,7 @@ void GL3DBarChart::render() { if (BENCH_MARK_MODE) return; + osl::MutexGuard aGuard(maMutex); update(); } @@ -650,6 +663,12 @@ glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId) void GL3DBarChart::moveToCorner() { + if(BENCH_MARK_MODE) + { + // add correct handling here!! + return; + } + osl::MutexGuard aGuard(maMutex); if(mpRenderThread.is()) mpRenderThread->join(); |