embeddedobj/source/inc/closepreventer.hxx | 4 ++--
embeddedobj/source/inc/docholder.hxx | 4 ++--
embeddedobj/source/inc/dummyobject.hxx | 4 ++--
embeddedobj/source/inc/intercept.hxx | 4 ++--
embeddedobj/source/inc/oleembobj.hxx | 4 ++--
embeddedobj/source/inc/xcreator.hxx | 4 ++--
embeddedobj/source/msole/mtnotification.hxx | 4 ++--
embeddedobj/source/msole/olecomponent.hxx | 4 ++--
embeddedobj/source/msole/ownview.cxx | 4 ++--
embeddedobj/source/msole/ownview.hxx | 4 ++--
embeddedobj/source/msole/xdialogcreator.hxx | 4 ++--
embeddedobj/source/msole/xolefactory.hxx | 4 ++--
embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 4 ++--
embeddedobj/test/mtexecutor/bitmapcreator.hxx | 4 ++--
embeddedobj/test/mtexecutor/mainthreadexecutor.hxx | 4 ++--
15 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit b03f6f45f4a13d97b0b62ea7c54b75dd14a5ad5e
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon Aug 3 01:02:04 2015 +0900
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants in embeddedobj.
Change-Id: I60aad1267b664825f781c085fb33612bce3f7221
Reviewed-on: https://gerrit.libreoffice.org/17474
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/embeddedobj/source/inc/closepreventer.hxx
b/embeddedobj/source/inc/closepreventer.hxx
index 560aceb..892585e 100644
--- a/embeddedobj/source/inc/closepreventer.hxx
+++ b/embeddedobj/source/inc/closepreventer.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX
#include <com/sun/star/util/XCloseListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-class OClosePreventer : public ::cppu::WeakImplHelper1 <
::com::sun::star::util::XCloseListener >
+class OClosePreventer : public ::cppu::WeakImplHelper <
::com::sun::star::util::XCloseListener >
{
virtual void SAL_CALL queryClosing( const
::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw
(::com::sun::star::util::CloseVetoException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL notifyClosing( const
::com::sun::star::lang::EventObject& Source ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/embeddedobj/source/inc/docholder.hxx
b/embeddedobj/source/inc/docholder.hxx
index dcf196a..7fe5549 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -35,13 +35,13 @@
#include <com/sun/star/embed/XHatchWindowController.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
class OCommonEmbeddedObject;
class Interceptor;
class DocumentHolder :
- public ::cppu::WeakImplHelper6<
+ public ::cppu::WeakImplHelper<
::com::sun::star::util::XCloseListener,
::com::sun::star::frame::XTerminateListener,
::com::sun::star::util::XModifyListener,
diff --git a/embeddedobj/source/inc/dummyobject.hxx
b/embeddedobj/source/inc/dummyobject.hxx
index aeef1e0..81e2c39 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star {
namespace embed {
@@ -44,7 +44,7 @@ namespace cppu {
class OMultiTypeInterfaceContainerHelper;
}
-class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2
+class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XEmbeddedObject
, ::com::sun::star::embed::XEmbedPersist >
{
diff --git a/embeddedobj/source/inc/intercept.hxx
b/embeddedobj/source/inc/intercept.hxx
index 6578219..c5d554c 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_INTERCEPT_HXX
#include <osl/mutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp>
@@ -31,7 +31,7 @@
class StatusChangeListenerContainer;
class DocumentHolder;
-class Interceptor : public ::cppu::WeakImplHelper3<
::com::sun::star::frame::XDispatchProviderInterceptor,
+class Interceptor : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XDispatchProviderInterceptor,
::com::sun::star::frame::XInterceptorInfo,
::com::sun::star::frame::XDispatch>
{
diff --git a/embeddedobj/source/inc/oleembobj.hxx
b/embeddedobj/source/inc/oleembobj.hxx
index 06d883b..4b54ad3 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/thread.h>
@@ -103,7 +103,7 @@ public:
class OleComponent;
class OwnView_Impl;
-class OleEmbeddedObject : public ::cppu::WeakImplHelper5
+class OleEmbeddedObject : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XEmbeddedObject
, ::com::sun::star::embed::XEmbedPersist
, ::com::sun::star::embed::XLinkageSupport
diff --git a/embeddedobj/source/inc/xcreator.hxx
b/embeddedobj/source/inc/xcreator.hxx
index 6d15528..b01dfb5 100644
--- a/embeddedobj/source/inc/xcreator.hxx
+++ b/embeddedobj/source/inc/xcreator.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <osl/diagnose.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/mimeconfighelper.hxx>
-class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper2<
+class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/embeddedobj/source/msole/mtnotification.hxx
b/embeddedobj/source/msole/mtnotification.hxx
index 9b45e5f..faae7af 100644
--- a/embeddedobj/source/msole/mtnotification.hxx
+++ b/embeddedobj/source/msole/mtnotification.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/awt/XCallback.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
@@ -32,7 +32,7 @@ class OleEmbeddedObject;
#define OLECOMP_ONVIEWCHANGE 1
#define OLECOMP_ONCLOSE 2
-class MainThreadNotificationRequest : public cppu::WeakImplHelper1<
com::sun::star::awt::XCallback >
+class MainThreadNotificationRequest : public cppu::WeakImplHelper<
com::sun::star::awt::XCallback >
{
OleEmbeddedObject* m_pObject;
::com::sun::star::uno::WeakReference<
::com::sun::star::embed::XEmbeddedObject > m_xObject;
diff --git a/embeddedobj/source/msole/olecomponent.hxx
b/embeddedobj/source/msole/olecomponent.hxx
index a152f63..e344998 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
@@ -52,7 +52,7 @@ class OleWrapperAdviseSink;
class OleEmbeddedObject;
struct OleComponentNative_Impl;
-class OleComponent : public ::cppu::WeakImplHelper5<
::com::sun::star::util::XCloseable, ::com::sun::star::lang::XComponent,
+class OleComponent : public ::cppu::WeakImplHelper<
::com::sun::star::util::XCloseable, ::com::sun::star::lang::XComponent,
::com::sun::star::lang::XUnoTunnel, ::com::sun::star::util::XModifiable,
::com::sun::star::datatransfer::XTransferable >
{
diff --git a/embeddedobj/source/msole/ownview.cxx
b/embeddedobj/source/msole/ownview.cxx
index 758e081..cc0378c 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/mimeconfighelper.hxx>
@@ -49,7 +49,7 @@
using namespace ::com::sun::star;
using namespace ::comphelper;
-class DummyHandler_Impl : public ::cppu::WeakImplHelper1<
task::XInteractionHandler >
+class DummyHandler_Impl : public ::cppu::WeakImplHelper<
task::XInteractionHandler >
{
public:
DummyHandler_Impl() {}
diff --git a/embeddedobj/source/msole/ownview.hxx
b/embeddedobj/source/msole/ownview.hxx
index 19db69b..304fcaf 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -26,11 +26,11 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
-class OwnView_Impl : public ::cppu::WeakImplHelper2 <
::com::sun::star::util::XCloseListener,
+class OwnView_Impl : public ::cppu::WeakImplHelper <
::com::sun::star::util::XCloseListener,
::com::sun::star::document::XEventListener >
{
::osl::Mutex m_aMutex;
diff --git a/embeddedobj/source/msole/xdialogcreator.hxx
b/embeddedobj/source/msole/xdialogcreator.hxx
index 7f184d3..991920d 100644
--- a/embeddedobj/source/msole/xdialogcreator.hxx
+++ b/embeddedobj/source/msole/xdialogcreator.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
-class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper3<
+class MSOLEDialogObjectCreator : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XInsertObjectDialog,
::com::sun::star::embed::XEmbedObjectClipboardCreator,
::com::sun::star::lang::XServiceInfo >
diff --git a/embeddedobj/source/msole/xolefactory.hxx
b/embeddedobj/source/msole/xolefactory.hxx
index 6ea005e..bb3e30b 100644
--- a/embeddedobj/source/msole/xolefactory.hxx
+++ b/embeddedobj/source/msole/xolefactory.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
-class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper2<
+class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator,
::com::sun::star::lang::XServiceInfo >
{
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index 12a140d..a68de43 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/link.hxx>
-class UNOMainThreadExecutor : public ::cppu::WeakImplHelper2<
::com::sun::star::task::XJob,
+class UNOMainThreadExecutor : public ::cppu::WeakImplHelper<
::com::sun::star::task::XJob,
::com::sun::star::lang::XServiceInfo >
{
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index d6d3c81..5edb76e 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -25,9 +25,9 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
-class VCLBitmapCreator : public ::cppu::WeakImplHelper2<
+class VCLBitmapCreator : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XSingleServiceFactory,
::com::sun::star::lang::XServiceInfo >
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index 7879ed3..afb99af 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/link.hxx>
@@ -42,7 +42,7 @@ class MainThreadExecutorRequest
void doIt();
};
-class MainThreadExecutor : public ::cppu::WeakImplHelper2<
+class MainThreadExecutor : public ::cppu::WeakImplHelper<
::com::sun::star::task::XJob,
::com::sun::star::lang::XServiceInfo >
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
