diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-29 20:28:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-03-30 09:39:39 +0200 |
| commit | fc6d597a933f9ca71b479864b31682dac17724c3 (patch) | |
| tree | 9d0dc9d4b85171ec2916397ec97bb19cefdd90b6 /chart2 | |
| parent | 78f7bd90b96ac168fdacd1e0cb0693ab3861872a (diff) | |
Related: tdf#117162 use a marginally tidier but riskier fix for trunk
Change-Id: I94a836d7424eb561af623fee9d3a7e6d307cf065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132287
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/Library_chartcore.mk | 1 | ||||
| -rw-r--r-- | chart2/source/model/filter/XMLFilter.cxx | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 1b2a4b79e1d6..a9a23159b436 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,chartcore,\ ucbhelper \ utl \ vcl \ - xo \ )) $(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore,services)) diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 145d4e4a900b..0f061c66121b 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> @@ -50,7 +49,6 @@ #include <com/sun/star/document/GraphicStorageHandler.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> -#include <xmloff/SchXMLImportHelper.hxx> using namespace ::com::sun::star; @@ -450,14 +448,6 @@ ErrCode XMLFilter::impl_ImportStream( { try { - // tdf#117162 reportbuilder expects setDataProvider to be called before ctor - if (m_sDocumentHandler == "com.sun.star.comp.report.ImportDocumentHandler") - { - css::uno::Reference<css::chart2::XChartDocument> xChart(m_xTargetDoc, uno::UNO_QUERY); - if (xChart) - setDataProvider(xChart, OUString()); - } - uno::Sequence< uno::Any > aArgs{ uno::Any(beans::NamedValue("DocumentHandler", uno::Any(xFilter))), uno::Any(beans::NamedValue("Model", uno::Any(m_xTargetDoc))) |