[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/qa vcl/source vcl/unx
Takeshi Abe
tabe at fixedpoint.jp
Fri Sep 11 10:20:11 PDT 2015
vcl/inc/canvasbitmap.hxx | 4 ++--
vcl/inc/displayconnectiondispatch.hxx | 4 ++--
vcl/inc/dndevdis.hxx | 4 ++--
vcl/inc/dndlcon.hxx | 4 ++--
vcl/inc/osx/a11ylistener.hxx | 4 ++--
vcl/inc/pch/precompiled_vcl.hxx | 7 ++-----
vcl/osx/DragSource.cxx | 2 +-
vcl/osx/DragSource.hxx | 4 ++--
vcl/osx/DragSourceContext.cxx | 2 +-
vcl/osx/DragSourceContext.hxx | 5 ++---
vcl/osx/DropTarget.cxx | 2 +-
vcl/osx/DropTarget.hxx | 4 ++--
vcl/osx/OSXTransferable.hxx | 4 ++--
vcl/osx/clipboard.cxx | 2 +-
vcl/osx/clipboard.hxx | 4 ++--
vcl/osx/documentfocuslistener.hxx | 4 ++--
vcl/qa/cppunit/canvasbitmaptest.cxx | 4 ++--
vcl/qa/cppunit/dndtest.cxx | 7 +++----
vcl/source/app/session.cxx | 6 +++---
vcl/source/app/svdata.cxx | 1 -
vcl/source/app/svmain.cxx | 6 +++---
vcl/source/components/dtranscomp.cxx | 3 +--
vcl/source/filter/graphicfilter.cxx | 4 ++--
vcl/source/gdi/pdfwriter_impl.cxx | 4 ++--
vcl/source/gdi/pdfwriter_impl2.cxx | 4 ++--
vcl/source/helper/canvastools.cxx | 4 ++--
vcl/source/window/dndlcon.cxx | 2 +-
vcl/unx/generic/dtrans/X11_clipboard.cxx | 2 +-
vcl/unx/generic/dtrans/X11_clipboard.hxx | 4 ++--
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 8 ++++----
vcl/unx/generic/dtrans/X11_droptarget.cxx | 2 +-
vcl/unx/generic/dtrans/X11_selection.cxx | 2 +-
vcl/unx/generic/dtrans/X11_selection.hxx | 10 +++++-----
vcl/unx/generic/dtrans/X11_service.cxx | 1 -
vcl/unx/generic/dtrans/X11_transferable.hxx | 4 ++--
vcl/unx/gtk/a11y/atklistener.hxx | 4 ++--
vcl/unx/gtk/a11y/atkutil.cxx | 4 ++--
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 4 ++--
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 4 ++--
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 2 +-
vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 4 ++--
vcl/unx/gtk3/app/gtk3gtkinst.cxx | 4 ++--
vcl/unx/kde/UnxFilePicker.hxx | 4 ++--
vcl/unx/kde4/KDE4FilePicker.hxx | 4 ++--
44 files changed, 82 insertions(+), 90 deletions(-)
New commits:
commit 50b26404dee83974cf84749a9d492ed208464597
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Sep 11 10:37:30 2015 +0900
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 at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index bd00fb7..7b9174a 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_INC_CANVASBITMAP_HXX
#define INCLUDED_VCL_INC_CANVASBITMAP_HXX
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
#include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -34,7 +34,7 @@ namespace vcl
namespace unotools
{
class VCL_DLLPUBLIC VclCanvasBitmap :
- public cppu::WeakImplHelper3< com::sun::star::rendering::XIntegerReadOnlyBitmap,
+ public cppu::WeakImplHelper< com::sun::star::rendering::XIntegerReadOnlyBitmap,
com::sun::star::rendering::XBitmapPalette,
com::sun::star::rendering::XIntegerBitmapColorSpace >
{
diff --git a/vcl/inc/displayconnectiondispatch.hxx b/vcl/inc/displayconnectiondispatch.hxx
index 564111e..b1e36d3 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -23,12 +23,12 @@
#include <sal/config.h>
#include <com/sun/star/awt/XDisplayConnection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace vcl {
class DisplayConnectionDispatch:
- public cppu::WeakImplHelper1< com::sun::star::awt::XDisplayConnection >
+ public cppu::WeakImplHelper< com::sun::star::awt::XDisplayConnection >
{
public:
virtual bool dispatchEvent(void * pData, int nBytes) = 0;
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index b542581..4d5df39 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -24,10 +24,10 @@
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vcl/window.hxx>
-class DNDEventDispatcher: public ::cppu::WeakImplHelper3<
+class DNDEventDispatcher: public ::cppu::WeakImplHelper<
::com::sun::star::datatransfer::dnd::XDropTargetListener,
::com::sun::star::datatransfer::dnd::XDropTargetDragContext,
::com::sun::star::datatransfer::dnd::XDragGestureListener >
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index b2febee..d6e3cab 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
@@ -25,12 +25,12 @@
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <vcl/unohelp2.hxx>
class DNDListenerContainer : public vcl::unohelper::MutexHelper,
- public ::cppu::WeakComponentImplHelper4<
+ public ::cppu::WeakComponentImplHelper<
::com::sun::star::datatransfer::dnd::XDragGestureRecognizer, \
::com::sun::star::datatransfer::dnd::XDropTargetDragContext,
::com::sun::star::datatransfer::dnd::XDropTargetDropContext,
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index 1861299..c20f423 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "a11yfocustracker.hxx"
#include "osxvcltypes.h"
@@ -31,7 +31,7 @@
// - AquaA11yEventListener -
class AquaA11yEventListener :
- public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
+ public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener >
{
public:
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 62f6612..ac10eef 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -70,9 +70,6 @@
#include "com/sun/star/view/DuplexMode.hpp"
#include "comphelper/processfactory.hxx"
#include "comphelper/solarmutex.hxx"
-#include "cppuhelper/compbase1.hxx"
-#include "cppuhelper/compbase2.hxx"
-#include "cppuhelper/implbase1.hxx"
#include "i18nlangtag/languagetag.hxx"
#include "i18nlangtag/mslangid.hxx"
#include "i18nutil/unicode.hxx"
@@ -279,9 +276,9 @@
#include <config_folders.h>
#include <config_graphite.h>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 5ac5b3c..30818cf 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -143,7 +143,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
@end
DragSource::DragSource():
- WeakComponentImplHelper3<XDragSource, XInitialization, XServiceInfo>(m_aMutex),
+ WeakComponentImplHelper<XDragSource, XInitialization, XServiceInfo>(m_aMutex),
mView(NULL),
mpFrame(NULL),
mLastMouseEventBeforeStartDrag(nil),
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index 45fc71c..58b18c1 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -70,7 +70,7 @@ class AquaSalFrame;
@end
class DragSource : public ::cppu::BaseMutex,
- public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::dnd::XDragSource,
+ public ::cppu::WeakComponentImplHelper< com::sun::star::datatransfer::dnd::XDragSource,
com::sun::star::lang::XInitialization,
com::sun::star::lang::XServiceInfo >,
private ::boost::noncopyable
diff --git a/vcl/osx/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx
index ac3b922..319e969 100644
--- a/vcl/osx/DragSourceContext.cxx
+++ b/vcl/osx/DragSourceContext.cxx
@@ -27,7 +27,7 @@ using namespace com::sun::star::uno;
using namespace cppu;
DragSourceContext::DragSourceContext() :
- WeakComponentImplHelper1<XDragSourceContext>(m_aMutex)
+ WeakComponentImplHelper<XDragSourceContext>(m_aMutex)
{
}
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index f8f603b..2cecf2d 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -20,9 +20,8 @@
#ifndef INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
#define INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <boost/noncopyable.hpp>
@@ -34,7 +33,7 @@
// An instance of SourceContext only lives as long as the drag and drop
// operation lasts.
class DragSourceContext: public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper1<com::sun::star::datatransfer::dnd::XDragSourceContext>,
+ public cppu::WeakComponentImplHelper<com::sun::star::datatransfer::dnd::XDragSourceContext>,
private ::boost::noncopyable
{
public:
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index 79b1fc4..a90c1d8 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -116,7 +116,7 @@ namespace /* private */
@end
DropTarget::DropTarget() :
- WeakComponentImplHelper5<XInitialization, XDropTarget, XDropTargetDragContext, XDropTargetDropContext, XServiceInfo>(m_aMutex),
+ WeakComponentImplHelper<XInitialization, XDropTarget, XDropTargetDragContext, XDropTargetDropContext, XServiceInfo>(m_aMutex),
mView(nil),
mpFrame(NULL),
mDropTargetHelper(nil),
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index 9223fb3..d592bf1 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_OSX_DROPTARGET_HXX
#include "DataFlavorMapping.hxx"
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
@@ -73,7 +73,7 @@ class AquaSalFrame;
@end
class DropTarget: public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization,
+ public cppu::WeakComponentImplHelper< com::sun::star::lang::XInitialization,
com::sun::star::datatransfer::dnd::XDropTarget,
com::sun::star::datatransfer::dnd::XDropTargetDragContext,
com::sun::star::datatransfer::dnd::XDropTargetDropContext,
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 092e0dc..79ae6be 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_OSX_OSXTRANSFERABLE_HXX
#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
#include <com/sun/star/datatransfer/XMimeContentType.hpp>
@@ -35,7 +35,7 @@
#include <boost/noncopyable.hpp>
#include <vector>
-class OSXTransferable : public ::cppu::WeakImplHelper1<com::sun::star::datatransfer::XTransferable>,
+class OSXTransferable : public ::cppu::WeakImplHelper<com::sun::star::datatransfer::XTransferable>,
private ::boost::noncopyable
{
public:
diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx
index 008ec32..52943a9 100644
--- a/vcl/osx/clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -78,7 +78,7 @@ Sequence<OUString> clipboard_getSupportedServiceNames()
}
AquaClipboard::AquaClipboard(NSPasteboard* pasteboard, bool bUseSystemPasteboard) :
- WeakComponentImplHelper3<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex),
+ WeakComponentImplHelper<XSystemClipboard, XFlushableClipboard, XServiceInfo>(m_aMutex),
mIsSystemPasteboard(bUseSystemPasteboard)
{
Reference<XComponentContext> xContext = comphelper::getProcessComponentContext();
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index 3444c70..8d66d16 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -23,7 +23,7 @@
#include "DataFlavorMapping.hxx"
#include <rtl/ustring.hxx>
#include <sal/types.h>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
@@ -63,7 +63,7 @@ class AquaClipboard;
@end
class AquaClipboard : public ::cppu::BaseMutex,
- public ::cppu::WeakComponentImplHelper3< com::sun::star::datatransfer::clipboard::XSystemClipboard,
+ public ::cppu::WeakComponentImplHelper< com::sun::star::datatransfer::clipboard::XSystemClipboard,
com::sun::star::datatransfer::clipboard::XFlushableClipboard,
com::sun::star::lang::XServiceInfo >,
private ::boost::noncopyable
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 002819c..1c572f3 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "osx/a11yfocustracker.hxx"
@@ -31,7 +31,7 @@
// - DocumentFocusListener -
class DocumentFocusListener :
- public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
+ public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener >
{
public:
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 07f2a51..2c4978b 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -28,7 +28,7 @@
#include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
#include <com/sun/star/rendering/XBitmapPalette.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/ref.hxx>
@@ -232,7 +232,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp,
}
}
-class TestBitmap : public cppu::WeakImplHelper3< rendering::XIntegerReadOnlyBitmap,
+class TestBitmap : public cppu::WeakImplHelper< rendering::XIntegerReadOnlyBitmap,
rendering::XBitmapPalette,
rendering::XIntegerBitmapColorSpace >
{
diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx
index 64da307..66cc9a1 100644
--- a/vcl/qa/cppunit/dndtest.cxx
+++ b/vcl/qa/cppunit/dndtest.cxx
@@ -26,8 +26,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/lstbox.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -59,7 +58,7 @@ public:
void Resize();
};
-class MyDragAndDropListener: public ::cppu::WeakImplHelper3 < XDropTargetListener, XDragGestureListener, XDragSourceListener >
+class MyDragAndDropListener: public ::cppu::WeakImplHelper < XDropTargetListener, XDragGestureListener, XDragSourceListener >
{
vcl::Window * m_pWindow;
@@ -97,7 +96,7 @@ public:
explicit MyListBox( vcl::Window* pParent );
};
-class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable >
+class StringTransferable : public ::cppu::WeakImplHelper< XTransferable >
{
const OUString m_aData;
Sequence< DataFlavor > m_aFlavorList;
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 5686ec1..7612246 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 ca815a2..56b2908 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 b5aca42..7a00b0e 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;
};
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 53c90ca..312ffa2 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -40,8 +40,7 @@
#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
-#include "cppuhelper/compbase.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star;
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 997cc56..45480f4 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -23,7 +23,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include <ucbhelper/content.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <tools/urlobj.hxx>
#include <tools/zcodec.hxx>
#include <tools/fract.hxx>
@@ -88,7 +88,7 @@ static ::osl::Mutex& getListMutex()
return s_aListProtection;
}
-class ImpFilterOutputStream : public ::cppu::WeakImplHelper1< css::io::XOutputStream >
+class ImpFilterOutputStream : public ::cppu::WeakImplHelper< css::io::XOutputStream >
{
protected:
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3233513..9fdd688 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -36,7 +36,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/random.hxx>
#include <comphelper/string.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/numeric.hxx>
#include <osl/file.hxx>
@@ -8238,7 +8238,7 @@ void PDFWriterImpl::sortWidgets()
namespace vcl {
class PDFStreamIf :
- public cppu::WeakImplHelper1< com::sun::star::io::XOutputStream >
+ public cppu::WeakImplHelper< com::sun::star::io::XOutputStream >
{
PDFWriterImpl* m_pWriter;
bool m_bWrite;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 95f07fa..6a1d1b6 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -39,7 +39,7 @@
#include "com/sun/star/graphic/GraphicProvider.hpp"
#include "com/sun/star/graphic/XGraphicProvider.hpp"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include <rtl/digest.h>
#include <memory>
@@ -1068,7 +1068,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
is not sufficient, since an rtl MD5 digest cannot be created in an arbitrary state
which would be needed in PDFWriterImpl::computeEncryptionKey.
*/
-class EncHashTransporter : public cppu::WeakImplHelper1 < com::sun::star::beans::XMaterialHolder >
+class EncHashTransporter : public cppu::WeakImplHelper < com::sun::star::beans::XMaterialHolder >
{
rtlDigest maUDigest;
sal_IntPtr maID;
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index f8dbf63..4c8ee66 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/geometry/RealSize2D.hpp>
#include <com/sun/star/geometry/RealPoint2D.hpp>
@@ -417,7 +417,7 @@ namespace vcl
namespace
{
- class StandardColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XColorSpace >
+ class StandardColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XColorSpace >
{
private:
uno::Sequence< sal_Int8 > m_aComponentTags;
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index 54b9939..24503c4 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::dnd;
DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions )
- : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex())
+ : WeakComponentImplHelper< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex())
{
m_bActive = true;
m_nDefaultActions = nDefaultActions;
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index f947345..0ec568f 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -46,7 +46,7 @@ using namespace osl;
using namespace x11;
X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
- ::cppu::WeakComponentImplHelper2<
+ ::cppu::WeakComponentImplHelper<
::com::sun::star::datatransfer::clipboard::XSystemClipboard,
::com::sun::star::lang::XServiceInfo
>( rManager.getMutex() ),
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index ba83636..fc1e4db 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -25,14 +25,14 @@
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
#include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport"
namespace x11 {
class X11Clipboard :
- public ::cppu::WeakComponentImplHelper2 <
+ public ::cppu::WeakComponentImplHelper <
css::datatransfer::clipboard::XSystemClipboard,
css::lang::XServiceInfo
>,
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index 9fac72f..4174b34 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <prex.h>
#include <X11/Xlib.h>
@@ -34,7 +34,7 @@ namespace x11 {
class SelectionManager;
class DropTargetDropContext :
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::com::sun::star::datatransfer::dnd::XDropTargetDropContext
>
{
@@ -53,7 +53,7 @@ namespace x11 {
};
class DropTargetDragContext :
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::com::sun::star::datatransfer::dnd::XDropTargetDragContext
>
{
@@ -71,7 +71,7 @@ namespace x11 {
};
class DragSourceContext :
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::com::sun::star::datatransfer::dnd::XDragSourceContext
>
{
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index eb726e8..98fcb7e 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::dnd;
DropTarget::DropTarget() :
- ::cppu::WeakComponentImplHelper3<
+ ::cppu::WeakComponentImplHelper<
XDropTarget,
XInitialization,
XServiceInfo
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index a323791..425cfc2 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3975,7 +3975,7 @@ css::uno::Reference< XInterface > SelectionManager::getReference() throw()
*/
SelectionManagerHolder::SelectionManagerHolder() :
- ::cppu::WeakComponentImplHelper3<
+ ::cppu::WeakComponentImplHelper<
XDragSource,
XInitialization,
XServiceInfo > (m_aMutex)
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index f91d0fd..d7ec585 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_SELECTION_HXX
#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_SELECTION_HXX
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
@@ -66,7 +66,7 @@ namespace x11 {
};
class DropTarget :
- public ::cppu::WeakComponentImplHelper3<
+ public ::cppu::WeakComponentImplHelper<
css::datatransfer::dnd::XDropTarget,
css::lang::XInitialization,
css::lang::XServiceInfo
@@ -111,7 +111,7 @@ namespace x11 {
};
class SelectionManagerHolder :
- public ::cppu::WeakComponentImplHelper3<
+ public ::cppu::WeakComponentImplHelper<
css::datatransfer::dnd::XDragSource,
css::lang::XInitialization,
css::lang::XServiceInfo
@@ -146,7 +146,7 @@ namespace x11 {
};
class SelectionManager :
- public ::cppu::WeakImplHelper4<
+ public ::cppu::WeakImplHelper<
css::datatransfer::dnd::XDragSource,
css::lang::XInitialization,
css::awt::XEventHandler,
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 3b8f45b..5a2d42b 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -26,7 +26,6 @@
#include <uno/dispatcher.h>
#include <uno/mapping.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/compbase1.hxx>
using namespace cppu;
using namespace com::sun::star::uno;
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index eeccaf0..e13797d 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace x11 {
- class X11Transferable : public ::cppu::WeakImplHelper1 <
+ class X11Transferable : public ::cppu::WeakImplHelper <
::com::sun::star::datatransfer::XTransferable >
{
SelectionManager& m_rManager;
diff --git a/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index e47f622..4340507 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.hxx
@@ -21,13 +21,13 @@
#define INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <vector>
#include "atkwrapper.hxx"
-class AtkListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
+class AtkListener : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleEventListener >
{
public:
explicit AtkListener(AtkObjectWrapper * pWrapper);
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 57556ac..c3eb4a5 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -29,7 +29,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
@@ -125,7 +125,7 @@ atk_wrapper_focus_tracker_notify_when_idle( const uno::Reference< accessibility:
/*****************************************************************************/
class DocumentFocusListener :
- public ::cppu::WeakImplHelper1< accessibility::XAccessibleEventListener >
+ public ::cppu::WeakImplHelper< accessibility::XAccessibleEventListener >
{
std::set< uno::Reference< uno::XInterface > > m_aRefList;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index ec1e07a..1830f21 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
@@ -45,7 +45,7 @@ typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // c
// class declaration
-typedef cppu::WeakComponentImplHelper5<
+typedef cppu::WeakComponentImplHelper<
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
::com::sun::star::ui::dialogs::XFilePreview,
::com::sun::star::ui::dialogs::XFilePicker2,
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index 0744bcd..e438d33 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -23,13 +23,13 @@
#include <list>
#include <memory>
#include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include "gtk/fpicker/SalGtkPicker.hxx"
class SalGtkFolderPicker :
public SalGtkPicker,
- public cppu::WeakImplHelper1<
+ public cppu::WeakImplHelper<
::com::sun::star::ui::dialogs::XFolderPicker2 >
{
public:
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 6f9cfb2..87c41b2 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -122,7 +122,7 @@ GtkWindow* RunDialog::GetTransientFor()
RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit,
uno::Reference< frame::XDesktop >& rDesktop ) :
- cppu::WeakComponentImplHelper2< awt::XTopWindowListener, frame::XTerminateListener >( maLock ),
+ cppu::WeakComponentImplHelper< awt::XTopWindowListener, frame::XTerminateListener >( maLock ),
mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop)
{
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index dd98b3a..3e40452 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKPICKER_HXX
#include <osl/mutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/XTopWindowListener.hpp>
#include <com/sun/star/awt/XExtendedToolkit.hpp>
@@ -72,7 +72,7 @@ class SalGtkPicker
//to happen while we're opened waiting for user input, e.g.
//https://bugzilla.redhat.com/show_bug.cgi?id=441108
class RunDialog :
- public cppu::WeakComponentImplHelper2<
+ public cppu::WeakComponentImplHelper<
::com::sun::star::awt::XTopWindowListener,
::com::sun::star::frame::XTerminateListener >
{
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 1656b0f..9d5438d 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -26,7 +26,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include "cppuhelper/compbase.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star;
@@ -93,7 +93,7 @@ namespace
};
}
-class GtkTransferable : public ::cppu::WeakImplHelper1 <
+class GtkTransferable : public ::cppu::WeakImplHelper <
css::datatransfer::XTransferable >
{
private:
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 8371d0f..8a80f6e 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_UNX_KDE_UNXFILEPICKER_HXX
#define INCLUDED_VCL_UNX_KDE_UNXFILEPICKER_HXX
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/conditn.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
@@ -45,7 +45,7 @@ protected:
osl::Mutex m_rbHelperMtx;
};
-typedef ::cppu::WeakComponentImplHelper5<
+typedef ::cppu::WeakComponentImplHelper<
::com::sun::star::ui::dialogs::XFilePicker2,
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index c414aca..c29f4d8 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -41,7 +41,7 @@ class KFileDialog;
class QWidget;
class QLayout;
-typedef ::cppu::WeakComponentImplHelper5
+typedef ::cppu::WeakComponentImplHelper
< ::com::sun::star::ui::dialogs::XFilePicker2
, ::com::sun::star::ui::dialogs::XFilePicker3
, ::com::sun::star::ui::dialogs::XFilePickerControlAccess
More information about the Libreoffice-commits
mailing list