[Libreoffice-commits] core.git: extras/Gallery_education.mk extras/Module_extras.mk extras/source scp2/source

Fri Apr 3 21:56:05 UTC 2020

dev/null                                      |binary
 extras/Gallery_education.mk                   |   28 --------------------------
 extras/Module_extras.mk                       |    1 
 extras/source/gallery/education/education.str |    2 -
 scp2/source/ooo/file_extra_ooo.scp            |    1 
 5 files changed, 32 deletions(-)

New commits:
commit 8b594c7f16fb08b71009b13d5af2e8497fad38c3
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Apr 3 21:53:25 2020 +0200
Commit:     andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Apr 3 23:55:32 2020 +0200

    tdf#131789 Remove Environment gallery will be available as extension
    
    Change-Id: Ifb27b0999450b0af1659aea14d50b721712c23db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91662
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk
deleted file mode 100644
index 2697a1cbfb0e..000000000000
--- a/extras/Gallery_education.mk
+++ /dev/null
@@ -1,28 +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_Gallery_Gallery,education,extras/source/gallery/education))
-
-$(eval $(call gb_Gallery_add_files,education,$(LIBO_SHARE_FOLDER)/gallery/education,\
-	extras/source/gallery/education/Blackboard.png \
-	extras/source/gallery/education/Books.png \
-	extras/source/gallery/education/Chalk.png \
-	extras/source/gallery/education/Globe.png \
-	extras/source/gallery/education/Glue.png \
-	extras/source/gallery/education/GraduationCap.png \
-	extras/source/gallery/education/Microscope.png \
-	extras/source/gallery/education/Notebook.png \
-	extras/source/gallery/education/PaperClip-Blue.png \
-	extras/source/gallery/education/PaperClip-Red.png \
-	extras/source/gallery/education/Pencil.png \
-	extras/source/gallery/education/Ruler.png \
-	extras/source/gallery/education/TestTubes.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 9e7481bb1ce4..e69cab07c698 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Gallery_arrows \
 	Gallery_backgrounds \
 	Gallery_diagrams \
-	Gallery_education \
 	Gallery_environment \
 	Gallery_finance \
 	Gallery_people \
diff --git a/extras/source/gallery/education/Blackboard.png b/extras/source/gallery/education/Blackboard.png
deleted file mode 100644
index 7c8fead7e1bd..000000000000
Binary files a/extras/source/gallery/education/Blackboard.png and /dev/null differ
diff --git a/extras/source/gallery/education/Books.png b/extras/source/gallery/education/Books.png
deleted file mode 100644
index c57884fff5e9..000000000000
Binary files a/extras/source/gallery/education/Books.png and /dev/null differ
diff --git a/extras/source/gallery/education/Chalk.png b/extras/source/gallery/education/Chalk.png
deleted file mode 100644
index c0af9e0b47ef..000000000000
Binary files a/extras/source/gallery/education/Chalk.png and /dev/null differ
diff --git a/extras/source/gallery/education/Globe.png b/extras/source/gallery/education/Globe.png
deleted file mode 100644
index bd14965ce624..000000000000
Binary files a/extras/source/gallery/education/Globe.png and /dev/null differ
diff --git a/extras/source/gallery/education/Glue.png b/extras/source/gallery/education/Glue.png
deleted file mode 100644
index 2c8776542680..000000000000
Binary files a/extras/source/gallery/education/Glue.png and /dev/null differ
diff --git a/extras/source/gallery/education/GraduationCap.png b/extras/source/gallery/education/GraduationCap.png
deleted file mode 100644
index 6d048685138f..000000000000
Binary files a/extras/source/gallery/education/GraduationCap.png and /dev/null differ
diff --git a/extras/source/gallery/education/Microscope.png b/extras/source/gallery/education/Microscope.png
deleted file mode 100644
index c6dfba02dd8b..000000000000
Binary files a/extras/source/gallery/education/Microscope.png and /dev/null differ
diff --git a/extras/source/gallery/education/Notebook.png b/extras/source/gallery/education/Notebook.png
deleted file mode 100644
index d2cdbf4798df..000000000000
Binary files a/extras/source/gallery/education/Notebook.png and /dev/null differ
diff --git a/extras/source/gallery/education/PaperClip-Blue.png b/extras/source/gallery/education/PaperClip-Blue.png
deleted file mode 100644
index 6d0d3f6a1c91..000000000000
Binary files a/extras/source/gallery/education/PaperClip-Blue.png and /dev/null differ
diff --git a/extras/source/gallery/education/PaperClip-Red.png b/extras/source/gallery/education/PaperClip-Red.png
deleted file mode 100644
index c00ef118fcc9..000000000000
Binary files a/extras/source/gallery/education/PaperClip-Red.png and /dev/null differ
diff --git a/extras/source/gallery/education/Pencil.png b/extras/source/gallery/education/Pencil.png
deleted file mode 100644
index 374aa738c0ce..000000000000
Binary files a/extras/source/gallery/education/Pencil.png and /dev/null differ
diff --git a/extras/source/gallery/education/Ruler.png b/extras/source/gallery/education/Ruler.png
deleted file mode 100644
index 2b4e7c94cdde..000000000000
Binary files a/extras/source/gallery/education/Ruler.png and /dev/null differ
diff --git a/extras/source/gallery/education/TestTubes.png b/extras/source/gallery/education/TestTubes.png
deleted file mode 100644
index 59595270dcf3..000000000000
Binary files a/extras/source/gallery/education/TestTubes.png and /dev/null differ
diff --git a/extras/source/gallery/education/education.str b/extras/source/gallery/education/education.str
deleted file mode 100644
index bae770e142d2..000000000000
--- a/extras/source/gallery/education/education.str
+++ /dev/null
@@ -1,2 +0,0 @@
-# Translated by desktop-translate and ulfex
-name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 851675e86a52..965a0a2253a2 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -40,7 +40,6 @@ End
 
 GALLERY_FILELIST(arrows)
 GALLERY_FILELIST(diagrams)
-GALLERY_FILELIST(education)
 GALLERY_FILELIST(environment)
 GALLERY_FILELIST(finance)
 GALLERY_FILELIST(people)
