RepositoryModule_host.mk | 3
android/default-document/example3.odt |binary
chart2/source/controller/main/ChartController.cxx | 12
chart2/source/controller/main/ChartController_TextEdit.cxx | 6
chart2/source/controller/main/ChartWindow.cxx | 5
oox/Library_oox.mk | 3
oox/source/drawingml/shape.cxx | 10
oox/source/export/shapes.cxx | 5
oox/source/ppt/pptimport.cxx | 5
oox/source/shape/ShapeFilterBase.cxx | 5
postprocess/Rdb_services.mk | 3
solenv/bin/native-code.py | 182 ++++++-------
static/CustomTarget_wasm_fs_image.mk | 2
static/soffice_args.js | 2
sw/source/filter/ww8/docxexport.cxx | 7
xmloff/Library_xo.mk | 7
xmloff/Library_xof.mk | 6
xmloff/source/core/xmlexp.cxx | 7
xmloff/source/core/xmlimp.cxx | 11
xmloff/source/draw/shapeexport.cxx | 7
xmloff/source/draw/ximpshap.cxx | 6
xmloff/source/style/xmlstyle.cxx | 6
xmloff/source/transform/OOo2Oasis.cxx | 2
23 files changed, 118 insertions(+), 184 deletions(-)
New commits:
commit ed9b0dca4edf7ee2e29ec1732582ed07d956145f
Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Tue Nov 16 15:53:50 2021 +0100
Commit: Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
CommitDate: Tue Nov 16 15:53:50 2021 +0100
WASM: Re-activate Chart, disable involved accessibility (using WASM flag)
Change-Id: I339ae931d10e48a14a119f70488a963629709c02
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index b26979a4b225..502a869b7c06 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -20,12 +20,9 @@ $(eval $(call gb_Module_add_targets,libreoffice,\
))
endif
-# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
chart2 \
))
-endif
# WASM_CANVAS change
ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE)
diff --git a/android/default-document/example3.odt
b/android/default-document/example3.odt
new file mode 100644
index 000000000000..8810417b0a16
Binary files /dev/null and b/android/default-document/example3.odt differ
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 19c314da2635..856ddcdd7dc7 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <sal/config.h>
+#include <config_wasm_strip.h>
#include <ChartController.hxx>
#include <servicenames.hxx>
#include <ResId.hxx>
@@ -41,7 +42,9 @@
#include "ChartDropTargetHelper.hxx"
#include <dlg_ChartType.hxx>
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
#include <AccessibleChartView.hxx>
+#endif
#include "DrawCommandDispatch.hxx"
#include "ShapeController.hxx"
#include "UndoActions.hxx"
@@ -1431,8 +1434,13 @@ uno::Reference< uno::XInterface > SAL_CALL
{
uno::Reference< uno::XInterface > xResult;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( aServiceSpecifier == CHART_ACCESSIBLE_TEXT_SERVICE_NAME )
xResult.set( impl_createAccessibleTextContext());
+#else
+ (void)aServiceSpecifier;
+#endif
+
return xResult;
}
@@ -1546,9 +1554,13 @@ void ChartController::SetAndApplySelection(const
Reference<drawing::XShape>& rxS
uno::Reference< XAccessible > ChartController::CreateAccessible()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
uno::Reference< XAccessible > xResult = new AccessibleChartView(
GetDrawViewWrapper() );
impl_initializeAccessible( uno::Reference< lang::XInitialization >(
xResult, uno::UNO_QUERY ) );
return xResult;
+#else
+ return uno::Reference< XAccessible >();
+#endif
}
void ChartController::impl_invalidateAccessible()
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 23b590907f67..2559a93af86b 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -26,7 +26,9 @@
#include <TitleHelper.hxx>
#include <ObjectIdentifier.hxx>
#include <ControllerLockGuard.hxx>
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
#include <AccessibleTextHelper.hxx>
+#endif
#include <strings.hrc>
#include <chartview/DrawModelWrapper.hxx>
@@ -214,10 +216,14 @@ void
ChartController::executeDispatch_InsertSpecialCharacter()
uno::Reference< css::accessibility::XAccessibleContext >
ChartController::impl_createAccessibleTextContext()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
uno::Reference< css::accessibility::XAccessibleContext > xResult(
new AccessibleTextHelper( m_pDrawViewWrapper.get() ));
return xResult;
+#else
+ return uno::Reference< css::accessibility::XAccessibleContext >();
+#endif
}
} //namespace chart
diff --git a/chart2/source/controller/main/ChartWindow.cxx
b/chart2/source/controller/main/ChartWindow.cxx
index 9f1ff9342c98..a1e6cee68f08 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_wasm_strip.h>
#include <ChartWindow.hxx>
#include <ChartController.hxx>
#include <helpids.h>
@@ -181,10 +182,14 @@ void ChartWindow::KeyInput( const KeyEvent& rKEvt )
uno::Reference< css::accessibility::XAccessible >
ChartWindow::CreateAccessible()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( m_pWindowController )
return m_pWindowController->CreateAccessible();
else
return Window::CreateAccessible();
+#else
+ return uno::Reference< css::accessibility::XAccessible >();
+#endif
}
void ChartWindow::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 113d160b644b..0e4f4f707008 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -83,8 +83,6 @@ endif
$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
-# WASM_CHART change
-ifeq (,$(ENABLE_WASM_STRIP_CHART))
$(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/export/chartexport \
oox/source/drawingml/chart/axiscontext \
@@ -115,7 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/drawingml/chart/typegroupconverter \
oox/source/drawingml/chart/typegroupmodel \
))
-endif
$(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/core/binarycodec \
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 5046ba6cae79..2af8dfba6d8d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1914,15 +1914,6 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter,
const Reference< XShapes >&
Reference< chart2::XChartDocument > xChartDoc( xDocModel,
UNO_QUERY_THROW );
// load the chart data from the XML fragment
-#ifdef ENABLE_WASM_STRIP_CHART
- (void) rFilter;
- (void) rxShapes;
-#else
- // 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(
@@ -1963,7 +1954,6 @@ 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 bfdc50ccc19d..6d9994a417d6 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -2173,14 +2173,9 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const
Reference< XShape >& xShape )
xPropSet->getPropertyValue("Model") >>= xChartDoc;
assert(xChartDoc.is());
//export the chart
-#ifndef ENABLE_WASM_STRIP_CHART
- // 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 9a30913c3dac..8663f93f9c54 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -62,12 +62,7 @@ XmlFilterBase* PowerPointImport::mpDebugFilterBase = nullptr;
PowerPointImport::PowerPointImport( const Reference< XComponentContext >&
rxContext ) :
XmlFilterBase( rxContext ),
-#ifdef ENABLE_WASM_STRIP_CHART
- // 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 486e844a3542..359f70f2343f 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -36,12 +36,7 @@ using namespace ::com::sun::star;
ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext
>& rxContext ) :
XmlFilterBase( rxContext ),
-#ifdef ENABLE_WASM_STRIP_CHART
- // 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 5e1615705677..55b3a912cded 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -77,14 +77,11 @@ $(eval $(call gb_Rdb_add_components,services,\
ifeq ($(gb_Side),host)
-# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
chart2/source/controller/chartcontroller \
chart2/source/chartcore \
writerperfect/source/calc/wpftcalc \
))
-endif
ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index efed5b28eba5..c2f61ab2ad5a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -42,58 +42,58 @@ core_constructor_list = [
("com_sun_star_comp_rendering_Canvas_VCL_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CANVAS"),
("com_sun_star_comp_rendering_SpriteCanvas_VCL_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CANVAS"),
# chart2/source/chartcore.component
- ("com_sun_star_chart2_ExponentialScaling_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_chart2_LinearScaling_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_chart2_LogarithmicScaling_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_chart2_PowerScaling_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_AreaChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_BarChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_BubbleChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_CachedDataSequence_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_CandleStickChartType_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_ChartTypeManager_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_ColumnChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_DataSeries_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_DataSource_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_FilledNetChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_FormattedString_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_InternalDataProvider_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_LineChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_NetChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_PieChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart_ScatterChartType_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_Axis_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
-
("com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
-
("com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ChartController_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ChartModel_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ChartView_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_Diagram_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ErrorBar_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_GridProperties_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_LabeledDataSequence_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_Legend_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
-
("com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_PageBackground_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_RegressionEquation_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_Title_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_XMLFilter_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
+ "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",
# chart2/source/controller/chartcontroller.component
- ("com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_ChartFrameLoader_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_chart2_WizardDialog_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("org_libreoffice_chart2_Chart2ToolboxController", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("org_libreoffice_comp_chart2_sidebar_ChartPanelFactory", "#ifndef
ENABLE_WASM_STRIP_CHART"),
+ "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_chart2_Chart2ToolboxController",
+ "org_libreoffice_comp_chart2_sidebar_ChartPanelFactory",
# comphelper/util/comphelp.component
"com_sun_star_comp_MemoryStream",
"com_sun_star_comp_task_OfficeRestartManager",
@@ -452,35 +452,35 @@ core_constructor_list = [
"dtrans_CMimeContentTypeFactory_get_implementation",
"vcl_SystemClipboard_get_implementation",
# xmloff/source/transform/xof.component
- ("xmloff_XMLCalcContentImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLCalcImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLCalcMetaImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLCalcSettingsImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLCalcStylesImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLChartContentImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLChartImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLChartStylesImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLDrawContentImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLDrawImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLDrawMetaImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLDrawSettingsImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLDrawStylesImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLImpressContentImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLImpressImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLImpressMetaImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLImpressSettingsImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLImpressStylesImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLMathMetaImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLMathSettingsImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_OOo2OasisTransformer_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_Oasis2OOoTransformer_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLAutoTextEventImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLWriterContentImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLWriterImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLWriterMetaImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLWriterSettingsImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLWriterStylesImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("xmloff_XMLMetaImportOOO_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
+ "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/util/xo.component
"XMLMetaExportComponent_get_implementation",
"XMLMetaExportOOo_get_implementation",
@@ -511,17 +511,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", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisMetaExporter_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisStylesExporter_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisContentExporter_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLExporter_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLStylesExporter_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLContentExporter_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisStylesImporter_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisContentImporter_get_implementation",
"#ifndef ENABLE_WASM_STRIP_CHART"),
- ("com_sun_star_comp_Chart_XMLOasisExporter_get_implementation", "#ifndef
ENABLE_WASM_STRIP_CHART"),
+ "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_Writer_XMLOasisAutotextEventsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
diff --git a/static/CustomTarget_wasm_fs_image.mk
b/static/CustomTarget_wasm_fs_image.mk
index 0fb310ab8854..82162bbff115 100644
--- a/static/CustomTarget_wasm_fs_image.mk
+++ b/static/CustomTarget_wasm_fs_image.mk
@@ -1124,7 +1124,7 @@ gb_wasm_image_filelist := \
$(INSTROOT)/share/gallery/fontwork.sdg \
$(INSTROOT)/share/gallery/fontwork.sdv \
$(INSTROOT)/share/gallery/fontwork.thm \
- $(SRCDIR)/android/default-document/example2.odt \
+ $(SRCDIR)/android/default-document/example3.odt \
wasm_fs_image_WORKDIR := $(call
gb_CustomTarget_get_workdir,static/wasm_fs_image)
diff --git a/static/soffice_args.js b/static/soffice_args.js
index 7b214dd6aaf1..bdd67cb541b0 100644
--- a/static/soffice_args.js
+++ b/static/soffice_args.js
@@ -1 +1 @@
-Module['arguments'] = ['/android/default-document/example2.odt'];
+Module['arguments'] = ['/android/default-document/example3.odt'];
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index e65c3bdfc460..0b65e4a569e4 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -382,10 +382,6 @@ OString DocxExport::OutputChart( uno::Reference<
frame::XModel > const & xModel,
m_rFilter.openFragmentStreamWithSerializer( aFileName,
"application/vnd.openxmlformats-officedocument.drawingml.chart+xml" );
-#ifndef ENABLE_WASM_STRIP_CHART
- // 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();
@@ -394,9 +390,6 @@ 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);
-#else
- (void)xModel;
-#endif
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 7486996d194b..7a5e93f48ecc 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -20,8 +20,8 @@
$(eval $(call gb_Library_Library,xo))
$(eval $(call gb_Library_set_componentfiles,xo, \
- xmloff/util/xo \
- $(if $(ENABLE_WASM_STRIP_CHART),,xmloff/util/xo.chart) \
+ xmloff/util/xo \
+ xmloff/util/xo.chart \
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
xmloff/util/xo.draw \
xmloff/util/xo.impress \
@@ -64,8 +64,6 @@ $(eval $(call gb_Library_use_libraries,xo,\
vcl \
))
-# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/ColorPropertySet \
xmloff/source/chart/PropertyMaps \
@@ -98,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/contexts \
xmloff/source/chart/transporttypes \
))
-endif
$(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/core/DocumentSettingsContext \
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 7e1a4dd562c7..86f6951ed14d 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -21,10 +21,7 @@ $(eval $(call gb_Library_Library,xof))
$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
-# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP_CHART),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 \
@@ -52,15 +49,12 @@ $(eval $(call gb_Library_use_libraries,xof,\
xo \
))
-# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP_CHART),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 \
))
-endif
$(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/OOo2Oasis \
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 76908f9806f0..4da9976a67c6 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1695,14 +1695,7 @@ 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_CHART
return new SchXMLExportHelper(*this, *GetAutoStylePool());
-#else
- return nullptr;
-#endif
}
XMLFontAutoStylePool* SvXMLExport::CreateFontAutoStylePool()
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 68f56b09c859..20c20e00bf67 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1075,16 +1075,7 @@ 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_CHART
return new SchXMLImportHelper();
-#else
- return nullptr;
-#endif
}
::xmloff::OFormLayerXMLImport* SvXMLImport::CreateFormImport()
@@ -1567,9 +1558,7 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext
*pAutoStyles )
mxAutoStyles = pAutoStyles;
GetTextImport()->SetAutoStyles( pAutoStyles );
GetShapeImport()->SetAutoStylesContext( pAutoStyles );
-#ifndef ENABLE_WASM_STRIP_CHART
GetChartImport()->SetAutoStylesContext( pAutoStyles );
-#endif
GetFormImport()->setAutoStyleContext( pAutoStyles );
}
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 17b0b8370032..2add4377e87b 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1195,14 +1195,7 @@ void XMLShapeExport::ImpCalcShapeType(const
uno::Reference< drawing::XShape >& x
OUString sCLSID;
if(xPropSet->getPropertyValue("CLSID") >>= sCLSID)
{
-#ifndef ENABLE_WASM_STRIP_CHART
- // 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 feb2e096461a..5c2d3e2d6311 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2449,13 +2449,7 @@ void SdXMLChartShapeContext::startFastElement (sal_Int32
nElement,
uno::Reference< frame::XModel > xChartModel;
if( aAny >>= xChartModel )
{
-#ifndef ENABLE_WASM_STRIP_CHART
- // 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 dfa1afc6f23b..bbbe949653d7 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -428,12 +428,9 @@ SvXMLStyleContext
*SvXMLStylesContext::CreateStyleStyleChildContext(
case XmlStyleFamily::TEXT_RUBY:
pStyle = new XMLPropStyleContext( GetImport(), *this, nFamily );
break;
-#ifndef ENABLE_WASM_STRIP_CHART
- // 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:
@@ -569,8 +566,6 @@ rtl::Reference < SvXMLImportPropertyMapper >
SvXMLStylesContext::GetImportProper
}
xMapper = mxShapeImpPropMapper;
break;
-#ifndef ENABLE_WASM_STRIP_CHART
- // WASM_CHART change
case XmlStyleFamily::SCH_CHART_ID:
if( ! mxChartImpPropMapper.is() )
{
@@ -579,7 +574,6 @@ rtl::Reference < SvXMLImportPropertyMapper >
SvXMLStylesContext::GetImportProper
}
xMapper = mxChartImpPropMapper;
break;
-#endif
case XmlStyleFamily::PAGE_MASTER:
if( ! mxPageImpPropMapper.is() )
{
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index a16923d23f5c..2bac648de9fc 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1554,12 +1554,10 @@ XMLTransformerContext
*OOo2OasisTransformer::CreateUserDefinedContext(
return new XMLControlOOoTransformerContext( *this, rQName );
case XML_ETACTION_FORM_PROPERTY:
return new XMLFormPropOOoTransformerContext( *this, rQName );
-#ifndef ENABLE_WASM_STRIP_CHART
case XML_ETACTION_CHART:
return new XMLChartOOoTransformerContext( *this, rQName );
case XML_ETACTION_CHART_PLOT_AREA:
return new XMLChartPlotAreaOOoTContext( *this, rQName );
-#endif
case XML_ETACTION_TRACKED_CHANGES:
return new XMLTrackedChangesOOoTContext_Impl( *this, rQName,
rAction.GetQNamePrefixFromParam1(),
