summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Repository.mk14
-rw-r--r--scp2/InstallModule_canvas.mk24
-rw-r--r--scp2/InstallScript_setup_osl.mk1
-rw-r--r--scp2/Module_scp2.mk1
-rw-r--r--scp2/source/canvas/cairocanvas.scp21
-rw-r--r--scp2/source/canvas/canvascommons.scp22
-rw-r--r--scp2/source/canvas/directxcanvas.scp24
-rw-r--r--scp2/source/canvas/mtfrenderer.scp11
-rw-r--r--scp2/source/canvas/vclcanvas.scp21
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp5
10 files changed, 7 insertions, 137 deletions
diff --git a/Repository.mk b/Repository.mk
index 73456b9ab0ff..748fb6167c48 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -257,6 +257,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
$(if $(DISABLE_SCRIPTING),,basctl) \
basegfx \
bib \
+ $(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
+ canvasfactory \
canvastools \
chartcore \
chartcontroller \
@@ -272,6 +274,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
+ $(if $(ENABLE_DIRECTX),directx9canvas) \
drawinglayer \
editeng \
egi \
@@ -298,6 +301,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwk \
fwl \
fwm \
+ $(if $(ENABLE_DIRECTX),gdipluscanvas) \
guesslang \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
@@ -322,6 +326,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
lnth \
$(if $(MERGELIBS),merged) \
msfilter \
+ mtfrenderer \
mysql \
odbc \
odbcbase \
@@ -339,6 +344,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
sdfilt \
sdui \
sfx \
+ simplecanvas \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
svgio \
@@ -359,6 +365,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
utl \
uui \
vcl \
+ vclcanvas \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
xmlscript \
xmlfa \
@@ -602,16 +609,12 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basprov \
- cairocanvas \
- canvasfactory \
cmdmail \
- directx9canvas \
dlgprov \
expwrap \
fastsax \
fpicker \
fps_office \
- gdipluscanvas \
hatchwindowfactory \
i18nsearch \
ldapbe2 \
@@ -619,14 +622,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
migrationoo2 \
migrationoo3 \
msforms \
- mtfrenderer \
OGLTrans \
passwordcontainer \
pdfimport \
postgresql-sdbc \
postgresql-sdbc-impl \
pythonloader \
- simplecanvas \
slideshow \
stringresource \
syssh \
@@ -637,7 +638,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vbaevents \
vbaobj \
vbaswobj \
- vclcanvas \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
) \
diff --git a/scp2/InstallModule_canvas.mk b/scp2/InstallModule_canvas.mk
deleted file mode 100644
index ad721b5fa93c..000000000000
--- a/scp2/InstallModule_canvas.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_InstallModule_InstallModule,scp2/canvas))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/canvas,\
- scp2/source/canvas/canvascommons \
- scp2/source/canvas/mtfrenderer \
- scp2/source/canvas/vclcanvas \
- $(if $(filter TRUE,$(ENABLE_CAIRO_CANVAS)),\
- scp2/source/canvas/cairocanvas \
- ) \
- $(if $(filter TRUE,$(ENABLE_DIRECTX)),\
- scp2/source/canvas/directxcanvas \
- ) \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index f54cad1c4fb4..ecc4ee90c83d 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/accessories \
scp2/base \
scp2/calc \
- scp2/canvas \
scp2/draw \
scp2/graphicfilter \
scp2/impress \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index c58af2e23195..695c88c4ec40 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_accessories \
InstallModule_base \
InstallModule_calc \
- InstallModule_canvas \
InstallModule_draw \
InstallModule_extensions \
InstallModule_graphicfilter \
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
deleted file mode 100644
index eceff58aa6ec..000000000000
--- a/scp2/source/canvas/cairocanvas.scp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas)
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
deleted file mode 100644
index db6b0ae46404..000000000000
--- a/scp2/source/canvas/canvascommons.scp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_CanvasFactory, canvasfactory)
-STD_LIB_FILE(gid_File_SimpleCanvas, simplecanvas)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
deleted file mode 100644
index e9ccf2f52a92..000000000000
--- a/scp2/source/canvas/directxcanvas.scp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-#ifdef WNT
-STD_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas)
-STD_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas)
-#endif
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
deleted file mode 100644
index 768dbe6493ef..000000000000
--- a/scp2/source/canvas/mtfrenderer.scp
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_MtfRenderer, mtfrenderer)
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
deleted file mode 100644
index a50dd433999b..000000000000
--- a/scp2/source/canvas/vclcanvas.scp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 71a6d0fb390b..cf10632e136d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -258,13 +258,8 @@ Module gid_Module_Root_Files_5
gid_File_Lib_XSec_XMLSecurity,
gid_File_Lib_XSec_Framework,
gid_File_Lib_XSec_XmlSec,
- gid_File_CanvasFactory,
- gid_File_SimpleCanvas,
gid_File_Lib_Cmdmail,
gid_File_Lib_I18n,
- gid_File_Lib_VCLCanvas,
- gid_File_Lib_DirectX9Canvas,
- gid_File_Lib_GdiPlusCanvas,
gid_File_Lib_Accessbridge,
gid_File_Lib_Ado,
gid_File_Lib_Dl,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 17:32:35 +0000