summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-18 12:38:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-19 09:17:06 +0200
commitfd00bd0f69676659bb43bcc85d8ad5fd21e5de4c (patch)
treef9d62fef7f508f430efd72c85b0d0cf6a67da3be /canvas
parent8a01fc2f505acc6ed9af5ba18049131225baad30 (diff)
loplugin:unusedfields
make it a little smarter in dealing with fields that are smart pointers Change-Id: I44072105170882dc29fb19558f1065cffc7e5f11 Reviewed-on: https://gerrit.libreoffice.org/37751 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_canvas.cxx7
-rw-r--r--canvas/source/cairo/cairo_canvas.hxx1
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.cxx7
-rw-r--r--canvas/source/cairo/cairo_spritecanvas.hxx1
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.cxx7
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.hxx1
-rw-r--r--canvas/source/vcl/canvas.cxx7
-rw-r--r--canvas/source/vcl/canvas.hxx1
-rw-r--r--canvas/source/vcl/spritecanvas.cxx7
-rw-r--r--canvas/source/vcl/spritecanvas.hxx1
10 files changed, 10 insertions, 30 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index b3f403927f69..bb0ce960be74 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -43,9 +43,8 @@ using namespace ::com::sun::star;
namespace cairocanvas
{
Canvas::Canvas( const uno::Sequence< uno::Any >& aArguments,
- const uno::Reference< uno::XComponentContext >& rxContext ) :
- maArguments(aArguments),
- mxComponentContext( rxContext )
+ const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+ maArguments(aArguments)
{
}
@@ -115,8 +114,6 @@ namespace cairocanvas
{
::osl::MutexGuard aGuard( m_aMutex );
- mxComponentContext.clear();
-
// forward to parent
CanvasBaseT::disposeThis();
}
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 4f32368dcd79..3a5ec2cd0aa9 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -140,7 +140,6 @@ namespace cairocanvas
private:
css::uno::Sequence< css::uno::Any > maArguments;
- css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
};
typedef ::rtl::Reference< Canvas > CanvasRef;
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 3370a9513b9f..a2f9ad10b010 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -41,9 +41,8 @@ using namespace ::com::sun::star;
namespace cairocanvas
{
SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments,
- const uno::Reference< uno::XComponentContext >& rxContext ) :
- maArguments(aArguments),
- mxComponentContext( rxContext )
+ const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+ maArguments(aArguments)
{
}
@@ -109,8 +108,6 @@ namespace cairocanvas
{
::osl::MutexGuard aGuard( m_aMutex );
- mxComponentContext.clear();
-
// forward to parent
SpriteCanvasBaseT::disposeThis();
}
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index ee0b14d9e654..a26701fea02e 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -151,7 +151,6 @@ namespace cairocanvas
private:
css::uno::Sequence< css::uno::Any > maArguments;
- css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
};
typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef;
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index 17ae212764b7..1da1a464281f 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -34,9 +34,8 @@ namespace sdecl = comphelper::service_decl;
namespace oglcanvas
{
SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments,
- const uno::Reference< uno::XComponentContext >& rxContext ) :
- maArguments(aArguments),
- mxComponentContext( rxContext )
+ const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+ maArguments(aArguments)
{
}
@@ -82,8 +81,6 @@ namespace oglcanvas
{
::osl::MutexGuard aGuard( m_aMutex );
- mxComponentContext.clear();
-
// forward to parent
SpriteCanvasBaseT::disposeThis();
}
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index 202370bfd844..66c3383bc1da 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -107,7 +107,6 @@ namespace oglcanvas
private:
css::uno::Sequence< css::uno::Any > maArguments;
- css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
};
typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef;
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 0a413a5398a4..90826d253c5c 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -65,9 +65,8 @@ namespace vclcanvas
}
Canvas::Canvas( const uno::Sequence< uno::Any >& aArguments,
- const uno::Reference< uno::XComponentContext >& rxContext ) :
- maArguments(aArguments),
- mxComponentContext( rxContext )
+ const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+ maArguments(aArguments)
{
}
@@ -121,8 +120,6 @@ namespace vclcanvas
{
SolarMutexGuard aGuard;
- mxComponentContext.clear();
-
// forward to parent
CanvasBaseT::disposeThis();
}
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 225ca2a7f1f4..6ce9b5e193b6 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -112,7 +112,6 @@ namespace vclcanvas
private:
css::uno::Sequence< css::uno::Any > maArguments;
- css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
};
typedef ::rtl::Reference< Canvas > CanvasRef;
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index 11a6ca5e27c1..5ef69d2c24e8 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -42,9 +42,8 @@ using namespace ::com::sun::star;
namespace vclcanvas
{
SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments,
- const uno::Reference< uno::XComponentContext >& rxContext ) :
- maArguments(aArguments),
- mxComponentContext( rxContext )
+ const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+ maArguments(aArguments)
{
}
@@ -113,8 +112,6 @@ namespace vclcanvas
{
SolarMutexGuard aGuard;
- mxComponentContext.clear();
-
// forward to parent
SpriteCanvasBaseT::disposeThis();
}
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index b6f2bd5c6db8..1d59b39adb8b 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -149,7 +149,6 @@ namespace vclcanvas
private:
css::uno::Sequence< css::uno::Any > maArguments;
- css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
};
typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef;