[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in cui/Library_cui.mk cui/source cui/UIConfig_cui.mk desktop/inc desktop/source include/sfx2 oox/Library_oox.mk oox/source postprocess/Rdb_services.mk Repository.mk RepositoryModule_host.mk sfx2/Library_sfx.mk sfx2/source solenv/bin solenv/gbuild svx/Library_svx.mk sw/source vcl/Library_vcl.mk vcl/Module_vcl.mk xmloff/Library_xof.mk xmloff/Library_xo.mk xmloff/source
Armin Le Grand (Allotropia) (via logerrit)
logerrit at kemper.freedesktop.org
Fri May 7 16:17:11 UTC 2021
Repository.mk | 4
RepositoryModule_host.mk | 2
config_host.mk.in | 6
cui/Library_cui.mk | 2
cui/UIConfig_cui.mk | 2
cui/source/factory/dlgfact.cxx | 2
cui/source/factory/dlgfact.hxx | 2
desktop/inc/app.hxx | 2
desktop/source/app/app.cxx | 20 +-
include/sfx2/sfxdlg.hxx | 2
include/sfx2/viewfrm.hxx | 2
oox/Library_oox.mk | 2
oox/source/drawingml/shape.cxx | 2
oox/source/export/shapes.cxx | 2
oox/source/ppt/pptimport.cxx | 2
oox/source/shape/ShapeFilterBase.cxx | 2
postprocess/Rdb_services.mk | 4
sfx2/Library_sfx.mk | 4
sfx2/source/appl/appserv.cxx | 4
sfx2/source/view/viewfrm.cxx | 4
solenv/bin/native-code.py | 184 ++++++++++++-------------
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2
solenv/gbuild/gbuild.mk | 6
svx/Library_svx.mk | 4
sw/source/filter/ww8/docxexport.cxx | 2
vcl/Library_vcl.mk | 2
vcl/Module_vcl.mk | 2
xmloff/Library_xo.mk | 4
xmloff/Library_xof.mk | 4
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/draw/shapeexport.cxx | 2
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/style/xmlstyle.cxx | 4
34 files changed, 153 insertions(+), 141 deletions(-)
New commits:
commit ebfb45f4631937d28f93101856941895eb4f43b6
Author: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Fri May 7 18:14:25 2021 +0200
Commit: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Fri May 7 18:14:25 2021 +0200
Use more expressive ENABLE_WASM_STRIP markers
for the single strip steps, e.g. use
DENABLE_WASM_STRIP_SPLASH for removal of the
splash screen. This makes it potentially easier
to later see single strip steps if needed
Change-Id: I339c175efd456536589940df07ed48c29c1fd931
diff --git a/Repository.mk b/Repository.mk
index 67c8a38528de..8a34f46506bd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -417,7 +417,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
slideshow \
sot \
spell \
- $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP)),,spl) \
+ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,spl) \
storagefd \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
svgio \
@@ -876,7 +876,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
) \
))
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
tipoftheday_images \
))
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index bf8e048537c1..97c26f673084 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,libreoffice,\
endif
# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
chart2 \
))
diff --git a/config_host.mk.in b/config_host.mk.in
index d45511061037..e34b635cea1f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -201,6 +201,12 @@ export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
export ENABLE_VALGRIND=@ENABLE_VALGRIND@
export ENABLE_WASM_STRIP=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_EXTRA=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_SPLASH=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_RECOVERYUI=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_PINGUSER=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_RECENT=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_CHART=@ENABLE_WASM_STRIP@
export ENABLE_WERROR=@ENABLE_WERROR@
export ENDIANNESS=@ENDIANNESS@
export EPM=@EPM@
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index a9b46a1b2b05..075085e659e4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -93,7 +93,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
))
endif
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
$(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/tipofthedaydlg \
))
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 6dac5dea8f57..355c39faa265 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
))
endif
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/tipofthedaydialog \
))
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index b5877772b62d..4b3fa290fbeb 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1679,7 +1679,7 @@ AbstractDialogFactory_Impl::CreateAboutDialog(weld::Window* pParent)
std::make_unique<AboutDialog>(pParent));
}
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateTipOfTheDayDialog(weld::Window* pParent)
{
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 254d4332b4f8..ae4c59ce0fa7 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -938,7 +938,7 @@ public:
virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* pParent) override;
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* pParent) override;
#endif
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index ba9d6eafaa63..8f2580810e63 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -142,7 +142,7 @@ class Desktop final : public Application
static OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
const OUString& aFileURL );
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
css::uno::Reference<css::task::XStatusIndicator> m_rSplashScreen;
void OpenSplashScreen();
#endif
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index af383bad1626..583a1a85ed9b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -957,7 +957,7 @@ struct RefClearGuard
@param bEmergencySave
differs between EMERGENCY_SAVE and RECOVERY
*/
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_RECOVERYUI
bool impl_callRecoveryUI(bool bEmergencySave ,
bool bExistsRecoveryData)
{
@@ -1139,7 +1139,7 @@ void Desktop::Exception(ExceptionCategory nCategory)
// Save all open documents so they will be reopened
// the next time the application is started
// returns true if at least one document could be saved...
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_RECOVERYUI
bRestart = impl_callRecoveryUI(
true , // force emergency save
false);
@@ -1157,7 +1157,7 @@ void Desktop::Exception(ExceptionCategory nCategory)
osl_removeSignalHandler( pSignalHandler );
restartOnMac(false);
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
if ( m_rSplashScreen.is() )
m_rSplashScreen->reset();
#endif
@@ -1263,7 +1263,7 @@ int Desktop::Main()
Translate::SetReadStringHook(ReplaceStringHookProc);
// Startup screen
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
OpenSplashScreen();
#endif
@@ -1705,7 +1705,7 @@ int Desktop::doShutdown()
if ( bRR )
{
restartOnMac(true);
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
if ( m_rSplashScreen.is() )
m_rSplashScreen->reset();
#endif
@@ -2011,7 +2011,7 @@ void Desktop::OpenClients()
impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData);
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_RECOVERYUI
if ( !bDisableRecovery &&
(
bExistsRecoveryData || // => crash with files => recovery
@@ -2389,7 +2389,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
}
}
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
void Desktop::OpenSplashScreen()
{
const CommandLineArgs &rCmdLine = GetCommandLineArgs();
@@ -2444,7 +2444,7 @@ void Desktop::OpenSplashScreen()
void Desktop::SetSplashScreenProgress(sal_Int32 iProgress)
{
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
if(m_rSplashScreen.is())
{
m_rSplashScreen->setValue(iProgress);
@@ -2454,7 +2454,7 @@ void Desktop::SetSplashScreenProgress(sal_Int32 iProgress)
void Desktop::SetSplashScreenText( const OUString& rText )
{
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
if( m_rSplashScreen.is() )
{
m_rSplashScreen->setText( rText );
@@ -2464,7 +2464,7 @@ void Desktop::SetSplashScreenText( const OUString& rText )
void Desktop::CloseSplashScreen()
{
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_SPLASH
if(m_rSplashScreen.is())
{
SolarMutexGuard ensureSolarMutex;
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index d7e610d5704e..c9a1be898f74 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -146,7 +146,7 @@ public:
virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* _pParent) = 0;
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* _pParent) = 0;
#endif
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index c887af1d6bc7..7cc771a8a515 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -62,7 +62,7 @@ private:
protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
DECL_LINK(GetInvolvedHandler, weld::Button&, void);
DECL_LINK(DonationHandler, weld::Button&, void);
DECL_LINK(WhatsNewHandler, weld::Button&, void);
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index a94093ebd3ce..e17bbcccee1b 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -84,7 +84,7 @@ endif
$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/export/chartexport \
oox/source/drawingml/chart/axiscontext \
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index c2547e0861e5..f8704a0d798a 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1840,7 +1840,7 @@ 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
+#ifndef ENABLE_WASM_STRIP_CHART
// WASM_CHART change
// TODO: Instead of using convertFromModel an alternative may be
// added to convert not to Chart/OLE SdrObejct, but to GraphicObject
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index b964654993d5..a1e6a4edcc6e 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -2003,7 +2003,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
xPropSet->getPropertyValue("Model") >>= xChartDoc;
assert(xChartDoc.is());
//export the chart
-#ifndef ENABLE_WASM_STRIP
+#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
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index dbc02d9c80ed..893355fb85d2 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -60,7 +60,7 @@ XmlFilterBase* PowerPointImport::mpDebugFilterBase = nullptr;
PowerPointImport::PowerPointImport( const Reference< XComponentContext >& rxContext ) :
XmlFilterBase( rxContext ),
-#ifdef ENABLE_WASM_STRIP
+#ifdef ENABLE_WASM_STRIP_CHART
// WASM_CHART change
mxChartConv( )
#else
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index 0a1310880b89..a6672b67e7ba 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
ShapeFilterBase::ShapeFilterBase( const uno::Reference< uno::XComponentContext >& rxContext ) :
XmlFilterBase( rxContext ),
-#ifdef ENABLE_WASM_STRIP
+#ifdef ENABLE_WASM_STRIP_CHART
// WASM_CHART change
mxChartConv( )
#else
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index a6af64abbcf8..c7de6a3ab2c9 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -70,7 +70,7 @@ $(eval $(call gb_Rdb_add_components,services,\
ifeq ($(gb_Side),host)
# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
chart2/source/controller/chartcontroller \
chart2/source/chartcore \
@@ -274,7 +274,7 @@ $(eval $(call gb_Rdb_add_components,services,\
desktop/source/migration/services/migrationoo2 \
desktop/source/migration/services/migrationoo3 \
desktop/source/offacc/offacc \
- $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP)),,desktop/source/splash/spl) \
+ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,desktop/source/splash/spl) \
$(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \
$(if $(filter WNT,$(OS)),\
extensions/source/config/WinUserInfo/WinUserInfoBe \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 7750e5247bdc..b0e90330e367 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_RECENT),TRUE)
$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx.extended))
endif
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_use_externals,sfx,\
orcus-parser\
))
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_RECENT),TRUE)
$(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/dialog/backingcomp \
sfx2/source/dialog/backingwindow \
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 46dd5134d919..98debbf53279 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -504,7 +504,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
sfx2::openUriExternally(sURL, false);
break;
}
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
case SID_GETINVOLVED:
{
// Open get involved/join us page based on locales
@@ -608,7 +608,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
case SID_TIPOFTHEDAY:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 2cfeaa8f8618..e416c312b4af 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1345,7 +1345,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
bIsUITest = true;
}
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
//what's new infobar
OUString sSetupVersion = utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32();
@@ -1579,7 +1579,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
}
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_PINGUSER
IMPL_LINK_NOARG(SfxViewFrame, WhatsNewHandler, weld::Button&, void)
{
GetDispatcher()->Execute(SID_WHATSNEW);
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 55ef0fa41535..f6485c214589 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", "#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"),
+ ("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"),
# chart2/source/controller/chartcontroller.component
- ("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"),
+ ("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_comp_chart2_sidebar_ChartPanelFactory", "#ifndef ENABLE_WASM_STRIP_CHART"),
# 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", "#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_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/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", "#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_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_Writer_XMLOasisAutotextEventsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation",
@@ -770,7 +770,7 @@ desktop_constructor_list = [
"com_sun_star_comp_graphic_GraphicProvider_get_implementation",
"com_sun_star_comp_office_FrameLoader_get_implementation",
"com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation",
- ("com_sun_star_comp_sfx2_BackingComp_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_sfx2_BackingComp_get_implementation", "#ifndef ENABLE_WASM_STRIP_RECENT"),
"com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
"com_sun_star_comp_sfx2_InsertSymbolToolBoxControl_get_implementation",
"com_sun_star_comp_sfx2_InsertSymbolToolBoxControl_get_implementation",
@@ -784,7 +784,7 @@ desktop_constructor_list = [
"com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation",
"com_sun_star_comp_svx_LineSpacingToolBoxControl_get_implementation",
"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
- ("com_sun_star_comp_svx_RecoveryUI_get_implementation", "#ifndef ENABLE_WASM_STRIP"),
+ ("com_sun_star_comp_svx_RecoveryUI_get_implementation", "#ifndef ENABLE_WASM_STRIP_RECOVERYUI"),
"com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
"com_sun_star_comp_svx_TableToolBoxControl_get_implementation",
"com_sun_star_comp_svx_TableToolBoxControl_get_implementation",
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 6679ed8af942..2f18fbb8ce6e 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -70,7 +70,7 @@ MERGE_LIBRARY_LIST := \
sofficeapp \
sot \
spell \
- $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP)),,spl) \
+ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,spl) \
srtrs1 \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
svgio \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 08c82f5e8d1f..2a5ec592be51 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -222,6 +222,12 @@ gb_GLOBALDEFS := \
ifeq ($(ENABLE_WASM_STRIP),TRUE)
gb_GLOBALDEFS += -DENABLE_WASM_STRIP
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_EXTRA
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_SPLASH
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_RECOVERYUI
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_PINGUSER
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_RECENT
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CHART
endif
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 1f1c820cd4f2..8d26ac382b9e 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,svx))
$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_RECOVERYUI),TRUE)
$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx.extended))
endif
@@ -83,7 +83,7 @@ $(eval $(call gb_Library_use_externals,svx,\
icu_headers \
))
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_RECOVERYUI),TRUE)
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/docrecovery \
svx/source/unodraw/recoveryui \
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 33fc3464ff8f..e9576057a17a 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -384,7 +384,7 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & xModel,
m_rFilter.openFragmentStreamWithSerializer( aFileName,
"application/vnd.openxmlformats-officedocument.drawingml.chart+xml" );
-#ifndef ENABLE_WASM_STRIP
+#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
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f337c5731757..5b71fa9a4fcc 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -149,7 +149,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/dockwin \
vcl/source/window/event \
vcl/source/window/floatwin \
- $(if $(ENABLE_WASM_STRIP),,vcl/source/window/introwin) \
+ $(if $(ENABLE_WASM_STRIP_SPLASH),,vcl/source/window/introwin) \
vcl/source/window/keycod \
vcl/source/window/keyevent \
vcl/source/window/layout \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f147f963e32d..9191ee9648d9 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Module_Module,vcl))
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_PINGUSER),TRUE)
$(eval $(call gb_Module_add_targets,vcl,\
Package_tipoftheday \
))
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index bb3c6e7f92a7..f6b53023d42a 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_Library,xo))
$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo.extended))
endif
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_libraries,xo,\
))
# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/chart/ColorPropertySet \
xmloff/source/chart/PropertyMaps \
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 781412307803..fcc8e446ddc8 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -22,7 +22,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),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof.extended))
endif
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_libraries,xof,\
))
# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP),TRUE)
+ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
$(eval $(call gb_Library_add_exception_objects,xof,\
xmloff/source/transform/ChartOASISTContext \
xmloff/source/transform/ChartOOoTContext \
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 28d3a687d513..9ebf84e9cf09 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1715,7 +1715,7 @@ 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
+#ifndef ENABLE_WASM_STRIP_CHART
return new SchXMLExportHelper(*this, *GetAutoStylePool());
#endif
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 733f3f08ea90..671a229af705 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1084,7 +1084,7 @@ SchXMLImportHelper* SvXMLImport::CreateChartImport()
// 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
+#ifndef ENABLE_WASM_STRIP_CHART
return new SchXMLImportHelper();
#endif
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 502d01d72fbd..2b325de179e8 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1165,7 +1165,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
OUString sCLSID;
if(xPropSet->getPropertyValue("CLSID") >>= sCLSID)
{
-#ifndef ENABLE_WASM_STRIP
+#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
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 9cbfcc813d18..bb6758d5f525 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2450,7 +2450,7 @@ void SdXMLChartShapeContext::startFastElement (sal_Int32 nElement,
uno::Reference< frame::XModel > xChartModel;
if( aAny >>= xChartModel )
{
-#ifndef ENABLE_WASM_STRIP
+#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
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index db5cca9126e2..49b3a2eddd58 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -423,7 +423,7 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
case XmlStyleFamily::TEXT_RUBY:
pStyle = new XMLPropStyleContext( GetImport(), *this, nFamily );
break;
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_CHART
// WASM_CHART change
case XmlStyleFamily::SCH_CHART_ID:
pStyle = new XMLChartStyleContext( GetImport(), *this, nFamily );
@@ -564,7 +564,7 @@ rtl::Reference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProper
}
xMapper = mxShapeImpPropMapper;
break;
-#ifndef ENABLE_WASM_STRIP
+#ifndef ENABLE_WASM_STRIP_CHART
// WASM_CHART change
case XmlStyleFamily::SCH_CHART_ID:
if( ! mxChartImpPropMapper.is() )
More information about the Libreoffice-commits
mailing list