mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#88206 replace cppu::WeakImplHelper* misc

Browse Source 
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>
This commit is contained in:
Jochen Nitschke
2016-12-06 20:42:22 +01:00
committed by Stephan Bergmann
parent a6149bc0aa
commit d1a9c73ea1
14 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
comphelper/qa/container/comphelper_ifcontainer.cxx
View File

@@ -27,7 +27,7 @@
#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XEventListener.hpp>
#include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx> #include <cppuhelper/propshlp.hxx>
using namespace com::sun::star; using namespace com::sun::star;
@@ -40,7 +40,7 @@ struct ContainerStats {
ContainerStats() : m_nAlive(0), m_nDisposed(0) {} ContainerStats() : m_nAlive(0), m_nDisposed(0) {}
}; };
class ContainerListener : public ::cppu::WeakImplHelper1< XEventListener > class ContainerListener : public cppu::WeakImplHelper< XEventListener >
{ {
ContainerStats *m_pStats; ContainerStats *m_pStats;
public: public:

4
comphelper/qa/container/testifcontainer.cxx
View File

@@ -23,7 +23,7 @@
#include "cppunit/plugin/TestPlugIn.h" #include "cppunit/plugin/TestPlugIn.h"
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XVetoableChangeListener.hpp> #include <com/sun/star/beans/XVetoableChangeListener.hpp>
using namespace ::osl; using namespace ::osl;
@@ -44,7 +44,7 @@ public:
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
}; };
class TestListener : public cppu::WeakImplHelper1< XVetoableChangeListener > class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener >
{ {
public: public:
// Methods // Methods

4
include/basegfx/tools/unopolypolygon.hxx
View File

@@ -21,7 +21,7 @@
#define INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX #define INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/FillRule.hpp> #include <com/sun/star/rendering/FillRule.hpp>
#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp> #include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
@@ -33,7 +33,7 @@ namespace basegfx
{ {
namespace unotools namespace unotools
{ {
typedef ::cppu::WeakComponentImplHelper3< typedef cppu::WeakComponentImplHelper<
css::rendering::XLinePolyPolygon2D, css::rendering::XLinePolyPolygon2D,
css::rendering::XBezierPolyPolygon2D, css::rendering::XBezierPolyPolygon2D,
css::lang::XServiceInfo > UnoPolyPolygonBase; css::lang::XServiceInfo > UnoPolyPolygonBase;

4
include/basic/modsizeexceeded.hxx
View File

@@ -21,11 +21,11 @@
#define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX #define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
#include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionHandler.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <basic/basicdllapi.h> #include <basic/basicdllapi.h>
#include <vector> #include <vector>
class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< css::task::XInteractionRequest > class BASIC_DLLPUBLIC ModuleSizeExceeded : public cppu::WeakImplHelper< css::task::XInteractionRequest >
{ {
// C++ interface // C++ interface
public: public:

4
include/canvas/base/cachedprimitivebase.hxx
View File

@@ -25,7 +25,7 @@
#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XCachedPrimitive.hpp> #include <com/sun/star/rendering/XCachedPrimitive.hpp>
#include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/rendering/ViewState.hpp>
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <canvas/canvastoolsdllapi.h> #include <canvas/canvastoolsdllapi.h>
@@ -34,7 +34,7 @@
namespace canvas namespace canvas
{ {
typedef ::cppu::WeakComponentImplHelper2< css::rendering::XCachedPrimitive, typedef cppu::WeakComponentImplHelper< css::rendering::XCachedPrimitive,
css::lang::XServiceInfo > CachedPrimitiveBase_Base; css::lang::XServiceInfo > CachedPrimitiveBase_Base;
/** Base class, providing common functionality for implementers of /** Base class, providing common functionality for implementers of

8
include/canvas/base/canvasbase.hxx
View File

@@ -47,7 +47,7 @@ namespace canvas
<pre> <pre>
Example: Example:
typedef ::cppu::WeakComponentImplHelper4< css::rendering::XSpriteCanvas, typedef ::cppu::WeakComponentImplHelper < css::rendering::XSpriteCanvas,
css::lang::XInitialization, css::lang::XInitialization,
css::lang::XServiceInfo, css::lang::XServiceInfo,
css::lang::XServiceName > CanvasBase_Base; css::lang::XServiceName > CanvasBase_Base;
@@ -61,12 +61,12 @@ namespace canvas
</pre> </pre>
@tpl Base @tpl Base
Base class to use, most probably one of the Base class to use, most probably the
WeakComponentImplHelperN templates with the appropriate WeakComponentImplHelper template with the appropriate
interfaces. At least XCanvas should be among them (why else interfaces. At least XCanvas should be among them (why else
would you use this template, then?). Base class must have an would you use this template, then?). Base class must have an
Base( const Mutex& ) constructor (like the 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 the base class must be derived from uno::XInterface, as some
error reporting mechanisms rely on that. error reporting mechanisms rely on that.

8
include/canvas/base/graphicdevicebase.hxx
View File

@@ -57,7 +57,7 @@ namespace canvas
<pre> <pre>
Example: Example:
typedef ::cppu::WeakComponentImplHelper5< css::rendering::XGraphicDevice, typedef ::cppu::WeakComponentImplHelper < css::rendering::XGraphicDevice,
css::rendering::XColorSpace, css::rendering::XColorSpace,
css::rendering::XPropertySet, css::rendering::XPropertySet,
css::lang::XServiceInfo, css::lang::XServiceInfo,
@@ -70,12 +70,12 @@ namespace canvas
</pre> </pre>
@tpl Base @tpl Base
Base class to use, most probably one of the Base class to use, most probably the
WeakComponentImplHelperN templates with the appropriate WeakComponentImplHelper template with the appropriate
interfaces. At least XGraphicDevice should be among them (why else interfaces. At least XGraphicDevice should be among them (why else
would you use this template, then?). Base class must have an would you use this template, then?). Base class must have an
Base( const Mutex& ) constructor (like the 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 the base class must be derived from uno::XInterface, as some
error reporting mechanisms rely on that. error reporting mechanisms rely on that.

4
include/canvas/parametricpolypolygon.hxx
View File

@@ -23,7 +23,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp> #include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp>
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
@@ -40,7 +40,7 @@ namespace basegfx
namespace canvas namespace canvas
{ {
typedef ::cppu::WeakComponentImplHelper2< css::rendering::XParametricPolyPolygon2D, typedef cppu::WeakComponentImplHelper< css::rendering::XParametricPolyPolygon2D,
css::lang::XServiceInfo > ParametricPolyPolygon_Base; css::lang::XServiceInfo > ParametricPolyPolygon_Base;
class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex, class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex,

4
include/connectivity/sdbcx/VTypeDef.hxx
View File

@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XNamed.hpp>
@@ -29,7 +29,7 @@ namespace connectivity
{ {
namespace sdbcx namespace sdbcx
{ {
typedef ::cppu::WeakComponentImplHelper3< css::sdbcx::XColumnsSupplier, typedef cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier,
css::container::XNamed, css::container::XNamed,
css::lang::XServiceInfo> ODescriptor_BASE; css::lang::XServiceInfo> ODescriptor_BASE;
} }

4
include/drawinglayer/primitive3d/baseprimitive3d.hxx
View File

@@ -22,7 +22,7 @@
#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/drawinglayerdllapi.h>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <com/sun/star/graphic/XPrimitive3D.hpp> #include <com/sun/star/graphic/XPrimitive3D.hpp>
#include <basegfx/range/b3drange.hxx> #include <basegfx/range/b3drange.hxx>
@@ -50,7 +50,7 @@ namespace drawinglayer { namespace geometry {
namespace drawinglayer { namespace primitive3d { namespace drawinglayer { namespace primitive3d {
/// typedefs for basePrimitive3DImplBase, Primitive3DContainer and Primitive3DReference /// typedefs for basePrimitive3DImplBase, Primitive3DContainer and Primitive3DReference
typedef cppu::WeakComponentImplHelper1< css::graphic::XPrimitive3D > BasePrimitive3DImplBase; typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitive3D > BasePrimitive3DImplBase;
typedef css::uno::Reference< css::graphic::XPrimitive3D > Primitive3DReference; typedef css::uno::Reference< css::graphic::XPrimitive3D > Primitive3DReference;
typedef css::uno::Sequence< Primitive3DReference > Primitive3DSequence; typedef css::uno::Sequence< Primitive3DReference > Primitive3DSequence;

4
include/formula/FormulaOpCodeMapperObj.hxx
View File

@@ -29,7 +29,7 @@
#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp> #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <formula/formuladllapi.h> #include <formula/formuladllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <sal/types.h> #include <sal/types.h>
@@ -46,7 +46,7 @@ namespace formula
class FormulaCompiler; class FormulaCompiler;
class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2< class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public cppu::WeakImplHelper<
css::sheet::XFormulaOpCodeMapper, css::sheet::XFormulaOpCodeMapper,
css::lang::XServiceInfo > css::lang::XServiceInfo >
{ {

4
ure/source/uretest/cppmain.cc
View File

@@ -55,7 +55,7 @@
#include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp" #include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp"
#include "com/sun/star/util/theMacroExpander.hpp" #include "com/sun/star/util/theMacroExpander.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx" #include "cppuhelper/implbase.hxx"
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/interfacecontainer.hxx" #include "cppuhelper/interfacecontainer.hxx"
#include "cppuhelper/unourl.hxx" #include "cppuhelper/unourl.hxx"
@@ -77,7 +77,7 @@
namespace { namespace {
class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > { class Service: public cppu::WeakImplHelper< css::lang::XMain > {
public: public:
explicit Service( explicit Service(
css::uno::Reference< css::uno::XComponentContext > const & context): css::uno::Reference< css::uno::XComponentContext > const & context):

4
ure/source/uretest/cppserver.cc
View File

@@ -27,7 +27,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp" #include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx" #include "cppuhelper/implbase.hxx"
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
#include "rtl/ustring.h" #include "rtl/ustring.h"
@@ -40,7 +40,7 @@
namespace { namespace {
class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > { class Service: public cppu::WeakImplHelper< ::test::types::XServer > {
public: public:
Service() {} Service() {}

4
ure/source/uretest/cpptest.cc
View File

@@ -25,7 +25,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp" #include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/factory.hxx" #include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx" #include "cppuhelper/implbase.hxx"
#include "cppuhelper/implementationentry.hxx" #include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx" #include "cppuhelper/weak.hxx"
#include "rtl/ustring.h" #include "rtl/ustring.h"
@@ -38,7 +38,7 @@
namespace { namespace {
class Service: public cppu::WeakImplHelper1< test::types::XTest > { class Service: public cppu::WeakImplHelper< test::types::XTest > {
public: public:
Service() {} Service() {}