[Libreoffice-commits] core.git: toolkit/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Sep 8 01:08:04 PDT 2015
toolkit/source/awt/asynccallback.cxx | 4 ++--
toolkit/source/awt/stylesettings.hxx | 4 ++--
toolkit/source/awt/vclxtoolkit.cxx | 6 +++---
toolkit/source/controls/animatedimages.cxx | 1 -
toolkit/source/controls/dialogcontrol.cxx | 4 ++--
toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 4 ++--
toolkit/source/controls/grid/defaultgriddatamodel.cxx | 4 ++--
toolkit/source/controls/grid/gridcolumn.hxx | 4 ++--
toolkit/source/controls/grid/gridcontrol.hxx | 4 ++--
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 4 ++--
toolkit/source/controls/tabpagemodel.cxx | 1 -
toolkit/source/controls/tree/treecontrol.cxx | 3 ++-
toolkit/source/controls/tree/treecontrol.hxx | 2 --
toolkit/source/controls/unocontrolcontainer.cxx | 4 ++--
14 files changed, 23 insertions(+), 26 deletions(-)
New commits:
commit bfa5b13b42770fb709dc2af7cab7aff1942eaa50
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 8 10:41:27 2015 +0900
toolkit: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: If62a0c3da7f9732a60316dfd49323f6ab838fb6d
Reviewed-on: https://gerrit.libreoffice.org/18396
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index cc988b2..f344eb8 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -24,7 +24,7 @@
#include "osl/mutex.hxx"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include "com/sun/star/lang/XServiceInfo.hpp"
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -34,7 +34,7 @@
namespace {
class AsyncCallback:
- public ::cppu::WeakImplHelper2<
+ public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::awt::XRequestCallback>,
private boost::noncopyable
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index c49f1b7..1274b59 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/awt/XStyleSettings.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/scoped_ptr.hpp>
@@ -42,7 +42,7 @@ namespace toolkit
//= WindowStyleSettings
struct WindowStyleSettings_Data;
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XStyleSettings
+ typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XStyleSettings
> WindowStyleSettings_Base;
class WindowStyleSettings : public WindowStyleSettings_Base
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 9d5ff01..43174f5 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -45,7 +45,7 @@
#include <com/sun/star/awt/XMessageBoxFactory.hpp>
#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
@@ -147,7 +147,7 @@ protected:
};
class VCLXToolkit : public VCLXToolkit_Impl,
- public cppu::WeakComponentImplHelper2<
+ public cppu::WeakComponentImplHelper<
css::awt::XToolkitExperimental,
css::lang::XServiceInfo >
{
@@ -648,7 +648,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
// constructor, which might initialize VCL
VCLXToolkit::VCLXToolkit():
- cppu::WeakComponentImplHelper2<
+ cppu::WeakComponentImplHelper<
::com::sun::star::awt::XToolkitExperimental,
::com::sun::star::lang::XServiceInfo>( GetMutex() ),
m_aTopWindowListeners(rBHelper.rMutex),
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index a434239b9..b12e37c 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -34,7 +34,6 @@
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include "helper/unopropertyarrayhelper.hxx"
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 018b239..5481a78 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -43,7 +43,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/graph.hxx>
#include <vcl/image.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <algorithm>
#include <functional>
#include <map>
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::util;
// => use some template magic
template< typename T >
-class SimpleNamedThingContainer : public ::cppu::WeakImplHelper1< container::XNameContainer >
+class SimpleNamedThingContainer : public ::cppu::WeakImplHelper< container::XNameContainer >
{
typedef std::unordered_map< OUString, Reference< T >, OUStringHash,
std::equal_to< OUString > > NamedThingsHash;
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index f6e1b61..277ea2f 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -29,7 +29,7 @@
#include <comphelper/sequence.hxx>
#include <comphelper/componentguard.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
@@ -45,7 +45,7 @@ using namespace toolkit;
namespace {
-typedef ::cppu::WeakComponentImplHelper2 < css::awt::grid::XGridColumnModel
+typedef ::cppu::WeakComponentImplHelper < css::awt::grid::XGridColumnModel
, css::lang::XServiceInfo
> DefaultGridColumnModel_Base;
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index aa830e4..a1240c1 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -23,7 +23,7 @@
#include <comphelper/componentguard.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <tools/diagnose_ex.h>
@@ -44,7 +44,7 @@ namespace {
enum broadcast_type { row_added, row_removed, data_changed};
-typedef ::cppu::WeakComponentImplHelper2 < XMutableGridDataModel
+typedef ::cppu::WeakComponentImplHelper < XMutableGridDataModel
, XServiceInfo
> DefaultGridDataModel_Base;
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index a4582d4..4c8ac78 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/style/HorizontalAlignment.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <comphelper/componentguard.hxx>
#include <rtl/ref.hxx>
#include <toolkit/helper/mutexandbroadcasthelper.hxx>
@@ -37,7 +37,7 @@
namespace toolkit
{
-typedef ::cppu::WeakComponentImplHelper3 < ::com::sun::star::awt::grid::XGridColumn
+typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::awt::grid::XGridColumn
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::lang::XUnoTunnel
> GridColumn_Base;
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 5b69b22..b10dd8d 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -26,7 +26,7 @@
#include <toolkit/controls/unocontrolbase.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/sequence.hxx>
#include <toolkit/helper/listenermultiplexer.hxx>
@@ -83,7 +83,7 @@ public:
// = UnoGridControl
-typedef ::cppu::ImplInheritanceHelper2 < UnoControlBase
+typedef ::cppu::ImplInheritanceHelper < UnoControlBase
, ::com::sun::star::awt::grid::XGridControl
, ::com::sun::star::awt::grid::XGridRowSelection
> UnoGridControl_Base;
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 3526251..35450bb0 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/awt/grid/XSortableMutableGridDataModel.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/anycompare.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -52,7 +52,7 @@ namespace {
class SortableGridDataModel;
typedef InitGuard< SortableGridDataModel > MethodGuard;
-typedef ::cppu::WeakComponentImplHelper3 < css::awt::grid::XSortableMutableGridDataModel
+typedef ::cppu::WeakComponentImplHelper < css::awt::grid::XSortableMutableGridDataModel
, css::lang::XServiceInfo
, css::lang::XInitialization
> SortableGridDataModel_Base;
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 035c8d2..1a49593 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -43,7 +43,6 @@
#include <toolkit/controls/controlmodelcontainerbase.hxx>
#include <toolkit/controls/unocontrolcontainer.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase2.hxx>
#include "helper/unopropertyarrayhelper.hxx"
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 54df3a0..6254e86 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/view/SelectionType.hpp>
#include <toolkit/helper/property.hxx>
#include <osl/diagnose.h>
+#include <cppuhelper/implbase.hxx>
#include "helper/unopropertyarrayhelper.hxx"
@@ -129,7 +130,7 @@ Reference< XPropertySetInfo > UnoTreeModel::getPropertySetInfo( ) throw(Runtime
namespace {
-typedef ::cppu::ImplInheritanceHelper1< UnoControlBase, css::awt::tree::XTreeControl > UnoTreeControl_Base;
+typedef ::cppu::ImplInheritanceHelper< UnoControlBase, css::awt::tree::XTreeControl > UnoTreeControl_Base;
class UnoTreeControl : public UnoTreeControl_Base
{
public:
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index 361af80..2608361 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -23,8 +23,6 @@
#include <toolkit/controls/unocontrols.hxx>
#include <toolkit/controls/unocontrolmodel.hxx>
#include <toolkit/helper/servicenames.hxx>
-#include <cppuhelper/implbase1.hxx>
-
#include <toolkit/helper/listenermultiplexer.hxx>
namespace toolkit {
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 71de06f..6f5e38f 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/uuid.h>
#include <toolkit/controls/unocontrolcontainer.hxx>
@@ -355,7 +355,7 @@ void implUpdateVisibility
// class DialogStepChangedListener
-typedef ::cppu::WeakImplHelper1< beans::XPropertyChangeListener > PropertyChangeListenerHelper;
+typedef ::cppu::WeakImplHelper< beans::XPropertyChangeListener > PropertyChangeListenerHelper;
class DialogStepChangedListener: public PropertyChangeListenerHelper
{
More information about the Libreoffice-commits
mailing list