cppcanvas/source/uno/uno_mtfrenderer.hxx | 4 ++-- cpputools/source/unoexe/unoexe.cxx | 6 +++--- cui/source/dialogs/colorpicker.cxx | 4 ++-- cui/source/options/personasdochandler.hxx | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit a175788dcd3edd4c82f70458f0fa6e7b44d86526 Author: Takeshi Abe <[email protected]> Date: Thu Jul 16 17:43:53 2015 +0900 tdf#88206 replace cppu::WeakImplHelper* etc. with the variadic variants, in cppcanvas / cpputools / cui. Change-Id: Ic28d0830ab86555494004c27b1468de2ea6825dc Reviewed-on: https://gerrit.libreoffice.org/17119 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx index 821cf4f..428e9b3 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.hxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx @@ -13,11 +13,11 @@ #include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <vcl/gdimtf.hxx> -typedef cppu::WeakComponentImplHelper2<com::sun::star::rendering::XMtfRenderer, com::sun::star::beans::XFastPropertySet> MtfRendererBase; +typedef cppu::WeakComponentImplHelper<com::sun::star::rendering::XMtfRenderer, com::sun::star::beans::XFastPropertySet> MtfRendererBase; class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase { diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index b292deb..a898763 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -30,7 +30,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/bootstrap.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XMain.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -252,7 +252,7 @@ static Reference< XInterface > loadComponent( } class OInstanceProvider - : public WeakImplHelper1< XInstanceProvider > + : public WeakImplHelper< XInstanceProvider > { Reference< XComponentContext > _xContext; @@ -348,7 +348,7 @@ Reference< XInterface > OInstanceProvider::getInstance( const OUString & rName ) "no such element \"" + rName + "\"!" ); } -struct ODisposingListener : public WeakImplHelper1< XEventListener > +struct ODisposingListener : public WeakImplHelper< XEventListener > { Condition cDisposed; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 6e1979b..148f9a2 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/broadcasthelper.hxx> #include <vcl/dialog.hxx> @@ -1508,7 +1508,7 @@ void ColorPickerDialog::setColorComponent( sal_uInt16 nComp, double dValue ) } } -typedef ::cppu::WeakComponentImplHelper4< XServiceInfo, XExecutableDialog, XInitialization, XPropertyAccess > ColorPickerBase; +typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, XInitialization, XPropertyAccess > ColorPickerBase; class ColorPicker : protected ::comphelper::OBaseMutex, // Struct for right initalization of mutex member! Must be first of baseclasses. public ColorPickerBase diff --git a/cui/source/options/personasdochandler.hxx b/cui/source/options/personasdochandler.hxx index 2383452..94c69f4 100644 --- a/cui/source/options/personasdochandler.hxx +++ b/cui/source/options/personasdochandler.hxx @@ -10,12 +10,12 @@ #ifndef INCLUDED_CUI_SOURCE_OPTIONS_PERSONASDOCHANDLER_HXX #define INCLUDED_CUI_SOURCE_OPTIONS_PERSONASDOCHANDLER_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/sax/XParser.hpp> #include <vector> -class PersonasDocHandler : public ::cppu::WeakImplHelper1< css::xml::sax::XDocumentHandler > +class PersonasDocHandler : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { private: std::vector<OUString> m_vLearnmoreURLs; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
