[Libreoffice-commits] core.git: comphelper/qa include/basegfx include/basic include/canvas include/connectivity include/drawinglayer include/formula ure/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Wed Dec 7 10:57:14 UTC 2016
comphelper/qa/container/comphelper_ifcontainer.cxx | 4 ++--
comphelper/qa/container/testifcontainer.cxx | 4 ++--
include/basegfx/tools/unopolypolygon.hxx | 4 ++--
include/basic/modsizeexceeded.hxx | 4 ++--
include/canvas/base/cachedprimitivebase.hxx | 6 +++---
include/canvas/base/canvasbase.hxx | 8 ++++----
include/canvas/base/graphicdevicebase.hxx | 8 ++++----
include/canvas/parametricpolypolygon.hxx | 6 +++---
include/connectivity/sdbcx/VTypeDef.hxx | 4 ++--
include/drawinglayer/primitive3d/baseprimitive3d.hxx | 4 ++--
include/formula/FormulaOpCodeMapperObj.hxx | 4 ++--
ure/source/uretest/cppmain.cc | 4 ++--
ure/source/uretest/cppserver.cc | 4 ++--
ure/source/uretest/cpptest.cc | 4 ++--
14 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit d1a9c73ea16f5b4838f639ce2bb2226d9b9b334a
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Tue Dec 6 20:42:22 2016 +0100
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 at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx
index 6da9493..135adfd 100644
--- a/comphelper/qa/container/comphelper_ifcontainer.cxx
+++ b/comphelper/qa/container/comphelper_ifcontainer.cxx
@@ -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:
diff --git a/comphelper/qa/container/testifcontainer.cxx b/comphelper/qa/container/testifcontainer.cxx
index 3cc8f9c..e881f67 100644
--- a/comphelper/qa/container/testifcontainer.cxx
+++ b/comphelper/qa/container/testifcontainer.cxx
@@ -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
diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx
index e4a2206..0d5b8b3 100644
--- a/include/basegfx/tools/unopolypolygon.hxx
+++ b/include/basegfx/tools/unopolypolygon.hxx
@@ -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;
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 5f9cc18..2a6a304 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -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:
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 6b25a15..8fb1ac0 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 5713831..cf30aab 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 df29117..28c208a 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 598a010..10b563e 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
diff --git a/include/connectivity/sdbcx/VTypeDef.hxx b/include/connectivity/sdbcx/VTypeDef.hxx
index 65afc14..8328c35 100644
--- a/include/connectivity/sdbcx/VTypeDef.hxx
+++ b/include/connectivity/sdbcx/VTypeDef.hxx
@@ -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;
}
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 61a5634..f9ba1b8 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -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;
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index f3c19a2..0bf31b4 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -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 >
{
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ab38ef9..ef56fa9 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -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):
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 69b33c3..340c367 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -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() {}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index d1f112d..79a63af 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -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() {}
More information about the Libreoffice-commits
mailing list