diff options
| author | Noel Grandin <noel@peralex.com> | 2013-04-26 13:41:29 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-30 06:29:35 +0000 |
| commit | 3872be543252a30d020e35233415c5fccc0ea806 (patch) | |
| tree | a049ecaa735a1dd42c18aef9bb948ec396f939b8 /drawinglayer/source/primitive3d | |
| parent | d6d896a121c0bab3ac27fafa5a4e810e48ec96c6 (diff) | |
Clang cleanup, unused mutex variables
Some of these were doing nothing useful at all. I removed those.
A couple were protecting static data, and I fixed those to use Mutex
and MutexGuard properly.
Change-Id: I444d13f8b6c50e526cce8d69d09aeaf240e5c6ca
Reviewed-on: https://gerrit.libreoffice.org/3678
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'drawinglayer/source/primitive3d')
3 files changed, 2 insertions, 5 deletions
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 77487db04db8..495c06f303dd 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -42,9 +42,10 @@ namespace drawinglayer static Primitive3DSequence aLineTubeList; static sal_uInt32 nLineTubeSegments(0L); static attribute::MaterialAttribute3D aLineMaterial; + static ::osl::Mutex aMutex; // may exclusively change static data, use mutex - ::osl::Mutex m_mutex; + ::osl::MutexGuard aGuard(aMutex); if(nSegments != nLineTubeSegments || !(rMaterial == aLineMaterial)) { diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index a488ad06dc48..198710299dcd 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -377,7 +377,6 @@ namespace drawinglayer // again when no longer geometry is needed for non-visible 3D objects as it is now for chart if(getPolyPolygon().count() && !maSlices.size()) { - ::osl::Mutex m_mutex; const_cast< SdrExtrudePrimitive3D& >(*this).impCreateSlices(); } @@ -493,7 +492,6 @@ namespace drawinglayer { // conditions of last local decomposition with reduced lines have changed. Remember // new one and clear current decompositiopn - ::osl::Mutex m_mutex; SdrExtrudePrimitive3D* pThat = const_cast< SdrExtrudePrimitive3D* >(this); pThat->setBuffered3DDecomposition(Primitive3DSequence()); delete pThat->mpLastRLGViewInformation; diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index 78825bdf35d7..33e39b148e6a 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -233,7 +233,6 @@ namespace drawinglayer // again when no longer geometry is needed for non-visible 3D objects as it is now for chart if(getPolyPolygon().count() && !maSlices.size()) { - ::osl::Mutex m_mutex; const_cast< SdrLathePrimitive3D& >(*this).impCreateSlices(); } @@ -355,7 +354,6 @@ namespace drawinglayer { // conditions of last local decomposition with reduced lines have changed. Remember // new one and clear current decompositiopn - ::osl::Mutex m_mutex; SdrLathePrimitive3D* pThat = const_cast< SdrLathePrimitive3D* >(this); pThat->setBuffered3DDecomposition(Primitive3DSequence()); delete pThat->mpLastRLGViewInformation; |