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 basctl.

Change-Id: I52da577a6f6298eb89b0cc8c8ff243ecd341e9b3
Reviewed-on: https://gerrit.libreoffice.org/16718
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Takeshi Abe
2015-07-02 15:29:29 +09:00
committed by Noel Grandin
parent 7640e244db
commit c73e3bb925
9 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/inc/pch/precompiled_basctl.hxx
View File

@@ -103,7 +103,7 @@
#include <comphelper/types.hxx> #include <comphelper/types.hxx>
#include <config_options.h> #include <config_options.h>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/component_context.hxx> #include <cppuhelper/component_context.hxx>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>

4
basctl/source/basicide/basicrenderable.cxx
View File

@@ -24,7 +24,7 @@
#include <toolkit/awt/vclxdevice.hxx> #include <toolkit/awt/vclxdevice.hxx>
#include <tools/multisel.hxx> #include <tools/multisel.hxx>
#include <tools/resary.hxx> #include <tools/resary.hxx>
#include <cppuhelper/compbase.hxx>
#include <comphelper/propertysequence.hxx> #include <comphelper/propertysequence.hxx>
namespace basctl namespace basctl
@@ -34,7 +34,7 @@ using namespace com::sun::star;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
Renderable::Renderable (BaseWindow* pWin) Renderable::Renderable (BaseWindow* pWin)
: cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >( maMutex ) : cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >( maMutex )
, mpWindow( pWin ) , mpWindow( pWin )
{ {
ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST ) ); ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST ) );

4
basctl/source/basicide/basicrenderable.hxx
View File

@@ -20,7 +20,7 @@
#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
#include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/view/XRenderable.hpp>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>
@@ -30,7 +30,7 @@ namespace basctl
class BaseWindow; class BaseWindow;
class Renderable : class Renderable :
public cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >, public cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >,
public vcl::PrinterOptionsHelper public vcl::PrinterOptionsHelper
{ {
VclPtr<BaseWindow> mpWindow; VclPtr<BaseWindow> mpWindow;

4
basctl/source/basicide/baside2b.cxx
View File

@@ -43,7 +43,7 @@
#include <svtools/treelistentry.hxx> #include <svtools/treelistentry.hxx>
#include <vcl/taskpanelist.hxx> #include <vcl/taskpanelist.hxx>
#include <vcl/help.hxx> #include <vcl/help.hxx>
#include <cppuhelper/implbase.hxx>
#include <vector> #include <vector>
#include <com/sun/star/reflection/theCoreReflection.hpp> #include <com/sun/star/reflection/theCoreReflection.hpp>
@@ -176,7 +176,7 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, OUString& rVar, OUString&
class EditorWindow::ChangesListener: class EditorWindow::ChangesListener:
public cppu::WeakImplHelper1< beans::XPropertiesChangeListener > public cppu::WeakImplHelper< beans::XPropertiesChangeListener >
{ {
public: public:
explicit ChangesListener(EditorWindow & editor): editor_(editor) {} explicit ChangesListener(EditorWindow & editor): editor_(editor) {}

3
basctl/source/basicide/basidesh.cxx
View File

@@ -55,6 +55,7 @@
#include <sfx2/viewfac.hxx> #include <sfx2/viewfac.hxx>
#include <vcl/msgbox.hxx> #include <vcl/msgbox.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <cppuhelper/implbase.hxx>
namespace basctl namespace basctl
{ {
@@ -62,7 +63,7 @@ namespace basctl
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star; using namespace ::com::sun::star;
typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerBASE; typedef ::cppu::WeakImplHelper< container::XContainerListener > ContainerListenerBASE;
class ContainerListenerImpl : public ContainerListenerBASE class ContainerListenerImpl : public ContainerListenerBASE
{ {

6
basctl/source/basicide/doceventnotifier.cxx
View File

@@ -29,7 +29,7 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
namespace basctl namespace basctl
@@ -51,8 +51,8 @@ namespace basctl
// DocumentEventNotifier::Impl // DocumentEventNotifier::Impl
typedef ::cppu::WeakComponentImplHelper1 < XDocumentEventListener typedef ::cppu::WeakComponentImplHelper< XDocumentEventListener
> DocumentEventNotifier_Impl_Base; > DocumentEventNotifier_Impl_Base;
enum ListenerAction enum ListenerAction
{ {

5
basctl/source/basicide/moduldl2.cxx
View File

@@ -54,6 +54,7 @@
#include <com/sun/star/script/ModuleSizeExceededRequest.hpp> #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
#include <comphelper/propertysequence.hxx> #include <comphelper/propertysequence.hxx>
#include <cppuhelper/implbase.hxx>
namespace basctl namespace basctl
@@ -65,7 +66,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs;
typedef ::cppu::WeakImplHelper1< task::XInteractionHandler > HandlerImpl_BASE; typedef ::cppu::WeakImplHelper< task::XInteractionHandler > HandlerImpl_BASE;
namespace namespace
{ {
@@ -1165,7 +1166,7 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
} }
// Implementation XCommandEnvironment // Implementation XCommandEnvironment
typedef cppu::WeakImplHelper1< XCommandEnvironment > LibCommandEnvironmentHelper; typedef cppu::WeakImplHelper< XCommandEnvironment > LibCommandEnvironmentHelper;
class OLibCommandEnvironment : public LibCommandEnvironmentHelper class OLibCommandEnvironment : public LibCommandEnvironmentHelper
{ {

4
basctl/source/inc/dlgedclip.hxx
View File

@@ -21,7 +21,7 @@
#define INCLUDED_BASCTL_SOURCE_INC_DLGEDCLIP_HXX #define INCLUDED_BASCTL_SOURCE_INC_DLGEDCLIP_HXX
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
namespace basctl namespace basctl
{ {
@@ -30,7 +30,7 @@ namespace basctl
// DlgEdTransferableImpl // DlgEdTransferableImpl
typedef ::cppu::WeakImplHelper2< ::com::sun::star::datatransfer::XTransferable, ::com::sun::star::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper; typedef ::cppu::WeakImplHelper< ::com::sun::star::datatransfer::XTransferable, ::com::sun::star::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper;
class DlgEdTransferableImpl : public DlgEdTransferableHelper class DlgEdTransferableImpl : public DlgEdTransferableHelper
{ {

6
basctl/source/inc/dlgedlist.hxx
View File

@@ -20,7 +20,7 @@
#ifndef INCLUDED_BASCTL_SOURCE_INC_DLGEDLIST_HXX #ifndef INCLUDED_BASCTL_SOURCE_INC_DLGEDLIST_HXX
#define INCLUDED_BASCTL_SOURCE_INC_DLGEDLIST_HXX #define INCLUDED_BASCTL_SOURCE_INC_DLGEDLIST_HXX
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XContainerListener.hpp>
@@ -33,7 +33,7 @@ class DlgEdObj;
// DlgEdPropListenerImpl // DlgEdPropListenerImpl
typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener > PropertyChangeListenerHelper; typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener > PropertyChangeListenerHelper;
class DlgEdPropListenerImpl: public PropertyChangeListenerHelper class DlgEdPropListenerImpl: public PropertyChangeListenerHelper
{ {
@@ -56,7 +56,7 @@ public:
// DlgEdEvtContListenerImpl // DlgEdEvtContListenerImpl
typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > ContainerListenerHelper; typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
class DlgEdEvtContListenerImpl: public ContainerListenerHelper class DlgEdEvtContListenerImpl: public ContainerListenerHelper
{ {