canvas: remove useless MutexGuards

Change-Id: I7a6f55ad7f3a26a88263660b97dd8650858890f8
Reviewed-on: https://gerrit.libreoffice.org/31859
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 0 insertions, 110 deletions

diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx
index 00f023a1f01a..3206e2c31a3c 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.cxx
@@ -115,24 +115,18 @@ namespace cairocanvas
 
     rendering::FontMetrics SAL_CALL  CanvasFont::getFontMetrics(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return rendering::FontMetrics();
     }
 
     uno::Sequence< double > SAL_CALL  CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return uno::Sequence< double >();
     }
 
     uno::Sequence< beans::PropertyValue > SAL_CALL  CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return uno::Sequence< beans::PropertyValue >();
     }
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 7ace9c75229b..24efd369e062 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -109,24 +109,18 @@ namespace cairocanvas
     // XTextLayout
     uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
     }
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
@@ -190,8 +184,6 @@ namespace cairocanvas
 
     double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
@@ -199,16 +191,12 @@ namespace cairocanvas
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
                                                  double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
 
     rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::TextHit();
     }
@@ -216,8 +204,6 @@ namespace cairocanvas
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
                                                     sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::Caret();
     }
@@ -226,8 +212,6 @@ namespace cairocanvas
                                                           sal_Int32 /*nCaretAdvancement*/,
                                                           sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0;
     }
@@ -235,8 +219,6 @@ namespace cairocanvas
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
@@ -244,16 +226,12 @@ namespace cairocanvas
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
                                                                                                sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
     double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index 1d07d474d601..84fa7181ef62 100644
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.cxx
@@ -58,24 +58,18 @@ namespace dxcanvas
     // XTextLayout
     uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
     }
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
@@ -120,8 +114,6 @@ namespace dxcanvas
 
     double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
@@ -129,16 +121,12 @@ namespace dxcanvas
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
                                                  double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
 
     rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::TextHit();
     }
@@ -146,8 +134,6 @@ namespace dxcanvas
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
                                                     sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::Caret();
     }
@@ -156,8 +142,6 @@ namespace dxcanvas
                                                           sal_Int32 /*nCaretAdvancement*/,
                                                           sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0;
     }
@@ -165,8 +149,6 @@ namespace dxcanvas
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
@@ -174,16 +156,12 @@ namespace dxcanvas
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
                                                                                                sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
     double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx
index f2a4bcc92cf8..e129a5c9e890 100644
--- a/canvas/source/opengl/ogl_canvasfont.cxx
+++ b/canvas/source/opengl/ogl_canvasfont.cxx
@@ -29,11 +29,6 @@ namespace oglcanvas
     {
     }
 
-    void SAL_CALL CanvasFont::disposing()
-    {
-        ::osl::MutexGuard aGuard( m_aMutex );
-    }
-
     uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText,
                                                                                     sal_Int8                        nDirection,
                                                                                     sal_Int64                       nRandomSeed ) throw (uno::RuntimeException, std::exception)
@@ -45,16 +40,12 @@ namespace oglcanvas
 
     uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< double >();
     }
 
     uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< beans::PropertyValue >();
     }
@@ -68,8 +59,6 @@ namespace oglcanvas
 
     rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::FontMetrics();
     }
diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx
index 3d9c1fe343e9..9aca57f7044a 100644
--- a/canvas/source/opengl/ogl_canvasfont.hxx
+++ b/canvas/source/opengl/ogl_canvasfont.hxx
@@ -41,9 +41,6 @@ namespace oglcanvas
                     const css::uno::Sequence< css::beans::PropertyValue >&    extraFontProperties,
                     const css::geometry::Matrix2D&                                         fontMatrix );
 
-        /// Dispose all internal references
-        virtual void SAL_CALL disposing() override;
-
         // XCanvasFont
         virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override;
         virtual css::rendering::FontRequest SAL_CALL getFontRequest(  ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index 4b470f3ab341..c11815033586 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -39,24 +39,18 @@ namespace oglcanvas
     // XTextLayout
     uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >();
     }
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Sequence< geometry::RealRectangle2D >();
     }
@@ -109,8 +103,6 @@ namespace oglcanvas
 
     double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
@@ -118,16 +110,12 @@ namespace oglcanvas
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/,
                                                  double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
 
     rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::TextHit();
     }
@@ -135,8 +123,6 @@ namespace oglcanvas
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/,
                                                     sal_Bool  /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return rendering::Caret();
     }
@@ -145,8 +131,6 @@ namespace oglcanvas
                                                           sal_Int32 /*nCaretAdvancement*/,
                                                           sal_Bool  /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0;
     }
@@ -154,8 +138,6 @@ namespace oglcanvas
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/,
                                                                                               sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
@@ -163,16 +145,12 @@ namespace oglcanvas
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/,
                                                                                                sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return uno::Reference< rendering::XPolyPolygon2D >();
     }
 
     double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException, std::exception)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
         return 0.0;
     }
@@ -202,8 +180,6 @@ namespace oglcanvas
                            const rendering::RenderState&                        /*rRenderState*/,
                            const uno::Reference< rendering::XGraphicDevice >&   /*xGraphicDevice*/ ) const
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
         // TODO
 
         return true;
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 06d4ea8d2392..da901cce4d97 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -135,16 +135,12 @@ namespace vclcanvas
 
     uno::Sequence< double > SAL_CALL  CanvasFont::getAvailableSizes(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return uno::Sequence< double >();
     }
 
     uno::Sequence< beans::PropertyValue > SAL_CALL  CanvasFont::getExtraFontProperties(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return uno::Sequence< beans::PropertyValue >();
     }
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index d179ba33a63d..089af45d4913 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -205,8 +205,6 @@ namespace vclcanvas
 
     uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return uno::Sequence< geometry::RealRectangle2D >();
     }
@@ -268,8 +266,6 @@ namespace vclcanvas
 
     double SAL_CALL TextLayout::justify( double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)nSize;
 
         // TODO(F1)
@@ -279,8 +275,6 @@ namespace vclcanvas
     double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts,
                                                  double                                                           nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)aNextLayouts;
         (void)nSize;
 
@@ -290,8 +284,6 @@ namespace vclcanvas
 
     rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)aHitPoint;
 
         // TODO(F1)
@@ -300,8 +292,6 @@ namespace vclcanvas
 
     rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)nInsertionIndex;
         (void)bExcludeLigatures;
 
@@ -311,8 +301,6 @@ namespace vclcanvas
 
     sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)nStartIndex;
         (void)nCaretAdvancement;
         (void)bExcludeLigatures;
@@ -323,8 +311,6 @@ namespace vclcanvas
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)nStartIndex;
         (void)nEndIndex;
 
@@ -334,8 +320,6 @@ namespace vclcanvas
 
     uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         (void)nStartIndex;
         (void)nEndIndex;
 
@@ -345,8 +329,6 @@ namespace vclcanvas
 
     double SAL_CALL TextLayout::getBaselineOffset(  ) throw (uno::RuntimeException, std::exception)
     {
-        SolarMutexGuard aGuard;
-
         // TODO(F1)
         return 0.0;
     }