diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-06 20:42:22 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-07 10:56:36 +0000 |
commit | d1a9c73ea16f5b4838f639ce2bb2226d9b9b334a (patch) | |
tree | 1fbc59474ab27dbb4c7e53e50911f8df2cd2c054 /include/canvas | |
parent | a6149bc0aa25dfbe963466a3a02c3d1ac18d75a1 (diff) |
tdf#88206 replace cppu::WeakImplHelper* misc
also edited two examples in canvas comments
Change-Id: Iac82b462168f869f995c33bb2c639f3dbe09cbd5
Reviewed-on: https://gerrit.libreoffice.org/31715
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/canvas')
-rw-r--r-- | include/canvas/base/cachedprimitivebase.hxx | 6 | ||||
-rw-r--r-- | include/canvas/base/canvasbase.hxx | 8 | ||||
-rw-r--r-- | include/canvas/base/graphicdevicebase.hxx | 8 | ||||
-rw-r--r-- | include/canvas/parametricpolypolygon.hxx | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx index 6b25a1564c2d..8fb1ac04639c 100644 --- a/include/canvas/base/cachedprimitivebase.hxx +++ b/include/canvas/base/cachedprimitivebase.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCachedPrimitive.hpp> #include <com/sun/star/rendering/ViewState.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <canvas/canvastoolsdllapi.h> @@ -34,8 +34,8 @@ namespace canvas { - typedef ::cppu::WeakComponentImplHelper2< css::rendering::XCachedPrimitive, - css::lang::XServiceInfo > CachedPrimitiveBase_Base; + typedef cppu::WeakComponentImplHelper< css::rendering::XCachedPrimitive, + css::lang::XServiceInfo > CachedPrimitiveBase_Base; /** Base class, providing common functionality for implementers of the XCachedPrimitive interface. diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 5713831c3fea..cf30aabc8c6a 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -47,7 +47,7 @@ namespace canvas <pre> Example: - typedef ::cppu::WeakComponentImplHelper4< css::rendering::XSpriteCanvas, + typedef ::cppu::WeakComponentImplHelper < css::rendering::XSpriteCanvas, css::lang::XInitialization, css::lang::XServiceInfo, css::lang::XServiceName > CanvasBase_Base; @@ -61,12 +61,12 @@ namespace canvas </pre> @tpl Base - Base class to use, most probably one of the - WeakComponentImplHelperN templates with the appropriate + Base class to use, most probably the + WeakComponentImplHelper template with the appropriate interfaces. At least XCanvas should be among them (why else would you use this template, then?). Base class must have an Base( const Mutex& ) constructor (like the - WeakComponentImplHelperN templates have). As the very least, + WeakComponentImplHelper template has). As the very least, the base class must be derived from uno::XInterface, as some error reporting mechanisms rely on that. diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index df291175746a..28c208a1d296 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -57,7 +57,7 @@ namespace canvas <pre> Example: - typedef ::cppu::WeakComponentImplHelper5< css::rendering::XGraphicDevice, + typedef ::cppu::WeakComponentImplHelper < css::rendering::XGraphicDevice, css::rendering::XColorSpace, css::rendering::XPropertySet, css::lang::XServiceInfo, @@ -70,12 +70,12 @@ namespace canvas </pre> @tpl Base - Base class to use, most probably one of the - WeakComponentImplHelperN templates with the appropriate + Base class to use, most probably the + WeakComponentImplHelper template with the appropriate interfaces. At least XGraphicDevice should be among them (why else would you use this template, then?). Base class must have an Base( const Mutex& ) constructor (like the - WeakComponentImplHelperN templates have). As the very least, + WeakComponentImplHelper template has). As the very least, the base class must be derived from uno::XInterface, as some error reporting mechanisms rely on that. diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx index 598a010e9c90..10b563eb62fd 100644 --- a/include/canvas/parametricpolypolygon.hxx +++ b/include/canvas/parametricpolypolygon.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -40,8 +40,8 @@ namespace basegfx namespace canvas { - typedef ::cppu::WeakComponentImplHelper2< css::rendering::XParametricPolyPolygon2D, - css::lang::XServiceInfo > ParametricPolyPolygon_Base; + typedef cppu::WeakComponentImplHelper< css::rendering::XParametricPolyPolygon2D, + css::lang::XServiceInfo > ParametricPolyPolygon_Base; class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex, public ParametricPolyPolygon_Base |