diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-25 17:01:11 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-26 06:41:23 +0000 |
| commit | 03ddeb203171c0e435e2a544e06768d6f51196cb (patch) | |
| tree | c30dc4bca1be0826bdacd2ecf6d16bac6c6038e0 /reportdesign/source/filter/xml | |
| parent | 5ba6aafa20f78c6209c91a399a8110a415a274e1 (diff) | |
reportdesign: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Ib5335ab6e64ee407e3aa8f9558a24af40a308107
Reviewed-on: https://gerrit.libreoffice.org/17981
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign/source/filter/xml')
| -rw-r--r-- | reportdesign/source/filter/xml/dbloader2.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.hxx | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index edd8387d8624..d5fcdab115a3 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -45,7 +45,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <vcl/svapp.hxx> #include <ucbhelper/content.hxx> @@ -64,7 +64,7 @@ namespace rptxml { - class ORptTypeDetection : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo> + class ORptTypeDetection : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo> { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; public: diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 0d37284c0c47..190cbeb2f63c 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -32,8 +32,6 @@ #include <com/sun/star/report/XReportControlModel.hpp> #include <com/sun/star/report/XFormattedField.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase5.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <osl/diagnose.h> diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 6bba19178761..bfd381c310cf 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -27,8 +27,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase5.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/report/XReportDefinition.hpp> |