summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-09-11 10:37:30 +0900
committerMichael Stahl <mstahl@redhat.com>2015-09-11 17:19:39 +0000
commit50b26404dee83974cf84749a9d492ed208464597 (patch)
tree9f2d96524259327ac48f443af72e2503fcd2bfaf /vcl/source/app
parent8358eadcbae4b1e20f85f31d0faf6b3fccf353eb (diff)
vcl: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants. Change-Id: I4499569f73b04cc7444787d51bf804c090a5c951 Reviewed-on: https://gerrit.libreoffice.org/18478 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/session.cxx6
-rw-r--r--vcl/source/app/svdata.cxx1
-rw-r--r--vcl/source/app/svmain.cxx6
3 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 5686ec15f40b..761224663a99 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -20,7 +20,7 @@
#include "sal/config.h"
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <tools/debug.hxx>
@@ -47,7 +47,7 @@ SalSession::~SalSession()
class VCLSession:
private cppu::BaseMutex,
- public cppu::WeakComponentImplHelper1 < XSessionManagerClient >
+ public cppu::WeakComponentImplHelper < XSessionManagerClient >
{
struct Listener
{
@@ -92,7 +92,7 @@ public:
};
VCLSession::VCLSession()
- : cppu::WeakComponentImplHelper1< XSessionManagerClient >( m_aMutex ),
+ : cppu::WeakComponentImplHelper< XSessionManagerClient >( m_aMutex ),
m_xSession( ImplGetSVData()->mpDefInst->CreateSalSession() ),
m_bInteractionRequested( false ),
m_bInteractionGranted( false ),
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index ca815a2f3103..56b2908e266d 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -27,7 +27,6 @@
#include <tools/debug.hxx>
#include <tools/resary.hxx>
#include <tools/gen.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <uno/current_context.hxx>
#include "vcl/configsettings.hxx"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index b5aca4281ae9..7a00b0e2467d 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -78,7 +78,7 @@
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/frame/Desktop.hpp"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include "uno/current_context.hxx"
#include "opengl/zone.hxx"
@@ -213,7 +213,7 @@ static Application * pOwnSvApp = NULL;
// Exception handler. pExceptionHandler != NULL => VCL already inited
static oslSignalHandler pExceptionHandler = NULL;
-class DesktopEnvironmentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >
+class DesktopEnvironmentContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext >
{
public:
explicit DesktopEnvironmentContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx)
@@ -312,7 +312,7 @@ namespace
a bundled extension is registered/deregistered during startup, forcing exit
while the app is still in splash screen.)
*/
-class VCLUnoWrapperDeleter : public cppu::WeakImplHelper1<com::sun::star::lang::XEventListener>
+class VCLUnoWrapperDeleter : public cppu::WeakImplHelper<com::sun::star::lang::XEventListener>
{
virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE;
};