diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-11 11:02:33 +0900 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-09-11 17:16:17 +0000 |
commit | 8358eadcbae4b1e20f85f31d0faf6b3fccf353eb (patch) | |
tree | 6d97a23ad4e1791c6d9cc2f633764486c0ad1f6d /xmloff/source/forms | |
parent | f1f179ba0ff3d293e81c7b95554f8e6b140340d7 (diff) |
xmloff: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: I47002abab1e025d0683f4cf8ef7b6c99e668d425
Reviewed-on: https://gerrit.libreoffice.org/18479
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmloff/source/forms')
-rw-r--r-- | xmloff/source/forms/attriblistmerge.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/eventexport.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/gridcolumnproptranslator.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 576db3295a07..6ab49d88841d 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -24,7 +24,7 @@ #include <vector> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> @@ -32,7 +32,7 @@ namespace xmloff { //= OAttribListMerger - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::xml::sax::XAttributeList + typedef ::cppu::WeakImplHelper < ::com::sun::star::xml::sax::XAttributeList > OAttribListMerger_Base; /** implements the XAttributeList list by merging different source attribute lists diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index e1927d37cd1f..2bec21425bb7 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -28,13 +28,13 @@ #include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace xmloff { //= OEventDescriptorMapper - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace + typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameReplace > OEventDescriptorMapper_Base; /** helper class wrapping different script event representations diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index 5ee7db5e871f..4f5396564112 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -22,13 +22,13 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> namespace xmloff { //= OGridColumnPropertyTranslator - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertySet + typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet > OGridColumnPropertyTranslator_Base; class OGridColumnPropertyTranslator : public OGridColumnPropertyTranslator_Base |