mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#88206 replace cppu::WeakImplHelper* etc.

Browse Source 
with the variadic variants in embeddedobj.

Change-Id: I60aad1267b664825f781c085fb33612bce3f7221
Reviewed-on: https://gerrit.libreoffice.org/17474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Takeshi Abe 2015-08-03 01:02:04 +09:00 committed by Noel Grandin
parent 7339c360ef
commit b03f6f45f4
15 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embeddedobj/source/inc/closepreventer.hxx
View File

@ -21,9 +21,9 @@
#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX #define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_CLOSEPREVENTER_HXX
#include <com/sun/star/util/XCloseListener.hpp> #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 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; virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

4
embeddedobj/source/inc/docholder.hxx
View File

@ -35,13 +35,13 @@
#include <com/sun/star/embed/XHatchWindowController.hpp> #include <com/sun/star/embed/XHatchWindowController.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase6.hxx> #include <cppuhelper/implbase.hxx>
class OCommonEmbeddedObject; class OCommonEmbeddedObject;
class Interceptor; class Interceptor;
class DocumentHolder : class DocumentHolder :
public ::cppu::WeakImplHelper6< public ::cppu::WeakImplHelper<
::com::sun::star::util::XCloseListener, ::com::sun::star::util::XCloseListener,
::com::sun::star::frame::XTerminateListener, ::com::sun::star::frame::XTerminateListener,
::com::sun::star::util::XModifyListener, ::com::sun::star::util::XModifyListener,

4
embeddedobj/source/inc/dummyobject.hxx
View File

@ -25,7 +25,7 @@
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace embed { namespace embed {
@ -44,7 +44,7 @@ namespace cppu {
class OMultiTypeInterfaceContainerHelper; class OMultiTypeInterfaceContainerHelper;
} }
class ODummyEmbeddedObject : public ::cppu::WeakImplHelper2 class ODummyEmbeddedObject : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XEmbeddedObject < ::com::sun::star::embed::XEmbeddedObject
, ::com::sun::star::embed::XEmbedPersist > , ::com::sun::star::embed::XEmbedPersist >
{ {

4
embeddedobj/source/inc/intercept.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_INTERCEPT_HXX #define INCLUDED_EMBEDDEDOBJ_SOURCE_INC_INTERCEPT_HXX
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/frame/XInterceptorInfo.hpp> #include <com/sun/star/frame/XInterceptorInfo.hpp>
@ -31,7 +31,7 @@
class StatusChangeListenerContainer; class StatusChangeListenerContainer;
class DocumentHolder; 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::XInterceptorInfo,
::com::sun::star::frame::XDispatch> ::com::sun::star::frame::XDispatch>
{ {

4
embeddedobj/source/inc/oleembobj.hxx
View File

@ -36,7 +36,7 @@
#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/util/XCloseListener.hpp>
#include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase.hxx>
#include <osl/thread.h> #include <osl/thread.h>
@ -103,7 +103,7 @@ public:
class OleComponent; class OleComponent;
class OwnView_Impl; class OwnView_Impl;
class OleEmbeddedObject : public ::cppu::WeakImplHelper5 class OleEmbeddedObject : public ::cppu::WeakImplHelper
< ::com::sun::star::embed::XEmbeddedObject < ::com::sun::star::embed::XEmbeddedObject
, ::com::sun::star::embed::XEmbedPersist , ::com::sun::star::embed::XEmbedPersist
, ::com::sun::star::embed::XLinkageSupport , ::com::sun::star::embed::XLinkageSupport

4
embeddedobj/source/inc/xcreator.hxx
View File

@ -24,10 +24,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <comphelper/mimeconfighelper.hxx> #include <comphelper/mimeconfighelper.hxx>
class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper2< class UNOEmbeddedObjectCreator : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator, ::com::sun::star::embed::XEmbeddedObjectCreator,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {

4
embeddedobj/source/msole/mtnotification.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/awt/XCallback.hpp> #include <com/sun/star/awt/XCallback.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
@ -32,7 +32,7 @@ class OleEmbeddedObject;
#define OLECOMP_ONVIEWCHANGE 1 #define OLECOMP_ONVIEWCHANGE 1
#define OLECOMP_ONCLOSE 2 #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; OleEmbeddedObject* m_pObject;
::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XEmbeddedObject > m_xObject; ::com::sun::star::uno::WeakReference< ::com::sun::star::embed::XEmbeddedObject > m_xObject;

4
embeddedobj/source/msole/olecomponent.hxx
View File

@ -33,7 +33,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/lang/XUnoTunnel.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/XModifiable.hpp>
#include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyListener.hpp>
@ -52,7 +52,7 @@ class OleWrapperAdviseSink;
class OleEmbeddedObject; class OleEmbeddedObject;
struct OleComponentNative_Impl; 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::lang::XUnoTunnel, ::com::sun::star::util::XModifiable,
::com::sun::star::datatransfer::XTransferable > ::com::sun::star::datatransfer::XTransferable >
{ {

4
embeddedobj/source/msole/ownview.cxx
View File

@ -37,7 +37,7 @@
#include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx> #include <comphelper/storagehelper.hxx>
#include <comphelper/mimeconfighelper.hxx> #include <comphelper/mimeconfighelper.hxx>
@ -49,7 +49,7 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::comphelper; using namespace ::comphelper;
class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHandler > class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandler >
{ {
public: public:
DummyHandler_Impl() {} DummyHandler_Impl() {}

4
embeddedobj/source/msole/ownview.hxx
View File

@ -26,11 +26,11 @@
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <osl/mutex.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 > ::com::sun::star::document::XEventListener >
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;

4
embeddedobj/source/msole/xdialogcreator.hxx
View File

@ -24,10 +24,10 @@
#include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp> #include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp>
#include <com/sun/star/lang/XServiceInfo.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::XInsertObjectDialog,
::com::sun::star::embed::XEmbedObjectClipboardCreator, ::com::sun::star::embed::XEmbedObjectClipboardCreator,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >

4
embeddedobj/source/msole/xolefactory.hxx
View File

@ -24,11 +24,11 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper2< class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper<
::com::sun::star::embed::XEmbeddedObjectCreator, ::com::sun::star::embed::XEmbeddedObjectCreator,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >
{ {

4
embeddedobj/test/MainThreadExecutor/xexecutor.hxx
View File

@ -24,11 +24,11 @@
#include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <tools/link.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::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;

4
embeddedobj/test/mtexecutor/bitmapcreator.hxx
View File

@ -25,9 +25,9 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #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::XSingleServiceFactory,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >

4
embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
View File

@ -25,7 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <tools/link.hxx> #include <tools/link.hxx>
@ -42,7 +42,7 @@ class MainThreadExecutorRequest
void doIt(); void doIt();
}; };
class MainThreadExecutor : public ::cppu::WeakImplHelper2< class MainThreadExecutor : public ::cppu::WeakImplHelper<
::com::sun::star::task::XJob, ::com::sun::star::task::XJob,
::com::sun::star::lang::XServiceInfo > ::com::sun::star::lang::XServiceInfo >