[Libreoffice-commits] core.git: Branch 'feature/wasm' - cui/source cui/UIConfig_cui.mk include/sfx2 sfx2/source
Armin Le Grand (Allotropia) (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 3 08:47:38 UTC 2021
cui/UIConfig_cui.mk | 7 ++++++-
cui/source/factory/dlgfact.cxx | 2 ++
cui/source/factory/dlgfact.hxx | 2 ++
include/sfx2/sfxdlg.hxx | 2 ++
include/sfx2/viewfrm.hxx | 2 ++
sfx2/source/appl/appserv.cxx | 4 ++++
sfx2/source/view/viewfrm.cxx | 4 ++++
7 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 4ed18d09ce0753f03b99107cce501b79c5550942
Author: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Mon May 3 10:45:50 2021 +0200
Commit: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Mon May 3 10:45:50 2021 +0200
Optional removal of more startup-modules
WhatsNewHandler
GetInvolvedHandler
DonationHandler
TipOfTheDayDialog
Change-Id: Iaad8d120f4e7768684551543dcfcaddcea44356e
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index ff3c718b21d6..6dac5dea8f57 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -15,6 +15,12 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP),TRUE)
+$(eval $(call gb_UIConfig_add_uifiles,cui,\
+ cui/uiconfig/ui/tipofthedaydialog \
+))
+endif
+
$(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/aboutconfigdialog\
@@ -96,7 +102,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/hyphenate \
cui/uiconfig/ui/iconchangedialog \
cui/uiconfig/ui/iconselectordialog \
- cui/uiconfig/ui/tipofthedaydialog \
cui/uiconfig/ui/insertfloatingframe \
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertrowcolumn \
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6d0a44086d47..b5877772b62d 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1679,12 +1679,14 @@ AbstractDialogFactory_Impl::CreateAboutDialog(weld::Window* pParent)
std::make_unique<AboutDialog>(pParent));
}
+#ifndef ENABLE_WASM_STRIP
VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateTipOfTheDayDialog(weld::Window* pParent)
{
return VclPtr<CuiAbstractController_Impl>::Create(
std::make_unique<TipOfTheDayDialog>(pParent));
}
+#endif
VclPtr<VclAbstractDialog>
AbstractDialogFactory_Impl::CreateToolbarmodeDialog(weld::Window* pParent)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 1abf42683c95..254d4332b4f8 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -938,7 +938,9 @@ public:
virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* pParent) override;
+#ifndef ENABLE_WASM_STRIP
virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* pParent) override;
+#endif
virtual VclPtr<VclAbstractDialog> CreateToolbarmodeDialog(weld::Window* pParent) override;
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index d133e42f329c..d7e610d5704e 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -146,7 +146,9 @@ public:
virtual VclPtr<VclAbstractDialog> CreateAboutDialog(weld::Window* _pParent) = 0;
+#ifndef ENABLE_WASM_STRIP
virtual VclPtr<VclAbstractDialog> CreateTipOfTheDayDialog(weld::Window* _pParent) = 0;
+#endif
virtual VclPtr<VclAbstractDialog> CreateToolbarmodeDialog(weld::Window* _pParent) = 0;
};
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index c01da176b847..c887af1d6bc7 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -62,9 +62,11 @@ private:
protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
+#ifndef ENABLE_WASM_STRIP
DECL_LINK(GetInvolvedHandler, weld::Button&, void);
DECL_LINK(DonationHandler, weld::Button&, void);
DECL_LINK(WhatsNewHandler, weld::Button&, void);
+#endif
DECL_LINK(SwitchReadOnlyHandler, weld::Button&, void);
DECL_LINK(SignDocumentHandler, weld::Button&, void);
DECL_LINK(HiddenTrackChangesHandler, weld::Button&, void);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index b58d4f891a53..46dd5134d919 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -504,6 +504,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
sfx2::openUriExternally(sURL, false);
break;
}
+#ifndef ENABLE_WASM_STRIP
case SID_GETINVOLVED:
{
// Open get involved/join us page based on locales
@@ -531,6 +532,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
sfx2::openUriExternally(sURL, false);
break;
}
+#endif
case SID_SHOW_LICENSE:
{
LicenseDialog aDialog(rReq.GetFrameWeld());
@@ -606,6 +608,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#ifndef ENABLE_WASM_STRIP
case SID_TIPOFTHEDAY:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
@@ -614,6 +617,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
bDone = true;
break;
}
+#endif
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case SID_ABOUT:
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 09c54757986d..2cfeaa8f8618 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1345,6 +1345,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
bIsUITest = true;
}
+#ifndef ENABLE_WASM_STRIP
//what's new infobar
OUString sSetupVersion = utl::ConfigManager::getProductVersion();
sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32();
@@ -1434,6 +1435,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
officecfg::Setup::Product::LastTimeDonateShown::set(nNow, batch);
batch->commit();
}
+#endif
// read-only infobar if necessary
const SfxViewShell *pVSh;
@@ -1577,6 +1579,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
}
+#ifndef ENABLE_WASM_STRIP
IMPL_LINK_NOARG(SfxViewFrame, WhatsNewHandler, weld::Button&, void)
{
GetDispatcher()->Execute(SID_WHATSNEW);
@@ -1591,6 +1594,7 @@ IMPL_LINK_NOARG(SfxViewFrame, DonationHandler, weld::Button&, void)
{
GetDispatcher()->Execute(SID_DONATION);
}
+#endif
IMPL_LINK(SfxViewFrame, SwitchReadOnlyHandler, weld::Button&, rButton, void)
{
More information about the Libreoffice-commits
mailing list