[Libreoffice-commits] core.git: Branch 'feature/wasm' - oox/Library_oox.mk oox/source postprocess/Rdb_services.mk RepositoryModule_host.mk solenv/bin sw/source xmloff/Library_xof.mk xmloff/Library_xo.mk xmloff/source xmloff/util
Armin Le Grand (Allotropia) (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 5 11:52:04 UTC 2021
RepositoryModule_host.mk | 8 -
oox/Library_oox.mk | 50 +++---
oox/source/drawingml/shape.cxx | 7
oox/source/export/shapes.cxx | 5
oox/source/ppt/pptimport.cxx | 6
oox/source/shape/ShapeFilterBase.cxx | 5
postprocess/Rdb_services.mk | 8 -
solenv/bin/native-code.py | 180 ++++++++++++-------------
sw/source/filter/ww8/docxexport.cxx | 5
xmloff/Library_xo.mk | 11 +
xmloff/Library_xof.mk | 15 +-
xmloff/source/core/xmlexp.cxx | 5
xmloff/source/core/xmlimp.cxx | 7
xmloff/source/draw/shapeexport.cxx | 7
xmloff/source/draw/ximpshap.cxx | 6
xmloff/source/style/xmlstyle.cxx | 7
xmloff/source/transform/xof.component | 20 --
xmloff/source/transform/xof.extended.component | 42 +++++
xmloff/util/xo.component | 44 ------
xmloff/util/xo.extended.component | 66 +++++++++
20 files changed, 322 insertions(+), 182 deletions(-)
New commits:
commit fa86c5bc36f79c5cece9b563ac6d6fce3dd1f5c7
Author: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Wed May 5 13:48:25 2021 +0200
Commit: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Wed May 5 13:48:25 2021 +0200
Chart wasm optional removal
Used "WASM_CHART change" as markerfor later changes,
added TODO hints, too. Services and Libraries removed.
Imports may need extension to show replacement graphic,
exports should not happen at all due to not being able
to create chart models
Change-Id: I55633af3bddf831f8ceb97f0a73018fd26f051d1
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index ff07e415e25f..bf8e048537c1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -20,6 +20,13 @@ $(eval $(call gb_Module_add_targets,libreoffice,\
))
endif
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Module_add_moduledirs,libreoffice,\
+ chart2 \
+))
+endif
+
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
android \
@@ -32,7 +39,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
binaryurp \
bridges \
canvas \
- chart2 \
cli_ure \
$(call gb_Helper_optional,DESKTOP,codemaker) \
comphelper \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 287a4bb70003..a94093ebd3ce 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -83,28 +83,10 @@ endif
$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
$(eval $(call gb_Library_add_exception_objects,oox,\
- oox/source/core/binarycodec \
- oox/source/core/contexthandler2 \
- oox/source/core/contexthandler \
- oox/source/core/fastparser \
- oox/source/core/fasttokenhandler \
- oox/source/core/filterbase \
- oox/source/core/filterdetect \
- oox/source/core/fragmenthandler2 \
- oox/source/core/fragmenthandler \
- oox/source/core/recordparser \
- oox/source/core/relations \
- oox/source/core/relationshandler \
- oox/source/core/xmlfilterbase \
- oox/source/crypto/AgileEngine \
- oox/source/crypto/CryptTools \
- oox/source/crypto/DocumentEncryption \
- oox/source/crypto/DocumentDecryption \
- oox/source/crypto/Standard2007Engine \
- oox/source/crypto/StrongEncryptionDataSpace \
- oox/source/docprop/docprophandler \
- oox/source/docprop/ooxmldocpropimport \
+ oox/source/export/chartexport \
oox/source/drawingml/chart/axiscontext \
oox/source/drawingml/chart/axisconverter \
oox/source/drawingml/chart/axismodel \
@@ -132,6 +114,31 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/chart/typegroupcontext \
oox/source/drawingml/chart/typegroupconverter \
oox/source/drawingml/chart/typegroupmodel \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,oox,\
+ oox/source/core/binarycodec \
+ oox/source/core/contexthandler2 \
+ oox/source/core/contexthandler \
+ oox/source/core/fastparser \
+ oox/source/core/fasttokenhandler \
+ oox/source/core/filterbase \
+ oox/source/core/filterdetect \
+ oox/source/core/fragmenthandler2 \
+ oox/source/core/fragmenthandler \
+ oox/source/core/recordparser \
+ oox/source/core/relations \
+ oox/source/core/relationshandler \
+ oox/source/core/xmlfilterbase \
+ oox/source/crypto/AgileEngine \
+ oox/source/crypto/CryptTools \
+ oox/source/crypto/DocumentEncryption \
+ oox/source/crypto/DocumentDecryption \
+ oox/source/crypto/Standard2007Engine \
+ oox/source/crypto/StrongEncryptionDataSpace \
+ oox/source/docprop/docprophandler \
+ oox/source/docprop/ooxmldocpropimport \
oox/source/drawingml/clrschemecontext \
oox/source/drawingml/clrscheme \
oox/source/drawingml/colorchoicecontext \
@@ -214,7 +221,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/dump/dumperbase \
oox/source/dump/oledumper \
oox/source/dump/pptxdumper \
- oox/source/export/chartexport \
oox/source/export/ColorPropertySet \
oox/source/export/drawingml \
oox/source/export/shapes \
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 729fb3c3712f..c2547e0861e5 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1840,6 +1840,12 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >&
Reference< chart2::XChartDocument > xChartDoc( xDocModel, UNO_QUERY_THROW );
// load the chart data from the XML fragment
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ // TODO: Instead of using convertFromModel an alternative may be
+ // added to convert not to Chart/OLE SdrObejct, but to GraphicObject
+ // with the Chart visualization. There should be a preiew available
+ // in the imported chart data
bool bMSO2007Doc = rFilter.isMSO2007Document();
chart::ChartSpaceModel aModel(bMSO2007Doc);
rtl::Reference<chart::ChartSpaceFragment> pChartSpaceFragment = new chart::ChartSpaceFragment(
@@ -1880,6 +1886,7 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >&
}
}
+#endif
}
catch( Exception& )
{
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 0f9e13fbb6e4..b964654993d5 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -2003,9 +2003,14 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
xPropSet->getPropertyValue("Model") >>= xChartDoc;
assert(xChartDoc.is());
//export the chart
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ // TODO: With Chart extracted this cannot really happen since
+ // no Chart could've been added at all
ChartExport aChartExport( mnXmlNamespace, GetFS(), xChartDoc, GetFB(), GetDocumentType() );
static sal_Int32 nChartCount = 0;
aChartExport.WriteChartObj( xShape, GetNewShapeID( xShape ), ++nChartCount );
+#endif
return *this;
}
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 128ff31d6267..dbc02d9c80ed 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -60,8 +60,12 @@ XmlFilterBase* PowerPointImport::mpDebugFilterBase = nullptr;
PowerPointImport::PowerPointImport( const Reference< XComponentContext >& rxContext ) :
XmlFilterBase( rxContext ),
+#ifdef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ mxChartConv( )
+#else
mxChartConv( std::make_shared<::oox::drawingml::chart::ChartConverter>() )
-
+#endif
{
#if OSL_DEBUG_LEVEL > 0
mpDebugFilterBase = this;
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index f5bb1af03955..0a1310880b89 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -34,7 +34,12 @@ using namespace ::com::sun::star;
ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext >& rxContext ) :
XmlFilterBase( rxContext ),
+#ifdef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ mxChartConv( )
+#else
mxChartConv( std::make_shared<::oox::drawingml::chart::ChartConverter>() )
+#endif
{
}
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 2c491f1401dd..a45eeeeb4a9d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -69,10 +69,16 @@ $(eval $(call gb_Rdb_add_components,services,\
ifeq ($(gb_Side),host)
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
- animations/source/animcore/animcore \
chart2/source/controller/chartcontroller \
chart2/source/chartcore \
+))
+endif
+
+$(eval $(call gb_Rdb_add_components,services,\
+ animations/source/animcore/animcore \
cui/util/cui \
desktop/source/deployment/deployment \
embeddedobj/util/embobj \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 063c2729533b..55ef0fa41535 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -37,57 +37,57 @@ core_constructor_list = [
"com_sun_star_comp_rendering_Canvas_VCL_get_implementation",
"com_sun_star_comp_rendering_SpriteCanvas_VCL_get_implementation",
# chart2/source/chartcore.component
- "com_sun_star_chart2_ExponentialScaling_get_implementation",
- "com_sun_star_chart2_LinearScaling_get_implementation",
- "com_sun_star_chart2_LogarithmicScaling_get_implementation",
- "com_sun_star_chart2_PowerScaling_get_implementation",
- "com_sun_star_comp_chart_AreaChartType_get_implementation",
- "com_sun_star_comp_chart_BarChartType_get_implementation",
- "com_sun_star_comp_chart_BubbleChartType_get_implementation",
- "com_sun_star_comp_chart_CachedDataSequence_get_implementation",
- "com_sun_star_comp_chart_CandleStickChartType_get_implementation",
- "com_sun_star_comp_chart_ChartTypeManager_get_implementation",
- "com_sun_star_comp_chart_ColumnChartType_get_implementation",
- "com_sun_star_comp_chart_DataSeries_get_implementation",
- "com_sun_star_comp_chart_DataSource_get_implementation",
- "com_sun_star_comp_chart_FilledNetChartType_get_implementation",
- "com_sun_star_comp_chart_FormattedString_get_implementation",
- "com_sun_star_comp_chart_InternalDataProvider_get_implementation",
- "com_sun_star_comp_chart_LineChartType_get_implementation",
- "com_sun_star_comp_chart_NetChartType_get_implementation",
- "com_sun_star_comp_chart_PieChartType_get_implementation",
- "com_sun_star_comp_chart_ScatterChartType_get_implementation",
- "com_sun_star_comp_chart2_Axis_get_implementation",
- "com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation",
- "com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation",
- "com_sun_star_comp_chart2_ChartController_get_implementation",
- "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
- "com_sun_star_comp_chart2_ChartModel_get_implementation",
- "com_sun_star_comp_chart2_ChartView_get_implementation",
- "com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation",
- "com_sun_star_comp_chart2_Diagram_get_implementation",
- "com_sun_star_comp_chart2_ErrorBar_get_implementation",
- "com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_GridProperties_get_implementation",
- "com_sun_star_comp_chart2_LabeledDataSequence_get_implementation",
- "com_sun_star_comp_chart2_Legend_get_implementation",
- "com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_PageBackground_get_implementation",
- "com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation",
- "com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation",
- "com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation",
- "com_sun_star_comp_chart2_RegressionEquation_get_implementation",
- "com_sun_star_comp_chart2_Title_get_implementation",
- "com_sun_star_comp_chart2_XMLFilter_get_implementation",
+ ("com_sun_star_chart2_ExponentialScaling_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_chart2_LinearScaling_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_chart2_LogarithmicScaling_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_chart2_PowerScaling_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_AreaChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_BarChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_BubbleChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_CachedDataSequence_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_CandleStickChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_ChartTypeManager_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_ColumnChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_DataSeries_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_DataSource_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_FilledNetChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_FormattedString_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_InternalDataProvider_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_LineChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_NetChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_PieChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart_ScatterChartType_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_Axis_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ChartController_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ChartModel_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ChartView_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_Diagram_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ErrorBar_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_GridProperties_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_LabeledDataSequence_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_Legend_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_PageBackground_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_RegressionEquation_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_Title_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_XMLFilter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
# chart2/source/controller/chartcontroller.component
- "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
- "com_sun_star_comp_chart2_ChartFrameLoader_get_implementation",
- "com_sun_star_comp_chart2_WizardDialog_get_implementation",
- "org_libreoffice_comp_chart2_sidebar_ChartPanelFactory",
+ ("com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_ChartFrameLoader_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_chart2_WizardDialog_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("org_libreoffice_comp_chart2_sidebar_ChartPanelFactory", "#ifndef ENABLE_WASM_STRIP"),
# comphelper/util/comphelp.component
"com_sun_star_comp_MemoryStream",
"com_sun_star_comp_task_OfficeRestartManager",
@@ -413,35 +413,35 @@ core_constructor_list = [
"dtrans_CMimeContentTypeFactory_get_implementation",
"vcl_SystemClipboard_get_implementation",
# xmloff/source/transform/xof.component
- "xmloff_XMLCalcContentImportOOO_get_implementation",
- "xmloff_XMLCalcImportOOO_get_implementation",
- "xmloff_XMLCalcMetaImportOOO_get_implementation",
- "xmloff_XMLCalcSettingsImportOOO_get_implementation",
- "xmloff_XMLCalcStylesImportOOO_get_implementation",
- "xmloff_XMLChartContentImportOOO_get_implementation",
- "xmloff_XMLChartImportOOO_get_implementation",
- "xmloff_XMLChartStylesImportOOO_get_implementation",
- "xmloff_XMLDrawContentImportOOO_get_implementation",
- "xmloff_XMLDrawImportOOO_get_implementation",
- "xmloff_XMLDrawMetaImportOOO_get_implementation",
- "xmloff_XMLDrawSettingsImportOOO_get_implementation",
- "xmloff_XMLDrawStylesImportOOO_get_implementation",
- "xmloff_XMLImpressContentImportOOO_get_implementation",
- "xmloff_XMLImpressImportOOO_get_implementation",
- "xmloff_XMLImpressMetaImportOOO_get_implementation",
- "xmloff_XMLImpressSettingsImportOOO_get_implementation",
- "xmloff_XMLImpressStylesImportOOO_get_implementation",
- "xmloff_XMLMathMetaImportOOO_get_implementation",
- "xmloff_XMLMathSettingsImportOOO_get_implementation",
- "xmloff_OOo2OasisTransformer_get_implementation",
- "xmloff_Oasis2OOoTransformer_get_implementation",
- "xmloff_XMLAutoTextEventImportOOO_get_implementation",
- "xmloff_XMLWriterContentImportOOO_get_implementation",
- "xmloff_XMLWriterImportOOO_get_implementation",
- "xmloff_XMLWriterMetaImportOOO_get_implementation",
- "xmloff_XMLWriterSettingsImportOOO_get_implementation",
- "xmloff_XMLWriterStylesImportOOO_get_implementation",
- "xmloff_XMLMetaImportOOO_get_implementation",
+ ("xmloff_XMLCalcContentImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLCalcImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLCalcMetaImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLCalcSettingsImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLCalcStylesImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLChartContentImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLChartImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLChartStylesImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLDrawContentImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLDrawImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLDrawMetaImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLDrawSettingsImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLDrawStylesImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLImpressContentImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLImpressImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLImpressMetaImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLImpressSettingsImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLImpressStylesImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLMathMetaImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLMathSettingsImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_OOo2OasisTransformer_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_Oasis2OOoTransformer_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLAutoTextEventImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLWriterContentImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLWriterImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLWriterMetaImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLWriterSettingsImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLWriterStylesImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("xmloff_XMLMetaImportOOO_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
# xmloff/util/xo.component
"XMLMetaExportComponent_get_implementation",
"XMLMetaExportOOo_get_implementation",
@@ -472,17 +472,17 @@ core_constructor_list = [
"com_sun_star_comp_Xmloff_AnimationsImport",
"com_sun_star_comp_DrawingLayer_XMLExporter_get_implementation",
"com_sun_star_comp_Impress_XMLClipboardExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisImporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisMetaExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisStylesExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisContentExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLStylesExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLContentExporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation",
- "com_sun_star_comp_Chart_XMLOasisExporter_get_implementation",
+ ("com_sun_star_comp_Chart_XMLOasisImporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisMetaExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisStylesExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisContentExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLStylesExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLContentExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_Chart_XMLOasisExporter_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
"com_sun_star_comp_Writer_XMLOasisAutotextEventsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 23e67cb66536..33fc3464ff8f 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -384,6 +384,10 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & xModel,
m_rFilter.openFragmentStreamWithSerializer( aFileName,
"application/vnd.openxmlformats-officedocument.drawingml.chart+xml" );
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ // TODO: With Chart extracted this cannot really happen since
+ // no Chart could've been added at all
oox::drawingml::ChartExport aChartExport(XML_w, pChartFS, xModel, &m_rFilter, oox::drawingml::DOCUMENT_DOCX);
css::uno::Reference<css::util::XModifiable> xModifiable(xModel, css::uno::UNO_QUERY);
const bool bOldModified = xModifiable && xModifiable->isModified();
@@ -392,6 +396,7 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & xModel,
// tdf#134973: the model could get modified: e.g., calling XChartDocument::getSubTitle(),
// which creates the object if absent, and sets the modified state.
xModifiable->setModified(bOldModified);
+#endif
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index b33455b3c464..bb3c6e7f92a7 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -21,6 +21,11 @@ $(eval $(call gb_Library_Library,xo))
$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo.extended))
+endif
+
$(eval $(call gb_Library_set_precompiled_header,xo,xmloff/inc/pch/precompiled_xo))
$(eval $(call gb_Library_set_include,xo,\
@@ -56,6 +61,8 @@ $(eval $(call gb_Library_use_libraries,xo,\
vcl \
))
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
$(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/ColorPropertySet \
xmloff/source/chart/PropertyMaps \
@@ -87,6 +94,10 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/XMLTextOrientationHdl \
xmloff/source/chart/contexts \
xmloff/source/chart/transporttypes \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/core/DocumentSettingsContext \
xmloff/source/core/DomBuilderContext \
xmloff/source/core/DomExport \
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 350f2cf0910a..781412307803 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -21,6 +21,11 @@ $(eval $(call gb_Library_Library,xof))
$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof.extended))
+endif
+
$(eval $(call gb_Library_set_include,xof,\
-I$(SRCDIR)/xmloff/inc \
$$(INCLUDE) \
@@ -47,11 +52,19 @@ $(eval $(call gb_Library_use_libraries,xof,\
xo \
))
+# WASM_CHART change
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
$(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/ChartOASISTContext \
xmloff/source/transform/ChartOOoTContext \
xmloff/source/transform/ChartPlotAreaOASISTContext \
xmloff/source/transform/ChartPlotAreaOOoTContext \
+ xmloff/source/transform/OOo2Oasis \
+ xmloff/source/transform/Oasis2OOo \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/ControlOASISTContext \
xmloff/source/transform/ControlOOoTContext \
xmloff/source/transform/CreateElemTContext \
@@ -71,8 +84,6 @@ $(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/MetaTContext \
xmloff/source/transform/MutableAttrList \
xmloff/source/transform/NotesTContext \
- xmloff/source/transform/OOo2Oasis \
- xmloff/source/transform/Oasis2OOo \
xmloff/source/transform/PersAttrListTContext \
xmloff/source/transform/PersMixedContentTContext \
xmloff/source/transform/ProcAddAttrTContext \
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 32312229c1a9..28d3a687d513 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1712,7 +1712,12 @@ XMLPageExport* SvXMLExport::CreatePageExport()
SchXMLExportHelper* SvXMLExport::CreateChartExport()
{
+// WASM_CHART change
+// TODO: With Chart extracted this cannot really happen since
+// no Chart could've been added at all
+#ifndef ENABLE_WASM_STRIP
return new SchXMLExportHelper(*this, *GetAutoStylePool());
+#endif
}
XMLFontAutoStylePool* SvXMLExport::CreateFontAutoStylePool()
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 980891ffc175..733f3f08ea90 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1079,7 +1079,14 @@ XMLShapeImportHelper* SvXMLImport::CreateShapeImport()
SchXMLImportHelper* SvXMLImport::CreateChartImport()
{
+// WASM_CHART change
+// TODO: Instead of importing the ChartModel an alternative may be
+// added to convert not to Chart/OLE SdrObejct, but to GraphicObject
+// with the Chart visualization. There should be a preiew available
+// in the imported chart data
+#ifndef ENABLE_WASM_STRIP
return new SchXMLImportHelper();
+#endif
}
::xmloff::OFormLayerXMLImport* SvXMLImport::CreateFormImport()
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 6dea19c1daf6..502d01d72fbd 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1165,7 +1165,14 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
OUString sCLSID;
if(xPropSet->getPropertyValue("CLSID") >>= sCLSID)
{
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ // TODO: With Chart extracted this cannot really happen since
+ // no Chart could've been added at all
if (sCLSID == mrExport.GetChartExport()->getChartCLSID() ||
+#else
+ if(
+#endif
sCLSID == SvGlobalName( SO3_RPTCH_CLASSID ).GetHexName() )
{
eShapeType = XmlShapeTypeDrawChartShape;
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a1fdad1cc41c..9cbfcc813d18 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2450,7 +2450,13 @@ void SdXMLChartShapeContext::startFastElement (sal_Int32 nElement,
uno::Reference< frame::XModel > xChartModel;
if( aAny >>= xChartModel )
{
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
+ // TODO: Maybe use SdXMLGraphicObjectShapeContext completely instead
+ // or try to create as mbIsPlaceholder object adding a Chart visuailzation
+ // that should be available somehow
mxChartContext.set( GetImport().GetChartImport()->CreateChartContext( GetImport(), xChartModel ) );
+#endif
}
}
}
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 9453e1963729..db5cca9126e2 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -423,10 +423,12 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
case XmlStyleFamily::TEXT_RUBY:
pStyle = new XMLPropStyleContext( GetImport(), *this, nFamily );
break;
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
case XmlStyleFamily::SCH_CHART_ID:
pStyle = new XMLChartStyleContext( GetImport(), *this, nFamily );
break;
-
+#endif
case XmlStyleFamily::SD_GRAPHICS_ID:
case XmlStyleFamily::SD_PRESENTATION_ID:
case XmlStyleFamily::SD_POOL_ID:
@@ -562,6 +564,8 @@ rtl::Reference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProper
}
xMapper = mxShapeImpPropMapper;
break;
+#ifndef ENABLE_WASM_STRIP
+ // WASM_CHART change
case XmlStyleFamily::SCH_CHART_ID:
if( ! mxChartImpPropMapper.is() )
{
@@ -570,6 +574,7 @@ rtl::Reference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProper
}
xMapper = mxChartImpPropMapper;
break;
+#endif
case XmlStyleFamily::PAGE_MASTER:
if( ! mxPageImpPropMapper.is() )
{
diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component
index b7c5d3f5ebcb..2179d38662ab 100644
--- a/xmloff/source/transform/xof.component
+++ b/xmloff/source/transform/xof.component
@@ -39,18 +39,6 @@
constructor="xmloff_XMLCalcStylesImportOOO_get_implementation">
<service name="com.sun.star.comp.Calc.XMLStylesImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Chart.XMLContentImporter"
- constructor="xmloff_XMLChartContentImportOOO_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLContentImporter"/>
- </implementation>
- <implementation name="com.sun.star.comp.Chart.XMLImporter"
- constructor="xmloff_XMLChartImportOOO_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLImporter"/>
- </implementation>
- <implementation name="com.sun.star.comp.Chart.XMLStylesImporter"
- constructor="xmloff_XMLChartStylesImportOOO_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLStylesImporter"/>
- </implementation>
<implementation name="com.sun.star.comp.Draw.XMLContentImporter"
constructor="xmloff_XMLDrawContentImportOOO_get_implementation">
<service name="com.sun.star.comp.Draw.XMLContentImporter"/>
@@ -99,14 +87,6 @@
constructor="xmloff_XMLMathSettingsImportOOO_get_implementation">
<service name="com.sun.star.comp.Math.XMLSettingsImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.OOo2OasisTransformer"
- constructor="xmloff_OOo2OasisTransformer_get_implementation">
- <service name="com.sun.star.comp.OOo2OasisTransformer"/>
- </implementation>
- <implementation name="com.sun.star.comp.Oasis2OOoTransformer"
- constructor="xmloff_Oasis2OOoTransformer_get_implementation">
- <service name="com.sun.star.comp.Oasis2OOoTransformer"/>
- </implementation>
<implementation name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"
constructor="xmloff_XMLAutoTextEventImportOOO_get_implementation">
<service name="com.sun.star.comp.Writer.XMLAutotextEventsImporter"/>
diff --git a/xmloff/source/transform/xof.extended.component b/xmloff/source/transform/xof.extended.component
new file mode 100644
index 000000000000..2d52372ff09e
--- /dev/null
+++ b/xmloff/source/transform/xof.extended.component
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.Chart.XMLContentImporter"
+ constructor="xmloff_XMLChartContentImportOOO_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLContentImporter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.Chart.XMLImporter"
+ constructor="xmloff_XMLChartImportOOO_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLImporter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.Chart.XMLStylesImporter"
+ constructor="xmloff_XMLChartStylesImportOOO_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLStylesImporter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.OOo2OasisTransformer"
+ constructor="xmloff_OOo2OasisTransformer_get_implementation">
+ <service name="com.sun.star.comp.OOo2OasisTransformer"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.Oasis2OOoTransformer"
+ constructor="xmloff_Oasis2OOoTransformer_get_implementation">
+ <service name="com.sun.star.comp.Oasis2OOoTransformer"/>
+ </implementation>
+</component>
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index db63a5cd0519..64381044efdd 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -19,50 +19,6 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="SchXMLExport.Compact"
- constructor="com_sun_star_comp_Chart_XMLExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLExporter"/>
- </implementation>
- <implementation name="SchXMLExport.Content"
- constructor="com_sun_star_comp_Chart_XMLContentExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLContentExporter"/>
- </implementation>
- <implementation name="SchXMLExport.Oasis.Compact"
- constructor="com_sun_star_comp_Chart_XMLOasisExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisExporter"/>
- </implementation>
- <implementation name="SchXMLExport.Oasis.Content"
- constructor="com_sun_star_comp_Chart_XMLOasisContentExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisContentExporter"/>
- </implementation>
- <implementation name="SchXMLExport.Oasis.Meta"
- constructor="com_sun_star_comp_Chart_XMLOasisMetaExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisMetaExporter"/>
- </implementation>
- <implementation name="SchXMLExport.Oasis.Styles"
- constructor="com_sun_star_comp_Chart_XMLOasisStylesExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisStylesExporter"/>
- </implementation>
- <implementation name="SchXMLExport.Styles"
- constructor="com_sun_star_comp_Chart_XMLStylesExporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLStylesExporter"/>
- </implementation>
- <implementation name="SchXMLImport"
- constructor="com_sun_star_comp_Chart_XMLOasisImporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisImporter"/>
- </implementation>
- <implementation name="SchXMLImport.Content"
- constructor="com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisContentImporter"/>
- </implementation>
- <implementation name="SchXMLImport.Meta"
- constructor="com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisMetaImporter"/>
- </implementation>
- <implementation name="SchXMLImport.Styles"
- constructor="com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation">
- <service name="com.sun.star.comp.Chart.XMLOasisStylesImporter"/>
- </implementation>
<implementation name="XMLDrawContentExportOasis"
constructor="com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation">
<service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/>
diff --git a/xmloff/util/xo.extended.component b/xmloff/util/xo.extended.component
new file mode 100644
index 000000000000..41fce7c6ec2d
--- /dev/null
+++ b/xmloff/util/xo.extended.component
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="SchXMLExport.Compact"
+ constructor="com_sun_star_comp_Chart_XMLExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLExporter"/>
+ </implementation>
+ <implementation name="SchXMLExport.Content"
+ constructor="com_sun_star_comp_Chart_XMLContentExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLContentExporter"/>
+ </implementation>
+ <implementation name="SchXMLExport.Oasis.Compact"
+ constructor="com_sun_star_comp_Chart_XMLOasisExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisExporter"/>
+ </implementation>
+ <implementation name="SchXMLExport.Oasis.Content"
+ constructor="com_sun_star_comp_Chart_XMLOasisContentExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisContentExporter"/>
+ </implementation>
+ <implementation name="SchXMLExport.Oasis.Meta"
+ constructor="com_sun_star_comp_Chart_XMLOasisMetaExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisMetaExporter"/>
+ </implementation>
+ <implementation name="SchXMLExport.Oasis.Styles"
+ constructor="com_sun_star_comp_Chart_XMLOasisStylesExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisStylesExporter"/>
+ </implementation>
+ <implementation name="SchXMLExport.Styles"
+ constructor="com_sun_star_comp_Chart_XMLStylesExporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLStylesExporter"/>
+ </implementation>
+ <implementation name="SchXMLImport"
+ constructor="com_sun_star_comp_Chart_XMLOasisImporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisImporter"/>
+ </implementation>
+ <implementation name="SchXMLImport.Content"
+ constructor="com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisContentImporter"/>
+ </implementation>
+ <implementation name="SchXMLImport.Meta"
+ constructor="com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisMetaImporter"/>
+ </implementation>
+ <implementation name="SchXMLImport.Styles"
+ constructor="com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation">
+ <service name="com.sun.star.comp.Chart.XMLOasisStylesImporter"/>
+ </implementation>
+</component>
More information about the Libreoffice-commits
mailing list