[Libreoffice-commits] core.git: include/toolkit
Jochen Nitschke
j.nitschke+logerrit at ok.de
Wed Dec 7 06:40:38 UTC 2016
include/toolkit/awt/animatedimagespeer.hxx | 12 +++++------
include/toolkit/awt/vclxtabpagecontainer.hxx | 10 ++++-----
include/toolkit/awt/vclxwindow.hxx | 24 +++++++++++-----------
include/toolkit/awt/vclxwindows.hxx | 29 +++++++++++++--------------
include/toolkit/controls/roadmapentry.hxx | 5 +---
5 files changed, 39 insertions(+), 41 deletions(-)
New commits:
commit 43de0518bc1f0b7aa8d57132a11cae6fa411680f
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Tue Dec 6 19:35:55 2016 +0100
tdf#88206 replace cppu::WeakImplHelper* in toolkit
Change-Id: I89713755023ea003559cc76fb77eb97de2135cae
Reviewed-on: https://gerrit.libreoffice.org/31696
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index c2bccd99..f328fce 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <memory>
@@ -36,11 +36,11 @@ namespace toolkit
//= AnimatedImagesPeer
struct AnimatedImagesPeer_Data;
- typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow
- , css::awt::XAnimation
- , css::container::XContainerListener
- , css::util::XModifyListener
- > AnimatedImagesPeer_Base;
+ typedef cppu::ImplInheritanceHelper< VCLXWindow,
+ css::awt::XAnimation,
+ css::container::XContainerListener,
+ css::util::XModifyListener
+ > AnimatedImagesPeer_Base;
class AnimatedImagesPeer :public AnimatedImagesPeer_Base
{
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index d36f325..0e80537 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -29,15 +29,15 @@
#include <com/sun/star/container/XContainerListener.hpp>
#include <toolkit/awt/vclxwindow.hxx>
#include <com/sun/star/awt/tab/XTabPageContainer.hpp>
+#include <cppuhelper/implbase.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <toolkit/awt/vclxcontainer.hxx>
-typedef ::cppu::ImplInheritanceHelper2 < VCLXContainer
- , css::awt::tab::XTabPageContainer
- , css::container::XContainerListener
- > VCLXTabPageContainer_Base;
+typedef cppu::ImplInheritanceHelper< VCLXContainer,
+ css::awt::tab::XTabPageContainer,
+ css::container::XContainerListener
+ > VCLXTabPageContainer_Base;
class VCLXTabPageContainer : public VCLXTabPageContainer_Base
{
public:
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 611e1da..7ee6ed5 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -36,8 +36,8 @@
#include <com/sun/star/awt/XDockableWindow.hpp>
#include <com/sun/star/awt/XStyleSettingsSupplier.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase9.hxx>
#include <osl/mutex.hxx>
#include <tools/gen.hxx>
@@ -61,17 +61,17 @@ namespace toolkit
class UnoPropertyArrayHelper;
class VCLXWindowImpl;
-typedef ::cppu::ImplInheritanceHelper9 < VCLXDevice
- , css::awt::XWindow2
- , css::awt::XVclWindowPeer
- , css::awt::XLayoutConstrains
- , css::awt::XView
- , css::awt::XDockableWindow
- , css::accessibility::XAccessible
- , css::lang::XEventListener
- , css::beans::XPropertySetInfo
- , css::awt::XStyleSettingsSupplier
- > VCLXWindow_Base;
+typedef cppu::ImplInheritanceHelper< VCLXDevice,
+ css::awt::XWindow2,
+ css::awt::XVclWindowPeer,
+ css::awt::XLayoutConstrains,
+ css::awt::XView,
+ css::awt::XDockableWindow,
+ css::accessibility::XAccessible,
+ css::lang::XEventListener,
+ css::beans::XPropertySetInfo,
+ css::awt::XStyleSettingsSupplier
+ > VCLXWindow_Base;
class TOOLKIT_DLLPUBLIC VCLXWindow : public VCLXWindow_Base
{
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index a9d7c84..4a1da04 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -77,13 +77,11 @@
#include <com/sun/star/awt/XSimpleTabController.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/Date.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxtopwindow.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <vcl/pointr.hxx>
#include <vcl/image.hxx>
@@ -144,10 +142,10 @@ public:
// class VCLXButton
-typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl
- , css::awt::XButton
- , css::awt::XToggleButton
- > VCLXButton_Base;
+typedef cppu::ImplInheritanceHelper< VCLXGraphicControl,
+ css::awt::XButton,
+ css::awt::XToggleButton
+ > VCLXButton_Base;
class VCLXButton :public VCLXButton_Base
{
private:
@@ -744,11 +742,11 @@ public:
// class VCLXListBox
-typedef ::cppu::ImplInheritanceHelper3 < VCLXWindow
- , css::awt::XListBox
- , css::awt::XTextLayoutConstrains
- , css::awt::XItemListListener
- > VCLXListBox_Base;
+typedef cppu::ImplInheritanceHelper< VCLXWindow,
+ css::awt::XListBox,
+ css::awt::XTextLayoutConstrains,
+ css::awt::XItemListListener
+ > VCLXListBox_Base;
class VCLXListBox : public VCLXListBox_Base
{
private:
@@ -821,9 +819,10 @@ public:
// class VCLXComboBox
-typedef ::cppu::ImplInheritanceHelper2 < VCLXEdit
- , css::awt::XComboBox
- , css::awt::XItemListListener > VCLXComboBox_Base;
+typedef cppu::ImplInheritanceHelper< VCLXEdit,
+ css::awt::XComboBox,
+ css::awt::XItemListListener
+ > VCLXComboBox_Base;
class VCLXComboBox : public VCLXComboBox_Base
{
private:
diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx
index bca889d..8711344 100644
--- a/include/toolkit/controls/roadmapentry.hxx
+++ b/include/toolkit/controls/roadmapentry.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX
#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX
-#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase.hxx>
#define RM_PROPERTY_ID_LABEL 1
@@ -32,8 +32,7 @@
#define RM_PROPERTY_ID_ENABLED 4
#define RM_PROPERTY_ID_INTERACTIVE 5
-typedef ::cppu::WeakImplHelper1 < css::lang::XServiceInfo
- > ORoadmapEntry_Base;
+typedef cppu::WeakImplHelper< css::lang::XServiceInfo > ORoadmapEntry_Base;
class ORoadmapEntry :public ORoadmapEntry_Base
,public ::comphelper::OMutexAndBroadcastHelper
More information about the Libreoffice-commits
mailing list