diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-20 09:30:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-20 10:08:45 +0000 |
| commit | f2cff6567b47f7898eb5e90a0abbcc1ded7568ef (patch) | |
| tree | 71e7eec2ce34a0558a7f88f9005dc233b6543851 /reportdesign | |
| parent | f05061f91260262e149e2777ac8062f1619758d8 (diff) | |
Base Im-/ExportDocumentHandler on WeakImplHelper
...rather than on the deprecated WeakAggImplHelper3.
It was found that those two classes were implementing queryInterface in a way
that is incompatible with the XAggregation protocol inherited via
WeakAggImplHelper3. It looks like no code actually made use of the XAggregation
offered by these classes, so the easiest fix for those queryInterface
implementations appears to switch from WeakAggImplHelper3 to WeakImplHelper
(thereby dropping XAggregation, and thus rendering the existing queryInterface
implementations OK).
Change-Id: I8f841ca959838d9a87943091b76f3ce1cf8c9303
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145866
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index c6b34af02e22..87959ccea7e1 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -21,7 +21,7 @@ #include <sal/config.h> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -36,9 +36,9 @@ namespace rptxml OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute); -typedef ::cppu::WeakAggImplHelper3< css::xml::sax::XDocumentHandler - , css::lang::XInitialization - , css::lang::XServiceInfo> ExportDocumentHandler_BASE; +typedef ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler + , css::lang::XInitialization + , css::lang::XServiceInfo> ExportDocumentHandler_BASE; class ExportDocumentHandler : public ExportDocumentHandler_BASE { diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index ed1d6af92c8f..73eeab8df376 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -21,7 +21,7 @@ #include <sal/config.h> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -36,9 +36,9 @@ class SvXMLTokenMap; namespace rptxml { -typedef ::cppu::WeakAggImplHelper3< css::xml::sax::XDocumentHandler - , css::lang::XInitialization - , css::lang::XServiceInfo> ImportDocumentHandler_BASE; +typedef ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler + , css::lang::XInitialization + , css::lang::XServiceInfo> ImportDocumentHandler_BASE; class ImportDocumentHandler : public ImportDocumentHandler_BASE { |