Skip to content

C
core
Kaydet (Commit) d1a9c73e authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Stephan Bergmann
Dosyalara gözat
Seçenekler

tdf#88206 replace cppu::WeakImplHelper* misc 

also edited two examples in canvas comments

Change-Id: Iac82b462168f869f995c33bb2c639f3dbe09cbd5
Reviewed-on: https://gerrit.libreoffice.org/31715Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst a6149bc0
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
comphelper/qa/container/comphelper_ifcontainer.cxx
Dosyayı görüntüle @ d1a9c73e
......@@ -27,7 +27,7 @@
#include <com/sun/star/lang/XEventListener.hpp>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/propshlp.hxx>
using namespace com::sun::star;
......@@ -40,7 +40,7 @@ struct ContainerStats {
ContainerStats() : m_nAlive(0), m_nDisposed(0) {}
};
class ContainerListener : public ::cppu::WeakImplHelper1< XEventListener >
class ContainerListener : public cppu::WeakImplHelper< XEventListener >
{
ContainerStats *m_pStats;
public:
......
comphelper/qa/container/testifcontainer.cxx
Dosyayı görüntüle @ d1a9c73e
......@@ -23,7 +23,7 @@
#include "cppunit/plugin/TestPlugIn.h"
#include <osl/mutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XVetoableChangeListener.hpp>
using namespace ::osl;
......@@ -44,7 +44,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
class TestListener : public cppu::WeakImplHelper1< XVetoableChangeListener >
class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener >
{
public:
// Methods
......
include/basegfx/tools/unopolypolygon.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -21,7 +21,7 @@
#define INCLUDED_BASEGFX_TOOLS_UNOPOLYPOLYGON_HXX
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase3.hxx>
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/FillRule.hpp>
#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
......@@ -33,7 +33,7 @@ namespace basegfx
{
namespace unotools
{
typedef ::cppu::WeakComponentImplHelper3<
typedef cppu::WeakComponentImplHelper<
css::rendering::XLinePolyPolygon2D,
css::rendering::XBezierPolyPolygon2D,
css::lang::XServiceInfo > UnoPolyPolygonBase;
......
include/basic/modsizeexceeded.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -21,11 +21,11 @@
#define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
#include <basic/basicdllapi.h>
#include <vector>
class BASIC_DLLPUBLIC ModuleSizeExceeded : public ::cppu::WeakImplHelper1< css::task::XInteractionRequest >
class BASIC_DLLPUBLIC ModuleSizeExceeded : public cppu::WeakImplHelper< css::task::XInteractionRequest >
{
// C++ interface
public:
......
include/canvas/base/cachedprimitivebase.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -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.
......
include/canvas/base/canvasbase.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -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.
......
include/canvas/base/graphicdevicebase.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -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.
......
include/canvas/parametricpolypolygon.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -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
......
include/connectivity/sdbcx/VTypeDef.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
#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/container/XNamed.hpp>
......@@ -29,7 +29,7 @@ namespace connectivity
{
namespace sdbcx
{
typedef ::cppu::WeakComponentImplHelper3< css::sdbcx::XColumnsSupplier,
typedef cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier,
css::container::XNamed,
css::lang::XServiceInfo> ODescriptor_BASE;
}
......
include/drawinglayer/primitive3d/baseprimitive3d.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -22,7 +22,7 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/graphic/XPrimitive3D.hpp>
#include <basegfx/range/b3drange.hxx>
......@@ -50,7 +50,7 @@ namespace drawinglayer { namespace geometry {
namespace drawinglayer { namespace primitive3d {
/// 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::Sequence< Primitive3DReference > Primitive3DSequence;
......
include/formula/FormulaOpCodeMapperObj.hxx
Dosyayı görüntüle @ d1a9c73e
......@@ -29,7 +29,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase.hxx>
#include <formula/formuladllapi.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
......@@ -46,7 +46,7 @@ namespace formula
class FormulaCompiler;
class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public cppu::WeakImplHelper<
css::sheet::XFormulaOpCodeMapper,
css::lang::XServiceInfo >
{
......
ure/source/uretest/cppmain.cc
Dosyayı görüntüle @ d1a9c73e
......@@ -55,7 +55,7 @@
#include "com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp"
#include "com/sun/star/util/theMacroExpander.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/interfacecontainer.hxx"
#include "cppuhelper/unourl.hxx"
......@@ -77,7 +77,7 @@
namespace {
class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
class Service: public cppu::WeakImplHelper< css::lang::XMain > {
public:
explicit Service(
css::uno::Reference< css::uno::XComponentContext > const & context):
......
ure/source/uretest/cppserver.cc
Dosyayı görüntüle @ d1a9c73e
......@@ -27,7 +27,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "rtl/ustring.h"
......@@ -40,7 +40,7 @@
namespace {
class Service: public ::cppu::WeakImplHelper1< ::test::types::XServer > {
class Service: public cppu::WeakImplHelper< ::test::types::XServer > {
public:
Service() {}
......
ure/source/uretest/cpptest.cc
Dosyayı görüntüle @ d1a9c73e
......@@ -25,7 +25,7 @@
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/weak.hxx"
#include "rtl/ustring.h"
......@@ -38,7 +38,7 @@
namespace {
class Service: public cppu::WeakImplHelper1< test::types::XTest > {
class Service: public cppu::WeakImplHelper< test::types::XTest > {
public:
Service() {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment