diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-16 17:43:53 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-17 07:14:22 +0000 |
| commit | a175788dcd3edd4c82f70458f0fa6e7b44d86526 (patch) | |
| tree | 91ffee44515de21f912595f6112b2a418c1b35ea /cui/source | |
| parent | 7fa29ecc727c04159cee92aebc14fc5b1037a965 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 4 | ||||
| -rw-r--r-- | cui/source/options/personasdochandler.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 6e1979b37187..148f9a2f988d 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 238345246803..94c69f403fe7 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; |