strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix --disable-scripting build

Browse source 
Change-Id: I0b0113d5e3a1652280e0d84c1beba7c572ded191
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177736
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-12-03 13:17:29 +00:00
parent 3e6ad944ac
commit d7736eb6ae
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cui/Library_cui.mk
View file

@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,cui))
$(eval $(call gb_Library_use_libraries,cui,\ $(eval $(call gb_Library_use_libraries,cui,\
$(call gb_Helper_optional,AVMEDIA,avmedia) \ $(call gb_Helper_optional,AVMEDIA,avmedia) \
basctl \ $(call gb_Helper_optional,SCRIPTING,basctl) \
basegfx \ basegfx \
comphelper \ comphelper \
cppu \ cppu \
@ -148,7 +148,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/GraphicTestsDialog \ cui/source/dialogs/GraphicTestsDialog \
cui/source/dialogs/ImageViewerDialog \ cui/source/dialogs/ImageViewerDialog \
cui/source/dialogs/scriptdlg \ cui/source/dialogs/scriptdlg \
cui/source/dialogs/MacroManagerDialog \ $(call gb_Helper_optional,SCRIPTING, \
cui/source/dialogs/MacroManagerDialog) \
cui/source/dialogs/SignatureLineDialogBase \ cui/source/dialogs/SignatureLineDialogBase \
cui/source/dialogs/SignatureLineDialog \ cui/source/dialogs/SignatureLineDialog \
cui/source/dialogs/SignSignatureLineDialog \ cui/source/dialogs/SignSignatureLineDialog \

22
cui/source/factory/dlgfact.cxx
View file

@ -1003,13 +1003,31 @@ VclPtr<AbstractMacroManagerDialog>
AbstractDialogFactory_Impl::CreateMacroManagerDialog(weld::Window* pParent, AbstractDialogFactory_Impl::CreateMacroManagerDialog(weld::Window* pParent,
const Reference<frame::XFrame>& rxFrame) const Reference<frame::XFrame>& rxFrame)
{ {
#if HAVE_FEATURE_SCRIPTING
return VclPtr<AbstractMacroManagerDialog_Impl>::Create( return VclPtr<AbstractMacroManagerDialog_Impl>::Create(
std::make_shared<MacroManagerDialog>(pParent, rxFrame)); std::make_shared<MacroManagerDialog>(pParent, rxFrame));
#else
(void)pParent;
(void)rxFrame;
return nullptr;
#endif
} }
OUString AbstractMacroManagerDialog_Impl::GetScriptURL() const { return m_xDlg->GetScriptURL(); } OUString AbstractMacroManagerDialog_Impl::GetScriptURL() const
{
#if HAVE_FEATURE_SCRIPTING
return m_xDlg->GetScriptURL();
#else
return OUString();
#endif
}
void AbstractMacroManagerDialog_Impl::LoadLastUsedMacro() const { m_xDlg->LoadLastUsedMacro(); } void AbstractMacroManagerDialog_Impl::LoadLastUsedMacro() const
{
#if HAVE_FEATURE_SCRIPTING
m_xDlg->LoadLastUsedMacro();
#endif
}
VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog(weld::Window* pParent, VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog(weld::Window* pParent,
const OUString& rLanguage) const OUString& rLanguage)