summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-09-11 11:02:33 +0900
committerMichael Stahl <mstahl@redhat.com>2015-09-11 17:16:17 +0000
commit8358eadcbae4b1e20f85f31d0faf6b3fccf353eb (patch)
tree6d97a23ad4e1791c6d9cc2f633764486c0ad1f6d
parentf1f179ba0ff3d293e81c7b95554f8e6b140340d7 (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>
-rw-r--r--xmloff/inc/StyleMap.hxx4
-rw-r--r--xmloff/inc/XMLBasicExportFilter.hxx4
-rw-r--r--xmloff/inc/pch/precompiled_xo.hxx1
-rw-r--r--xmloff/source/chart/ColorPropertySet.cxx4
-rw-r--r--xmloff/source/chart/ColorPropertySet.hxx4
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx1
-rw-r--r--xmloff/source/core/xmlexp.cxx4
-rw-r--r--xmloff/source/core/xmlimp.cxx4
-rw-r--r--xmloff/source/draw/animationimport.cxx1
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx1
-rw-r--r--xmloff/source/draw/ximppage.cxx4
-rw-r--r--xmloff/source/forms/attriblistmerge.hxx4
-rw-r--r--xmloff/source/forms/eventexport.hxx4
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.hxx4
-rw-r--r--xmloff/source/transform/MutableAttrList.hxx4
-rw-r--r--xmloff/source/transform/Transformer.hxx4
16 files changed, 25 insertions, 27 deletions
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 1f3142a6aaac..04faf515f67f 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_XMLOFF_INC_STYLEMAP_HXX
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unordered_map>
struct StyleNameKey_Impl
@@ -63,7 +63,7 @@ inline bool StyleNameHash_Impl::operator()(
}
class StyleMap :
- public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>,
+ public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel>,
public std::unordered_map< StyleNameKey_Impl, OUString,
StyleNameHash_Impl, StyleNameHash_Impl >
{
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index e88751dde04f..a0b2644c81c0 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -21,11 +21,11 @@
#define INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
// class XMLBasicExportFilter
-typedef ::cppu::WeakImplHelper1<
+typedef ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
class XMLBasicExportFilter : public XMLBasicExportFilter_BASE
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 49a133d628ed..78573fcf08b3 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -500,6 +500,7 @@
#include <config_features.h>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index b8ff05c7e8d2..f0af27a79574 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -19,7 +19,7 @@
#include "ColorPropertySet.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
@@ -32,7 +32,7 @@ using ::com::sun::star::uno::RuntimeException;
namespace
{
-class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper1<
+class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper<
XPropertySetInfo >
{
public:
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index 9af8848016e1..448e1fffe6df 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -19,7 +19,7 @@
#ifndef XMLOFF_COLORPROPERTYSET_HXX
#define XMLOFF_COLORPROPERTYSET_HXX
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
@@ -29,7 +29,7 @@ namespace xmloff
namespace chart
{
-class ColorPropertySet : public ::cppu::WeakImplHelper2<
+class ColorPropertySet : public ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertySet,
::com::sun::star::beans::XPropertyState >
{
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index a17e1cfb838b..06e8771172d9 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -34,7 +34,6 @@
#include <xmloff/prstylei.hxx>
#include <xmloff/xmlstyle.hxx>
#include "xexptran.hxx"
-#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 91f73b73e72e..c0f556c9b5d0 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -70,7 +70,7 @@
#include <xmloff/XMLEmbeddedObjectExportFilter.hxx>
#include "XMLBasicExportFilter.hxx"
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/servicehelper.hxx>
@@ -206,7 +206,7 @@ Reference< XComponentContext > SettingsExportFacade::GetComponentContext() const
return m_rExport.getComponentContext();
}
-class SvXMLExportEventListener : public cppu::WeakImplHelper1<
+class SvXMLExportEventListener : public cppu::WeakImplHelper<
com::sun::star::lang::XEventListener >
{
private:
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 9108fc760ab0..7a56898e6d61 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -48,7 +48,7 @@
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <comphelper/namecontainer.hxx>
#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
@@ -105,7 +105,7 @@ sal_Char const sXML_np__field[] = "_field";
sal_Char const sXML_np__xhtml[] = "_xhtml";
sal_Char const sXML_np__css3text[] = "_css3text";
-class SvXMLImportEventListener : public cppu::WeakImplHelper1<
+class SvXMLImportEventListener : public cppu::WeakImplHelper<
com::sun::star::lang::XEventListener >
{
private:
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 495441ef2173..5bc91ff0ca50 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/presentation/EffectCommands.hpp>
#include <com/sun/star/util/Duration.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <sax/tools/converter.hxx>
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index fa86bafaed48..5e4abe4fc7ee 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -64,7 +64,6 @@
#include "facreg.hxx"
#include "xexptran.hxx"
-#include <cppuhelper/implbase1.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index 14c816d30ce4..25f7e66eef2c 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sax/tools/converter.hxx>
#include "XMLNumberStylesImport.hxx"
#include <xmloff/xmlstyle.hxx>
@@ -533,7 +533,7 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName )
}
}
-class XoNavigationOrderAccess : public ::cppu::WeakImplHelper1< XIndexAccess >
+class XoNavigationOrderAccess : public ::cppu::WeakImplHelper< XIndexAccess >
{
public:
explicit XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes );
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
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index eb287c52f71b..75b5759ffc49 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -24,11 +24,11 @@
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
class SvXMLAttributeList;
-class XMLMutableAttributeList : public ::cppu::WeakImplHelper3<
+class XMLMutableAttributeList : public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XAttributeList,
::com::sun::star::util::XCloneable,
::com::sun::star::lang::XUnoTunnel>
diff --git a/xmloff/source/transform/Transformer.hxx b/xmloff/source/transform/Transformer.hxx
index 43771546a401..cf589ea991c2 100644
--- a/xmloff/source/transform/Transformer.hxx
+++ b/xmloff/source/transform/Transformer.hxx
@@ -24,9 +24,9 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
-class XMLTransformer : public ::cppu::WeakImplHelper4<
+class XMLTransformer : public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XExtendedDocumentHandler,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization,