tdf#114817 new bitmap presets for Area Fill
Change-Id: Icc48efc2f6c085ccf0754620dc1cbf5132a7f824
Reviewed-on: https://gerrit.libreoffice.org/49551
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
diff --git a/extras/Gallery_backgrounds.mk b/extras/Gallery_backgrounds.mk
new file mode 100644
index 0000000..103f484
--- /dev/null
+++ b/extras/Gallery_backgrounds.mk
@@ -0,0 +1,60 @@
# -*- 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,backgrounds,extras/source/gallery/backgrounds))
$(eval $(call gb_Gallery_add_files,backgrounds,$(LIBO_SHARE_FOLDER)/gallery/backgrounds,\
extras/source/gallery/backgrounds/fuzzy-lightgrey.jpg \
extras/source/gallery/backgrounds/ice-light.jpg \
extras/source/gallery/backgrounds/painted-white.jpg \
extras/source/gallery/backgrounds/texture-paper.jpg \
extras/source/gallery/backgrounds/crumpled-paper.jpg \
extras/source/gallery/backgrounds/marble.jpg \
extras/source/gallery/backgrounds/concrete.jpg \
extras/source/gallery/backgrounds/fuzzy-grey.jpg \
extras/source/gallery/backgrounds/fuzzy-darkgrey.jpg \
extras/source/gallery/backgrounds/stone.jpg \
extras/source/gallery/backgrounds/white-diffusion.jpg \
extras/source/gallery/backgrounds/sand-light.jpg \
extras/source/gallery/backgrounds/sand.jpg \
extras/source/gallery/backgrounds/surface.jpg \
extras/source/gallery/backgrounds/studio.jpg \
extras/source/gallery/backgrounds/invoiced-paper.jpg \
extras/source/gallery/backgrounds/parchment-paper.jpg \
extras/source/gallery/backgrounds/cardboard.jpg \
extras/source/gallery/backgrounds/fence.jpg \
extras/source/gallery/backgrounds/wooden-fence.jpg \
extras/source/gallery/backgrounds/wood.jpg \
extras/source/gallery/backgrounds/wooden-board.jpg \
extras/source/gallery/backgrounds/painted-wood.jpg \
extras/source/gallery/backgrounds/stones.jpg \
extras/source/gallery/backgrounds/pebble-light.jpg \
extras/source/gallery/backgrounds/stone-wall.jpg \
extras/source/gallery/backgrounds/stone-gray.jpg \
extras/source/gallery/backgrounds/rock-wall.jpg \
extras/source/gallery/backgrounds/surface-black.jpg \
extras/source/gallery/backgrounds/brick-wall.png \
extras/source/gallery/backgrounds/tiles.jpg \
extras/source/gallery/backgrounds/graph-paper.png \
extras/source/gallery/backgrounds/cloud.jpg \
extras/source/gallery/backgrounds/pool.jpg \
extras/source/gallery/backgrounds/sky.jpg \
extras/source/gallery/backgrounds/circuit-board.jpg \
extras/source/gallery/backgrounds/coffee.jpg \
extras/source/gallery/backgrounds/color-stripes.png \
extras/source/gallery/backgrounds/floral.png \
extras/source/gallery/backgrounds/leaf.jpg \
extras/source/gallery/backgrounds/maple-leaves.jpg \
extras/source/gallery/backgrounds/space.png \
extras/source/gallery/backgrounds/giraffe.png \
extras/source/gallery/backgrounds/tiger.jpg \
extras/source/gallery/backgrounds/zebra.png \
))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index b08c47a..34ccf29 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_gallmytheme \
Package_gallroot \
Package_gallsystem \
Package_gallwwwback \
Package_gallwwwgraf \
Package_glade \
Package_labels \
@@ -54,6 +53,7 @@ $(eval $(call gb_Module_add_l10n_targets,extras,\
ifneq ($(WITH_GALLERY_BUILD),)
$(eval $(call gb_Module_add_targets,extras,\
Gallery_arrows \
Gallery_backgrounds \
Gallery_computers \
Gallery_diagrams \
Gallery_education \
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index f8882d8..1f49921 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -13,9 +13,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/galler
sg1.sdg \
sg1.sdv \
sg1.thm \
sg3.sdg \
sg3.sdv \
sg3.thm \
sg4.sdg \
sg4.sdv \
sg4.thm \
diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk
deleted file mode 100644
index f46a80c..0000000
--- a/extras/Package_gallwwwback.mk
+++ /dev/null
@@ -1,77 +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_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
$(eval $(call gb_Package_add_files,extras_gallwwwback,$(LIBO_SHARE_FOLDER)/gallery/www-back,\
aqua.jpg \
bathroom.jpg \
blocks.jpg \
blow_green.jpg \
blueblop.jpg \
bulging.jpg \
canvas_blue.jpg \
cheese.jpg \
chocolate.jpg \
citrus.jpg \
confetti.jpg \
daisy.jpg \
fluffy-grey.jpg \
fluffy.jpg \
fuzzy-blue.jpg \
fuzzy-darkgrey.jpg \
fuzzy-grey.jpg \
fuzzy-lightgrey.jpg \
fuzzy_light.jpg \
gregre.gif \
grey.gif \
grypaws.gif \
ice-blue.jpg \
ice-light.jpg \
imitation_leather.jpg \
interstices.jpg \
jeansblk.jpg \
jeans.jpg \
lawn-artificial.jpg \
lawn.jpg \
lightblue-wet.jpg \
linen-fine.jpg \
lino-green.jpg \
liquid-blue.jpg \
marble_dark.jpg \
marble.jpg \
mazes.jpg \
mint.gif \
notes.gif \
pattern.jpg \
pebble-light.jpg \
pink.gif \
pool.jpg \
popcorn.jpg \
purple.jpg \
reddark.jpg \
rings-green.jpg \
rings-orange.jpg \
roses.jpg \
sand.jpg \
sand-light.jpg \
sky.jpg \
soft-structure_grey.jpg \
space.jpg \
stone-dark.jpg \
stone.jpg \
structure_darkgreen.gif \
structure_green.jpg \
structure.jpg \
wall-grey.jpg \
wet-turquoise.jpg \
wood.jpg \
))
# vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/backgrounds/backgrounds.str b/extras/source/gallery/backgrounds/backgrounds.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/backgrounds/backgrounds.str
@@ -0,0 +1,2 @@
# Translated by desktop-translate and ulfex
name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/backgrounds/brick-wall.png b/extras/source/gallery/backgrounds/brick-wall.png
new file mode 100644
index 0000000..59633aa
--- /dev/null
+++ b/extras/source/gallery/backgrounds/brick-wall.png
Binary files differ
diff --git a/extras/source/gallery/backgrounds/cardboard.jpg b/extras/source/gallery/backgrounds/cardboard.jpg
new file mode 100644
index 0000000..137a096
--- /dev/null
+++ b/extras/source/gallery/backgrounds/cardboard.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/circuit-board.jpg b/extras/source/gallery/backgrounds/circuit-board.jpg
new file mode 100644
index 0000000..30596e7
--- /dev/null
+++ b/extras/source/gallery/backgrounds/circuit-board.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/cloud.jpg b/extras/source/gallery/backgrounds/cloud.jpg
new file mode 100644
index 0000000..429ed63
--- /dev/null
+++ b/extras/source/gallery/backgrounds/cloud.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/coffee.jpg b/extras/source/gallery/backgrounds/coffee.jpg
new file mode 100644
index 0000000..4469763
--- /dev/null
+++ b/extras/source/gallery/backgrounds/coffee.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/color-stripes.png b/extras/source/gallery/backgrounds/color-stripes.png
new file mode 100644
index 0000000..20513f0
--- /dev/null
+++ b/extras/source/gallery/backgrounds/color-stripes.png
Binary files differ
diff --git a/extras/source/gallery/backgrounds/concrete.jpg b/extras/source/gallery/backgrounds/concrete.jpg
new file mode 100644
index 0000000..2c373c8
--- /dev/null
+++ b/extras/source/gallery/backgrounds/concrete.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/crumpled-paper.jpg b/extras/source/gallery/backgrounds/crumpled-paper.jpg
new file mode 100644
index 0000000..138aa30
--- /dev/null
+++ b/extras/source/gallery/backgrounds/crumpled-paper.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/fence.jpg b/extras/source/gallery/backgrounds/fence.jpg
new file mode 100644
index 0000000..5e7df13
--- /dev/null
+++ b/extras/source/gallery/backgrounds/fence.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/floral.png b/extras/source/gallery/backgrounds/floral.png
new file mode 100644
index 0000000..ef34662
--- /dev/null
+++ b/extras/source/gallery/backgrounds/floral.png
Binary files differ
diff --git a/extras/source/gallery/www-back/fuzzy-darkgrey.jpg b/extras/source/gallery/backgrounds/fuzzy-darkgrey.jpg
similarity index 100%
rename from extras/source/gallery/www-back/fuzzy-darkgrey.jpg
rename to extras/source/gallery/backgrounds/fuzzy-darkgrey.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/fuzzy-grey.jpg b/extras/source/gallery/backgrounds/fuzzy-grey.jpg
similarity index 100%
rename from extras/source/gallery/www-back/fuzzy-grey.jpg
rename to extras/source/gallery/backgrounds/fuzzy-grey.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/fuzzy-lightgrey.jpg b/extras/source/gallery/backgrounds/fuzzy-lightgrey.jpg
similarity index 100%
rename from extras/source/gallery/www-back/fuzzy-lightgrey.jpg
rename to extras/source/gallery/backgrounds/fuzzy-lightgrey.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/giraffe.png b/extras/source/gallery/backgrounds/giraffe.png
new file mode 100644
index 0000000..fdc8008
--- /dev/null
+++ b/extras/source/gallery/backgrounds/giraffe.png
Binary files differ
diff --git a/extras/source/gallery/backgrounds/graph-paper.png b/extras/source/gallery/backgrounds/graph-paper.png
new file mode 100644
index 0000000..c383f03
--- /dev/null
+++ b/extras/source/gallery/backgrounds/graph-paper.png
Binary files differ
diff --git a/extras/source/gallery/www-back/ice-light.jpg b/extras/source/gallery/backgrounds/ice-light.jpg
similarity index 100%
rename from extras/source/gallery/www-back/ice-light.jpg
rename to extras/source/gallery/backgrounds/ice-light.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/invoiced-paper.jpg b/extras/source/gallery/backgrounds/invoiced-paper.jpg
new file mode 100644
index 0000000..048c444
--- /dev/null
+++ b/extras/source/gallery/backgrounds/invoiced-paper.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/leaf.jpg b/extras/source/gallery/backgrounds/leaf.jpg
new file mode 100644
index 0000000..5fd33a9
--- /dev/null
+++ b/extras/source/gallery/backgrounds/leaf.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/maple-leaves.jpg b/extras/source/gallery/backgrounds/maple-leaves.jpg
new file mode 100644
index 0000000..aaeab90
--- /dev/null
+++ b/extras/source/gallery/backgrounds/maple-leaves.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/marble.jpg b/extras/source/gallery/backgrounds/marble.jpg
similarity index 100%
rename from extras/source/gallery/www-back/marble.jpg
rename to extras/source/gallery/backgrounds/marble.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/painted-white.jpg b/extras/source/gallery/backgrounds/painted-white.jpg
new file mode 100644
index 0000000..a686c2b
--- /dev/null
+++ b/extras/source/gallery/backgrounds/painted-white.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/painted-wood.jpg b/extras/source/gallery/backgrounds/painted-wood.jpg
new file mode 100644
index 0000000..956f5ba
--- /dev/null
+++ b/extras/source/gallery/backgrounds/painted-wood.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/parchment-paper.jpg b/extras/source/gallery/backgrounds/parchment-paper.jpg
new file mode 100644
index 0000000..89d10b9
--- /dev/null
+++ b/extras/source/gallery/backgrounds/parchment-paper.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/pebble-light.jpg b/extras/source/gallery/backgrounds/pebble-light.jpg
similarity index 100%
rename from extras/source/gallery/www-back/pebble-light.jpg
rename to extras/source/gallery/backgrounds/pebble-light.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/pool.jpg b/extras/source/gallery/backgrounds/pool.jpg
similarity index 100%
rename from extras/source/gallery/www-back/pool.jpg
rename to extras/source/gallery/backgrounds/pool.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/rock-wall.jpg b/extras/source/gallery/backgrounds/rock-wall.jpg
new file mode 100644
index 0000000..1395db8
--- /dev/null
+++ b/extras/source/gallery/backgrounds/rock-wall.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/sand-light.jpg b/extras/source/gallery/backgrounds/sand-light.jpg
similarity index 100%
rename from extras/source/gallery/www-back/sand-light.jpg
rename to extras/source/gallery/backgrounds/sand-light.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/sand.jpg b/extras/source/gallery/backgrounds/sand.jpg
similarity index 100%
rename from extras/source/gallery/www-back/sand.jpg
rename to extras/source/gallery/backgrounds/sand.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/sky.jpg b/extras/source/gallery/backgrounds/sky.jpg
similarity index 100%
rename from extras/source/gallery/www-back/sky.jpg
rename to extras/source/gallery/backgrounds/sky.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/space.png b/extras/source/gallery/backgrounds/space.png
new file mode 100644
index 0000000..b51931e
--- /dev/null
+++ b/extras/source/gallery/backgrounds/space.png
Binary files differ
diff --git a/extras/source/gallery/www-back/stone.jpg b/extras/source/gallery/backgrounds/stone-gray.jpg
similarity index 100%
rename from extras/source/gallery/www-back/stone.jpg
rename to extras/source/gallery/backgrounds/stone-gray.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/stone-wall.jpg b/extras/source/gallery/backgrounds/stone-wall.jpg
new file mode 100644
index 0000000..c29d57a
--- /dev/null
+++ b/extras/source/gallery/backgrounds/stone-wall.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/stone.jpg b/extras/source/gallery/backgrounds/stone.jpg
new file mode 100644
index 0000000..6f2cbf3
--- /dev/null
+++ b/extras/source/gallery/backgrounds/stone.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/stones.jpg b/extras/source/gallery/backgrounds/stones.jpg
new file mode 100644
index 0000000..039bfef
--- /dev/null
+++ b/extras/source/gallery/backgrounds/stones.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/studio.jpg b/extras/source/gallery/backgrounds/studio.jpg
new file mode 100644
index 0000000..a89fecb
--- /dev/null
+++ b/extras/source/gallery/backgrounds/studio.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/surface-black.jpg b/extras/source/gallery/backgrounds/surface-black.jpg
new file mode 100644
index 0000000..f1045bf1
--- /dev/null
+++ b/extras/source/gallery/backgrounds/surface-black.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/surface.jpg b/extras/source/gallery/backgrounds/surface.jpg
new file mode 100644
index 0000000..70f4343
--- /dev/null
+++ b/extras/source/gallery/backgrounds/surface.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/texture-paper.jpg b/extras/source/gallery/backgrounds/texture-paper.jpg
new file mode 100644
index 0000000..c90c8e5
--- /dev/null
+++ b/extras/source/gallery/backgrounds/texture-paper.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/tiger.jpg b/extras/source/gallery/backgrounds/tiger.jpg
new file mode 100644
index 0000000..4bb1cf7
--- /dev/null
+++ b/extras/source/gallery/backgrounds/tiger.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/tiles.jpg b/extras/source/gallery/backgrounds/tiles.jpg
new file mode 100644
index 0000000..3ff1210
--- /dev/null
+++ b/extras/source/gallery/backgrounds/tiles.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/white-diffusion.jpg b/extras/source/gallery/backgrounds/white-diffusion.jpg
new file mode 100644
index 0000000..9518cd1
--- /dev/null
+++ b/extras/source/gallery/backgrounds/white-diffusion.jpg
Binary files differ
diff --git a/extras/source/gallery/www-back/wood.jpg b/extras/source/gallery/backgrounds/wood.jpg
similarity index 100%
rename from extras/source/gallery/www-back/wood.jpg
rename to extras/source/gallery/backgrounds/wood.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/wooden-board.jpg b/extras/source/gallery/backgrounds/wooden-board.jpg
new file mode 100644
index 0000000..41ea6fdf
--- /dev/null
+++ b/extras/source/gallery/backgrounds/wooden-board.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/wooden-fence.jpg b/extras/source/gallery/backgrounds/wooden-fence.jpg
new file mode 100644
index 0000000..0ab15e3
--- /dev/null
+++ b/extras/source/gallery/backgrounds/wooden-fence.jpg
Binary files differ
diff --git a/extras/source/gallery/backgrounds/zebra.png b/extras/source/gallery/backgrounds/zebra.png
new file mode 100644
index 0000000..83740dd
--- /dev/null
+++ b/extras/source/gallery/backgrounds/zebra.png
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg3.sdg b/extras/source/gallery/gallery_system/sg3.sdg
index 970cc7a..269e572 100644
--- a/extras/source/gallery/gallery_system/sg3.sdg
+++ b/extras/source/gallery/gallery_system/sg3.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg3.thm b/extras/source/gallery/gallery_system/sg3.thm
index c3956c1..b81238c 100644
--- a/extras/source/gallery/gallery_system/sg3.thm
+++ b/extras/source/gallery/gallery_system/sg3.thm
Binary files differ
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 12d7769..0d1da8d 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -10,6 +10,9 @@
[arrows]
en-US = "Arrows"
[backgrounds]
en-US = "Backgrounds"
[computers]
en-US = "Computers"
diff --git a/extras/source/gallery/www-back/aqua.jpg b/extras/source/gallery/www-back/aqua.jpg
deleted file mode 100644
index a7b29ee..0000000
--- a/extras/source/gallery/www-back/aqua.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/bathroom.jpg b/extras/source/gallery/www-back/bathroom.jpg
deleted file mode 100644
index 058f01a..0000000
--- a/extras/source/gallery/www-back/bathroom.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/blocks.jpg b/extras/source/gallery/www-back/blocks.jpg
deleted file mode 100644
index 1cd0c6e..0000000
--- a/extras/source/gallery/www-back/blocks.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/blow_green.jpg b/extras/source/gallery/www-back/blow_green.jpg
deleted file mode 100644
index aedb52e..0000000
--- a/extras/source/gallery/www-back/blow_green.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/blueblop.jpg b/extras/source/gallery/www-back/blueblop.jpg
deleted file mode 100644
index 330cacb..0000000
--- a/extras/source/gallery/www-back/blueblop.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/bulging.jpg b/extras/source/gallery/www-back/bulging.jpg
deleted file mode 100644
index 02c0830..0000000
--- a/extras/source/gallery/www-back/bulging.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/canvas_blue.jpg b/extras/source/gallery/www-back/canvas_blue.jpg
deleted file mode 100644
index a0ab3b3..0000000
--- a/extras/source/gallery/www-back/canvas_blue.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/cheese.jpg b/extras/source/gallery/www-back/cheese.jpg
deleted file mode 100644
index dea5795..0000000
--- a/extras/source/gallery/www-back/cheese.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/chocolate.jpg b/extras/source/gallery/www-back/chocolate.jpg
deleted file mode 100644
index 7e04116..0000000
--- a/extras/source/gallery/www-back/chocolate.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/citrus.jpg b/extras/source/gallery/www-back/citrus.jpg
deleted file mode 100644
index ceb9ef08..0000000
--- a/extras/source/gallery/www-back/citrus.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/confetti.jpg b/extras/source/gallery/www-back/confetti.jpg
deleted file mode 100644
index f04bfab..0000000
--- a/extras/source/gallery/www-back/confetti.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/daisy.jpg b/extras/source/gallery/www-back/daisy.jpg
deleted file mode 100644
index 69287fa..0000000
--- a/extras/source/gallery/www-back/daisy.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/fluffy-grey.jpg b/extras/source/gallery/www-back/fluffy-grey.jpg
deleted file mode 100644
index 351ac42..0000000
--- a/extras/source/gallery/www-back/fluffy-grey.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/fluffy.jpg b/extras/source/gallery/www-back/fluffy.jpg
deleted file mode 100644
index c8398cc..0000000
--- a/extras/source/gallery/www-back/fluffy.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/fuzzy-blue.jpg b/extras/source/gallery/www-back/fuzzy-blue.jpg
deleted file mode 100644
index b65a17e..0000000
--- a/extras/source/gallery/www-back/fuzzy-blue.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/fuzzy_light.jpg b/extras/source/gallery/www-back/fuzzy_light.jpg
deleted file mode 100644
index 8715e99..0000000
--- a/extras/source/gallery/www-back/fuzzy_light.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/gregre.gif b/extras/source/gallery/www-back/gregre.gif
deleted file mode 100644
index 9d86063..0000000
--- a/extras/source/gallery/www-back/gregre.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/grey.gif b/extras/source/gallery/www-back/grey.gif
deleted file mode 100644
index cde670f..0000000
--- a/extras/source/gallery/www-back/grey.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/grypaws.gif b/extras/source/gallery/www-back/grypaws.gif
deleted file mode 100644
index 9ea9652..0000000
--- a/extras/source/gallery/www-back/grypaws.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/ice-blue.jpg b/extras/source/gallery/www-back/ice-blue.jpg
deleted file mode 100644
index db5d361..0000000
--- a/extras/source/gallery/www-back/ice-blue.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/imitation_leather.jpg b/extras/source/gallery/www-back/imitation_leather.jpg
deleted file mode 100644
index 12ddb21..0000000
--- a/extras/source/gallery/www-back/imitation_leather.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/interstices.jpg b/extras/source/gallery/www-back/interstices.jpg
deleted file mode 100644
index 5f5cf77..0000000
--- a/extras/source/gallery/www-back/interstices.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/jeans.jpg b/extras/source/gallery/www-back/jeans.jpg
deleted file mode 100644
index 63d13c3..0000000
--- a/extras/source/gallery/www-back/jeans.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/jeansblk.jpg b/extras/source/gallery/www-back/jeansblk.jpg
deleted file mode 100644
index 25a2f71..0000000
--- a/extras/source/gallery/www-back/jeansblk.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/lawn-artificial.jpg b/extras/source/gallery/www-back/lawn-artificial.jpg
deleted file mode 100644
index ff2ecca..0000000
--- a/extras/source/gallery/www-back/lawn-artificial.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/lawn.jpg b/extras/source/gallery/www-back/lawn.jpg
deleted file mode 100644
index 60382b3..0000000
--- a/extras/source/gallery/www-back/lawn.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/lightblue-wet.jpg b/extras/source/gallery/www-back/lightblue-wet.jpg
deleted file mode 100644
index 227afaf..0000000
--- a/extras/source/gallery/www-back/lightblue-wet.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/linen-fine.jpg b/extras/source/gallery/www-back/linen-fine.jpg
deleted file mode 100644
index af874d2..0000000
--- a/extras/source/gallery/www-back/linen-fine.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/lino-green.jpg b/extras/source/gallery/www-back/lino-green.jpg
deleted file mode 100644
index e178db0..0000000
--- a/extras/source/gallery/www-back/lino-green.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/liquid-blue.jpg b/extras/source/gallery/www-back/liquid-blue.jpg
deleted file mode 100644
index 97b56e0b..0000000
--- a/extras/source/gallery/www-back/liquid-blue.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/marble_dark.jpg b/extras/source/gallery/www-back/marble_dark.jpg
deleted file mode 100644
index e610fc7..0000000
--- a/extras/source/gallery/www-back/marble_dark.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/mazes.jpg b/extras/source/gallery/www-back/mazes.jpg
deleted file mode 100644
index 2aa84ad..0000000
--- a/extras/source/gallery/www-back/mazes.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/mint.gif b/extras/source/gallery/www-back/mint.gif
deleted file mode 100644
index a323112..0000000
--- a/extras/source/gallery/www-back/mint.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/notes.gif b/extras/source/gallery/www-back/notes.gif
deleted file mode 100644
index 6637d61..0000000
--- a/extras/source/gallery/www-back/notes.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/pattern.jpg b/extras/source/gallery/www-back/pattern.jpg
deleted file mode 100644
index 6a6a3d8..0000000
--- a/extras/source/gallery/www-back/pattern.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/pink.gif b/extras/source/gallery/www-back/pink.gif
deleted file mode 100644
index b4f9859..0000000
--- a/extras/source/gallery/www-back/pink.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/popcorn.jpg b/extras/source/gallery/www-back/popcorn.jpg
deleted file mode 100644
index 4b46460..0000000
--- a/extras/source/gallery/www-back/popcorn.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/purple.jpg b/extras/source/gallery/www-back/purple.jpg
deleted file mode 100644
index 71a027a..0000000
--- a/extras/source/gallery/www-back/purple.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/reddark.jpg b/extras/source/gallery/www-back/reddark.jpg
deleted file mode 100644
index a7e5eaf..0000000
--- a/extras/source/gallery/www-back/reddark.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/rings-green.jpg b/extras/source/gallery/www-back/rings-green.jpg
deleted file mode 100644
index 17062c2..0000000
--- a/extras/source/gallery/www-back/rings-green.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/rings-orange.jpg b/extras/source/gallery/www-back/rings-orange.jpg
deleted file mode 100644
index 4c49bb9..0000000
--- a/extras/source/gallery/www-back/rings-orange.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/roses.jpg b/extras/source/gallery/www-back/roses.jpg
deleted file mode 100644
index 3bcc34e..0000000
--- a/extras/source/gallery/www-back/roses.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/soft-structure_grey.jpg b/extras/source/gallery/www-back/soft-structure_grey.jpg
deleted file mode 100644
index 48d0943..0000000
--- a/extras/source/gallery/www-back/soft-structure_grey.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/space.jpg b/extras/source/gallery/www-back/space.jpg
deleted file mode 100644
index 808165d..0000000
--- a/extras/source/gallery/www-back/space.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/stone-dark.jpg b/extras/source/gallery/www-back/stone-dark.jpg
deleted file mode 100644
index eb50eee..0000000
--- a/extras/source/gallery/www-back/stone-dark.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/structure.jpg b/extras/source/gallery/www-back/structure.jpg
deleted file mode 100644
index b49da30..0000000
--- a/extras/source/gallery/www-back/structure.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/structure_darkgreen.gif b/extras/source/gallery/www-back/structure_darkgreen.gif
deleted file mode 100644
index ed9e6d2..0000000
--- a/extras/source/gallery/www-back/structure_darkgreen.gif
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/structure_green.jpg b/extras/source/gallery/www-back/structure_green.jpg
deleted file mode 100644
index 240f2ad..0000000
--- a/extras/source/gallery/www-back/structure_green.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/wall-grey.jpg b/extras/source/gallery/www-back/wall-grey.jpg
deleted file mode 100644
index 42270e0..0000000
--- a/extras/source/gallery/www-back/wall-grey.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/www-back/wet-turquoise.jpg b/extras/source/gallery/www-back/wet-turquoise.jpg
deleted file mode 100644
index 4f6dfc3..0000000
--- a/extras/source/gallery/www-back/wet-turquoise.jpg
+++ /dev/null
Binary files differ
diff --git a/extras/source/palettes/standard.sob b/extras/source/palettes/standard.sob
index 820190b..f8ff573 100644
--- a/extras/source/palettes/standard.sob
+++ b/extras/source/palettes/standard.sob
Binary files differ
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c3ca322..c9f4fd2 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -771,26 +771,26 @@
#define RID_SVXSTR_HATCH9 NC_("RID_SVXSTR_HATCH9", "Black 0 Degrees")
#define RID_SVXSTR_HATCH10 NC_("RID_SVXSTR_HATCH10", "Hatching" )
#define RID_SVXSTR_BMP0 NC_("RID_SVXSTR_BMP0", "Empty")
#define RID_SVXSTR_BMP1 NC_("RID_SVXSTR_BMP1", "Sky")
#define RID_SVXSTR_BMP2 NC_("RID_SVXSTR_BMP2", "Water")
#define RID_SVXSTR_BMP3 NC_("RID_SVXSTR_BMP3", "Coarse grained")
#define RID_SVXSTR_BMP4 NC_("RID_SVXSTR_BMP4", "Mercury")
#define RID_SVXSTR_BMP5 NC_("RID_SVXSTR_BMP5", "Space")
#define RID_SVXSTR_BMP6 NC_("RID_SVXSTR_BMP6", "Metal")
#define RID_SVXSTR_BMP7 NC_("RID_SVXSTR_BMP7", "Droplets")
#define RID_SVXSTR_BMP8 NC_("RID_SVXSTR_BMP8", "Marble")
#define RID_SVXSTR_BMP9 NC_("RID_SVXSTR_BMP9", "Linen")
#define RID_SVXSTR_BMP10 NC_("RID_SVXSTR_BMP10", "Stone")
#define RID_SVXSTR_BMP11 NC_("RID_SVXSTR_BMP11", "Gravel")
#define RID_SVXSTR_BMP12 NC_("RID_SVXSTR_BMP12", "Wall")
#define RID_SVXSTR_BMP13 NC_("RID_SVXSTR_BMP13", "Brownstone")
#define RID_SVXSTR_BMP14 NC_("RID_SVXSTR_BMP14", "Netting")
#define RID_SVXSTR_BMP15 NC_("RID_SVXSTR_BMP15", "Leaves")
#define RID_SVXSTR_BMP16 NC_("RID_SVXSTR_BMP16", "Artificial Turf")
#define RID_SVXSTR_BMP17 NC_("RID_SVXSTR_BMP17", "Daisy")
#define RID_SVXSTR_BMP18 NC_("RID_SVXSTR_BMP18", "Orange")
#define RID_SVXSTR_BMP19 NC_("RID_SVXSTR_BMP19", "Fiery")
#define RID_SVXSTR_BMP20 NC_("RID_SVXSTR_BMP20", "Roses")
#define RID_SVXSTR_BMP1 NC_("RID_SVXSTR_BMP1", "Painted White")
#define RID_SVXSTR_BMP2 NC_("RID_SVXSTR_BMP2", "Paper Texture")
#define RID_SVXSTR_BMP3 NC_("RID_SVXSTR_BMP3", "Paper Crumpled")
#define RID_SVXSTR_BMP4 NC_("RID_SVXSTR_BMP4", "Paper Graph")
#define RID_SVXSTR_BMP5 NC_("RID_SVXSTR_BMP5", "Parchment Paper")
#define RID_SVXSTR_BMP6 NC_("RID_SVXSTR_BMP6", "Fence")
#define RID_SVXSTR_BMP7 NC_("RID_SVXSTR_BMP7", "Wooden Board")
#define RID_SVXSTR_BMP8 NC_("RID_SVXSTR_BMP8", "Maple Leaves")
#define RID_SVXSTR_BMP9 NC_("RID_SVXSTR_BMP9", "Lawn")
#define RID_SVXSTR_BMP10 NC_("RID_SVXSTR_BMP10", "Colorful Pebbles")
#define RID_SVXSTR_BMP11 NC_("RID_SVXSTR_BMP11", "Coffee Beans")
#define RID_SVXSTR_BMP12 NC_("RID_SVXSTR_BMP12", "Little Clouds")
#define RID_SVXSTR_BMP13 NC_("RID_SVXSTR_BMP13", "Bathroom Tiles")
#define RID_SVXSTR_BMP14 NC_("RID_SVXSTR_BMP14", "Wall of Rock")
#define RID_SVXSTR_BMP15 NC_("RID_SVXSTR_BMP15", "Zebra")
#define RID_SVXSTR_BMP16 NC_("RID_SVXSTR_BMP16", "Color Stripes")
#define RID_SVXSTR_BMP17 NC_("RID_SVXSTR_BMP17", "Gravel")
#define RID_SVXSTR_BMP18 NC_("RID_SVXSTR_BMP18", "Parchment Studio")
#define RID_SVXSTR_BMP19 NC_("RID_SVXSTR_BMP19", "Night Sky")
#define RID_SVXSTR_BMP20 NC_("RID_SVXSTR_BMP20", "Pool")
#define RID_SVXSTR_BMP21 NC_("RID_SVXSTR_BMP21", "Bitmap")
#define RID_SVXSTR_BMP22 NC_("RID_SVXSTR_BMP22", "5 Percent")
#define RID_SVXSTR_BMP23 NC_("RID_SVXSTR_BMP23", "10 Percent")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 99b1d06..3b309b8 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -195,26 +195,26 @@
#define RID_SVXSTR_HATCH10_DEF "Hatching"
// Reference-strings for standard-bitmap-table
#define RID_SVXSTR_BMP0_DEF "Empty"
#define RID_SVXSTR_BMP1_DEF "Sky"
#define RID_SVXSTR_BMP2_DEF "Aqua"
#define RID_SVXSTR_BMP3_DEF "Coarse"
#define RID_SVXSTR_BMP4_DEF "Space Metal"
#define RID_SVXSTR_BMP5_DEF "Space"
#define RID_SVXSTR_BMP6_DEF "Metal"
#define RID_SVXSTR_BMP7_DEF "Wet"
#define RID_SVXSTR_BMP8_DEF "Marble"
#define RID_SVXSTR_BMP9_DEF "Linen"
#define RID_SVXSTR_BMP10_DEF "Stone"
#define RID_SVXSTR_BMP11_DEF "Pebbles"
#define RID_SVXSTR_BMP12_DEF "Wall"
#define RID_SVXSTR_BMP13_DEF "Red Wall"
#define RID_SVXSTR_BMP14_DEF "Pattern"
#define RID_SVXSTR_BMP15_DEF "Leaves"
#define RID_SVXSTR_BMP16_DEF "Lawn Artificial"
#define RID_SVXSTR_BMP17_DEF "Daisy"
#define RID_SVXSTR_BMP18_DEF "Orange"
#define RID_SVXSTR_BMP19_DEF "Fiery"
#define RID_SVXSTR_BMP20_DEF "Roses"
#define RID_SVXSTR_BMP1_DEF "Painted White"
#define RID_SVXSTR_BMP2_DEF "Paper Texture"
#define RID_SVXSTR_BMP3_DEF "Paper Crumpled"
#define RID_SVXSTR_BMP4_DEF "Paper Graph"
#define RID_SVXSTR_BMP5_DEF "Parchment Paper"
#define RID_SVXSTR_BMP6_DEF "Fence"
#define RID_SVXSTR_BMP7_DEF "Wooden Board"
#define RID_SVXSTR_BMP8_DEF "Maple Leaves"
#define RID_SVXSTR_BMP9_DEF "Lawn"
#define RID_SVXSTR_BMP10_DEF "Colorful Pebbles"
#define RID_SVXSTR_BMP11_DEF "Coffee Beans"
#define RID_SVXSTR_BMP12_DEF "Little Clouds"
#define RID_SVXSTR_BMP13_DEF "Bathroom Tiles"
#define RID_SVXSTR_BMP14_DEF "Wall of Rock"
#define RID_SVXSTR_BMP15_DEF "Zebra"
#define RID_SVXSTR_BMP16_DEF "Color Stripes"
#define RID_SVXSTR_BMP17_DEF "Gravel"
#define RID_SVXSTR_BMP18_DEF "Parchment Studio"
#define RID_SVXSTR_BMP19_DEF "Night Sky"
#define RID_SVXSTR_BMP20_DEF "Pool"
#define RID_SVXSTR_BMP21_DEF "Bitmap"
// Reference strings for patterns - they are a variation of bitmaps
#define RID_SVXSTR_BMP22_DEF "5 Percent"
diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py
index 5d422fe..655b674 100644
--- a/uitest/impress_tests/backgrounds.py
+++ b/uitest/impress_tests/backgrounds.py
@@ -73,7 +73,7 @@ class ImpressBackgrounds(UITestCase):
document.DrawPages.getByIndex(0).Background.FillBitmapSizeX, 0)
self.assertEqual(
document.DrawPages.getByIndex(0).Background.FillBitmapSizeY, 0)
self.assertEqual(document.DrawPages.getByIndex(0).Background.FillBitmapName, 'Sky')
self.assertEqual(document.DrawPages.getByIndex(0).Background.FillBitmapName, 'Painted White')
elif btn == 'btnpattern':
self.assertEqual(
document.DrawPages.getByIndex(0).Background.FillBitmapMode, REPEAT)
diff --git a/uitest/writer_tests/pageDialog.py b/uitest/writer_tests/pageDialog.py
index 84284f6..9dc0a10 100644
--- a/uitest/writer_tests/pageDialog.py
+++ b/uitest/writer_tests/pageDialog.py
@@ -95,7 +95,7 @@ class WriterPageDialog(UITestCase):
self.assertEqual(
document.StyleFamilies.PageStyles.Standard.FillBitmapSizeY, 0)
self.assertEqual(
document.StyleFamilies.PageStyles.Standard.FillBitmapName, 'Sky')
document.StyleFamilies.PageStyles.Standard.FillBitmapName, 'Painted White')
elif btn == 'btnpattern':
self.assertEqual(
document.StyleFamilies.PageStyles.Standard.FillBitmapMode, REPEAT)
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index a7cfa16..35a2436 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -22,7 +22,7 @@ Option Explicit
Public Const SBMAXTEXTSIZE = 50
Function SetProgressValue(iValue as Integer)
Function SetProgressValue(iValue as Integer)
If iValue = 0 Then
oProgressbar.End
End If
@@ -84,7 +84,7 @@ Dim NullValue
Else
oControl.Model.EffectiveValue = oControl.Model.EffectiveMax
End If
GetPeerSize() = oPeer.PreferredSize()
GetPeerSize() = oPeer.PreferredSize()
oControl.Model.EffectiveValue = NullValue
ElseIf Not IsMissing(LocText) Then
oControl.Text = LocText
@@ -106,7 +106,7 @@ Dim NullValue
oControl.Text = Mid(SBSIZETEXT,1, SBMAXTEXTSIZE)
Else
oControl.Text = Mid(SBSIZETEXT,1, oControl.MaxTextLen)
End If
End If
GetPeerSize() = oPeer.PreferredSize()
oControl.Text = ""
End If
@@ -140,7 +140,7 @@ Function PixelTo100thMMY(oControl as Object) as long
oPeer = oControl.GetPeer()
PixelTo100mmX = Clng(Peer.GetInfo.PixelPerMeterY/100000)
' PixelTo100thMM = nValue * 28 ' not an exact calculation
' PixelTo100thMM = nValue * 28 ' not an exact calculation
End function
@@ -167,25 +167,25 @@ Dim OldIndex as Integer
End If
OldIndex = CurIndex
CurIndex = GetCurIndex(DialogModel.lstStyles, Styles(),8)
If CurIndex <> OldIndex Then
If CurIndex <> OldIndex Then
ToggleLayoutPage(False)
Dim sImportPath as String
sImportPath = Styles(CurIndex, 8)
bWithBackGraphic = LoadNewStyles(oDocument, DialogModel, CurIndex, sImportPath, Styles(), TexturePath)
ControlCaptionsToStandardLayout()
ToggleLayoutPage(True, "lstStyles")
ToggleLayoutPage(True, "lstStyles")
End If
WIZARDERROR:
If Err <> 0 Then
If Err <> 0 Then
Msgbox(sMsgErrMsg, 16, GetProductName())
Resume LOCERROR
LOCERROR:
LOCERROR:
End If
End Sub
Function SetNumerics(ByVal oLocObject as Object, iLocFieldType as Integer) as Object
Function SetNumerics(ByVal oLocObject as Object, iLocFieldType as Integer) as Object
If CurControlType = cNumericBox Then
oLocObject.TreatAsNumber = True
Select Case iLocFieldType
@@ -325,7 +325,7 @@ Function GetFormWizardPaths() as Boolean
If FormPath <> "" Then
WizardPath = GetOfficeSubPath("Template","wizard/")
If Wizardpath <> "" Then
TexturePath = GetOfficeSubPath("Gallery", "www-back/")
TexturePath = GetOfficeSubPath("Gallery", "backgrounds/")
If TexturePath <> "" Then
WorkPath = GetPathSettings("Work")
If WorkPath <> "" Then
