postprocess/CustomTarget_registry.mk | 3 ---
scp2/source/python/file_python.scp | 9 ---------
scp2/source/python/module_python.scp | 3 +--
vcl/win/window/salframe.cxx | 5 -----
4 files changed, 1 insertion(+), 19 deletions(-)
New commits:
commit 968166ba4ee96f7c9053c8f4c88ac82381ff7cf4
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Mon Dec 4 12:07:53 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 6 15:23:44 2023 +0100
Remove pyuno.xcd from build/packaging
cleanup after commit 80798b426bf7d5fa4616db1af608640cfbcd79fe
Change-Id: I8d1712ac592a69ec0b9a5705d6a689e57062e347
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160300
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 034d7b7c36e0..1e2e473e0b4d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -30,7 +30,6 @@ postprocess_XCDS := \
lingucomponent.xcd \
main.xcd \
math.xcd \
- pyuno.xcd \
writer.xcd \
xsltfilter.xcd
@@ -338,8 +337,6 @@ postprocess_FILES_math := \
$(postprocess_MOD)/org/openoffice/Office/Embedding-math.xcu \
$(postprocess_MOD)/org/openoffice/Setup-math.xcu
-postprocess_DEPS_pyuno := main
-
ifeq ($(ENABLE_REPORTBUILDER),TRUE)
postprocess_XCDS += reportbuilder.xcd
postprocess_DEPS_reportbuilder := main
diff --git a/scp2/source/python/file_python.scp
b/scp2/source/python/file_python.scp
index fd008624fd66..f1982cb49380 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -50,14 +50,5 @@ End
#endif // SYSTEM_PYTHON
-// Scripting Framework Python configuration settings
-
-File gid_File_Share_Registry_Pyuno_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "pyuno.xcd";
-End
-
// DISABLE_PYUNO
#endif
diff --git a/scp2/source/python/module_python.scp
b/scp2/source/python/module_python.scp
index 343ad94029fb..62c1bdcd4dd6 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -46,8 +46,7 @@ Module gid_Module_Pyuno
Files = (auto_python_ALL,
gid_File_Pyuno_Rdb,
gid_File_Lib_Python_So,
- gid_File_Lib_Python3_So,
- gid_File_Share_Registry_Pyuno_Xcd);
+ gid_File_Lib_Python3_So);
Unixlinks = (gid_Unixlink_Python_Headers,
gid_Unixlink_Python_LibreOfficePython,
gid_Unixlink_Python_Resources,
commit 714e406fc4089f1a4b67c9a1ac55bf4162cc5a01
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Sun Dec 3 23:38:31 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Dec 6 15:23:36 2023 +0100
Drop use of Win98-era multimon.h
last mention of it was removed in 2014 by:
commit cb40b7d2f9902b5fbe89333c4107d72c156b9a15
Change-Id: Ib60d84624b681d103bc654075a759fc92f8f3300
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160289
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 3228caf2f345..aaafe56ee887 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -76,11 +76,6 @@
#include <window.h>
#include <sallayout.hxx>
-#define COMPILE_MULTIMON_STUBS
-#pragma warning(push)
-#pragma warning(disable:4996) // 'GetVersionExA': was declared deprecated
-#include <multimon.h>
-#pragma warning(pop)
#include <vector>
#include <com/sun/star/uno/Exception.hpp>
