[Libreoffice-commits] core.git: extras/Gallery_backgrounds.mk extras/Module_extras.mk extras/Package_gallsystem.mk extras/Package_gallwwwback.mk extras/source include/svx svx/inc uitest/impress_tests uitest/writer_tests wizards/source
andreas kainz
kainz.a at gmail.com
Sun Feb 18 13:39:04 UTC 2018
dev/null |binary
extras/Gallery_backgrounds.mk | 60 ++++++++++++++
extras/Module_extras.mk | 2
extras/Package_gallsystem.mk | 3
extras/Package_gallwwwback.mk | 77 ------------------
extras/source/gallery/backgrounds/backgrounds.str | 2
extras/source/gallery/backgrounds/brick-wall.png |binary
extras/source/gallery/backgrounds/cardboard.jpg |binary
extras/source/gallery/backgrounds/circuit-board.jpg |binary
extras/source/gallery/backgrounds/cloud.jpg |binary
extras/source/gallery/backgrounds/coffee.jpg |binary
extras/source/gallery/backgrounds/color-stripes.png |binary
extras/source/gallery/backgrounds/concrete.jpg |binary
extras/source/gallery/backgrounds/crumpled-paper.jpg |binary
extras/source/gallery/backgrounds/fence.jpg |binary
extras/source/gallery/backgrounds/floral.png |binary
extras/source/gallery/backgrounds/giraffe.png |binary
extras/source/gallery/backgrounds/graph-paper.png |binary
extras/source/gallery/backgrounds/invoiced-paper.jpg |binary
extras/source/gallery/backgrounds/leaf.jpg |binary
extras/source/gallery/backgrounds/maple-leaves.jpg |binary
extras/source/gallery/backgrounds/painted-white.jpg |binary
extras/source/gallery/backgrounds/painted-wood.jpg |binary
extras/source/gallery/backgrounds/parchment-paper.jpg |binary
extras/source/gallery/backgrounds/rock-wall.jpg |binary
extras/source/gallery/backgrounds/space.png |binary
extras/source/gallery/backgrounds/stone-wall.jpg |binary
extras/source/gallery/backgrounds/stone.jpg |binary
extras/source/gallery/backgrounds/stones.jpg |binary
extras/source/gallery/backgrounds/studio.jpg |binary
extras/source/gallery/backgrounds/surface-black.jpg |binary
extras/source/gallery/backgrounds/surface.jpg |binary
extras/source/gallery/backgrounds/texture-paper.jpg |binary
extras/source/gallery/backgrounds/tiger.jpg |binary
extras/source/gallery/backgrounds/tiles.jpg |binary
extras/source/gallery/backgrounds/white-diffusion.jpg |binary
extras/source/gallery/backgrounds/wooden-board.jpg |binary
extras/source/gallery/backgrounds/wooden-fence.jpg |binary
extras/source/gallery/backgrounds/zebra.png |binary
extras/source/gallery/gallery_system/sg3.sdg |binary
extras/source/gallery/gallery_system/sg3.thm |binary
extras/source/gallery/share/gallery_names.ulf | 3
extras/source/palettes/standard.sob |binary
include/svx/strings.hrc | 40 ++++-----
svx/inc/strings.hxx | 40 ++++-----
uitest/impress_tests/backgrounds.py | 2
uitest/writer_tests/pageDialog.py | 2
wizards/source/formwizard/tools.xba | 20 ++--
48 files changed, 118 insertions(+), 133 deletions(-)
New commits:
commit 61bfc53ee710f9c79ac597888a6ee9dfee165ea4
Author: andreas kainz <kainz.a at gmail.com>
Date: Sun Feb 11 00:43:03 2018 +0100
tdf#114817 new bitmap presets for Area Fill
Change-Id: Icc48efc2f6c085ccf0754620dc1cbf5132a7f824
Reviewed-on: https://gerrit.libreoffice.org/49551
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
diff --git a/extras/Gallery_backgrounds.mk b/extras/Gallery_backgrounds.mk
new file mode 100644
index 000000000000..103f484f4167
--- /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 b08c47a4926f..34ccf2921568 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 f8882d86cf4f..1f499213afd1 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 f46a80c36b52..000000000000
--- 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 000000000000..bae770e142d2
--- /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 000000000000..59633aa00a37
Binary files /dev/null and b/extras/source/gallery/backgrounds/brick-wall.png differ
diff --git a/extras/source/gallery/backgrounds/cardboard.jpg b/extras/source/gallery/backgrounds/cardboard.jpg
new file mode 100644
index 000000000000..137a09644711
Binary files /dev/null and b/extras/source/gallery/backgrounds/cardboard.jpg differ
diff --git a/extras/source/gallery/backgrounds/circuit-board.jpg b/extras/source/gallery/backgrounds/circuit-board.jpg
new file mode 100644
index 000000000000..30596e7d7317
Binary files /dev/null and b/extras/source/gallery/backgrounds/circuit-board.jpg differ
diff --git a/extras/source/gallery/backgrounds/cloud.jpg b/extras/source/gallery/backgrounds/cloud.jpg
new file mode 100644
index 000000000000..429ed63f18f8
Binary files /dev/null and b/extras/source/gallery/backgrounds/cloud.jpg differ
diff --git a/extras/source/gallery/backgrounds/coffee.jpg b/extras/source/gallery/backgrounds/coffee.jpg
new file mode 100644
index 000000000000..44697632492f
Binary files /dev/null and b/extras/source/gallery/backgrounds/coffee.jpg differ
diff --git a/extras/source/gallery/backgrounds/color-stripes.png b/extras/source/gallery/backgrounds/color-stripes.png
new file mode 100644
index 000000000000..20513f087f69
Binary files /dev/null and b/extras/source/gallery/backgrounds/color-stripes.png differ
diff --git a/extras/source/gallery/backgrounds/concrete.jpg b/extras/source/gallery/backgrounds/concrete.jpg
new file mode 100644
index 000000000000..2c373c8fae32
Binary files /dev/null and b/extras/source/gallery/backgrounds/concrete.jpg differ
diff --git a/extras/source/gallery/backgrounds/crumpled-paper.jpg b/extras/source/gallery/backgrounds/crumpled-paper.jpg
new file mode 100644
index 000000000000..138aa307a9b8
Binary files /dev/null and b/extras/source/gallery/backgrounds/crumpled-paper.jpg differ
diff --git a/extras/source/gallery/backgrounds/fence.jpg b/extras/source/gallery/backgrounds/fence.jpg
new file mode 100644
index 000000000000..5e7df134a85c
Binary files /dev/null and b/extras/source/gallery/backgrounds/fence.jpg differ
diff --git a/extras/source/gallery/backgrounds/floral.png b/extras/source/gallery/backgrounds/floral.png
new file mode 100644
index 000000000000..ef34662a94f9
Binary files /dev/null and b/extras/source/gallery/backgrounds/floral.png 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
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
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
diff --git a/extras/source/gallery/backgrounds/giraffe.png b/extras/source/gallery/backgrounds/giraffe.png
new file mode 100644
index 000000000000..fdc8008c1991
Binary files /dev/null and b/extras/source/gallery/backgrounds/giraffe.png differ
diff --git a/extras/source/gallery/backgrounds/graph-paper.png b/extras/source/gallery/backgrounds/graph-paper.png
new file mode 100644
index 000000000000..c383f035b398
Binary files /dev/null and b/extras/source/gallery/backgrounds/graph-paper.png 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
diff --git a/extras/source/gallery/backgrounds/invoiced-paper.jpg b/extras/source/gallery/backgrounds/invoiced-paper.jpg
new file mode 100644
index 000000000000..048c44420df6
Binary files /dev/null and b/extras/source/gallery/backgrounds/invoiced-paper.jpg differ
diff --git a/extras/source/gallery/backgrounds/leaf.jpg b/extras/source/gallery/backgrounds/leaf.jpg
new file mode 100644
index 000000000000..5fd33a9b85f2
Binary files /dev/null and b/extras/source/gallery/backgrounds/leaf.jpg differ
diff --git a/extras/source/gallery/backgrounds/maple-leaves.jpg b/extras/source/gallery/backgrounds/maple-leaves.jpg
new file mode 100644
index 000000000000..aaeab903682c
Binary files /dev/null and b/extras/source/gallery/backgrounds/maple-leaves.jpg 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
diff --git a/extras/source/gallery/backgrounds/painted-white.jpg b/extras/source/gallery/backgrounds/painted-white.jpg
new file mode 100644
index 000000000000..a686c2be5893
Binary files /dev/null and b/extras/source/gallery/backgrounds/painted-white.jpg differ
diff --git a/extras/source/gallery/backgrounds/painted-wood.jpg b/extras/source/gallery/backgrounds/painted-wood.jpg
new file mode 100644
index 000000000000..956f5ba469f0
Binary files /dev/null and b/extras/source/gallery/backgrounds/painted-wood.jpg differ
diff --git a/extras/source/gallery/backgrounds/parchment-paper.jpg b/extras/source/gallery/backgrounds/parchment-paper.jpg
new file mode 100644
index 000000000000..89d10b938817
Binary files /dev/null and b/extras/source/gallery/backgrounds/parchment-paper.jpg 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
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
diff --git a/extras/source/gallery/backgrounds/rock-wall.jpg b/extras/source/gallery/backgrounds/rock-wall.jpg
new file mode 100644
index 000000000000..1395db859cea
Binary files /dev/null and b/extras/source/gallery/backgrounds/rock-wall.jpg 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
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
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
diff --git a/extras/source/gallery/backgrounds/space.png b/extras/source/gallery/backgrounds/space.png
new file mode 100644
index 000000000000..b51931e606cd
Binary files /dev/null and b/extras/source/gallery/backgrounds/space.png 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
diff --git a/extras/source/gallery/backgrounds/stone-wall.jpg b/extras/source/gallery/backgrounds/stone-wall.jpg
new file mode 100644
index 000000000000..c29d57a859bf
Binary files /dev/null and b/extras/source/gallery/backgrounds/stone-wall.jpg differ
diff --git a/extras/source/gallery/backgrounds/stone.jpg b/extras/source/gallery/backgrounds/stone.jpg
new file mode 100644
index 000000000000..6f2cbf3e1ae3
Binary files /dev/null and b/extras/source/gallery/backgrounds/stone.jpg differ
diff --git a/extras/source/gallery/backgrounds/stones.jpg b/extras/source/gallery/backgrounds/stones.jpg
new file mode 100644
index 000000000000..039bfefb5a5f
Binary files /dev/null and b/extras/source/gallery/backgrounds/stones.jpg differ
diff --git a/extras/source/gallery/backgrounds/studio.jpg b/extras/source/gallery/backgrounds/studio.jpg
new file mode 100644
index 000000000000..a89fecb332f9
Binary files /dev/null and b/extras/source/gallery/backgrounds/studio.jpg differ
diff --git a/extras/source/gallery/backgrounds/surface-black.jpg b/extras/source/gallery/backgrounds/surface-black.jpg
new file mode 100644
index 000000000000..f1045bf13fcd
Binary files /dev/null and b/extras/source/gallery/backgrounds/surface-black.jpg differ
diff --git a/extras/source/gallery/backgrounds/surface.jpg b/extras/source/gallery/backgrounds/surface.jpg
new file mode 100644
index 000000000000..70f434336f57
Binary files /dev/null and b/extras/source/gallery/backgrounds/surface.jpg differ
diff --git a/extras/source/gallery/backgrounds/texture-paper.jpg b/extras/source/gallery/backgrounds/texture-paper.jpg
new file mode 100644
index 000000000000..c90c8e594f84
Binary files /dev/null and b/extras/source/gallery/backgrounds/texture-paper.jpg differ
diff --git a/extras/source/gallery/backgrounds/tiger.jpg b/extras/source/gallery/backgrounds/tiger.jpg
new file mode 100644
index 000000000000..4bb1cf7aa9c7
Binary files /dev/null and b/extras/source/gallery/backgrounds/tiger.jpg differ
diff --git a/extras/source/gallery/backgrounds/tiles.jpg b/extras/source/gallery/backgrounds/tiles.jpg
new file mode 100644
index 000000000000..3ff1210f8c39
Binary files /dev/null and b/extras/source/gallery/backgrounds/tiles.jpg differ
diff --git a/extras/source/gallery/backgrounds/white-diffusion.jpg b/extras/source/gallery/backgrounds/white-diffusion.jpg
new file mode 100644
index 000000000000..9518cd1e3446
Binary files /dev/null and b/extras/source/gallery/backgrounds/white-diffusion.jpg 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
diff --git a/extras/source/gallery/backgrounds/wooden-board.jpg b/extras/source/gallery/backgrounds/wooden-board.jpg
new file mode 100644
index 000000000000..41ea6fdfb5dc
Binary files /dev/null and b/extras/source/gallery/backgrounds/wooden-board.jpg differ
diff --git a/extras/source/gallery/backgrounds/wooden-fence.jpg b/extras/source/gallery/backgrounds/wooden-fence.jpg
new file mode 100644
index 000000000000..0ab15e33b64b
Binary files /dev/null and b/extras/source/gallery/backgrounds/wooden-fence.jpg differ
diff --git a/extras/source/gallery/backgrounds/zebra.png b/extras/source/gallery/backgrounds/zebra.png
new file mode 100644
index 000000000000..83740dd0ef38
Binary files /dev/null and b/extras/source/gallery/backgrounds/zebra.png differ
diff --git a/extras/source/gallery/gallery_system/sg3.sdg b/extras/source/gallery/gallery_system/sg3.sdg
index 970cc7a56760..269e57253137 100644
Binary files a/extras/source/gallery/gallery_system/sg3.sdg and b/extras/source/gallery/gallery_system/sg3.sdg differ
diff --git a/extras/source/gallery/gallery_system/sg3.thm b/extras/source/gallery/gallery_system/sg3.thm
index c3956c1f8126..b81238c16477 100644
Binary files a/extras/source/gallery/gallery_system/sg3.thm and b/extras/source/gallery/gallery_system/sg3.thm differ
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 12d7769c46d5..0d1da8dbec8a 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 a7b29ee29bbd..000000000000
Binary files a/extras/source/gallery/www-back/aqua.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/bathroom.jpg b/extras/source/gallery/www-back/bathroom.jpg
deleted file mode 100644
index 058f01ae9237..000000000000
Binary files a/extras/source/gallery/www-back/bathroom.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/blocks.jpg b/extras/source/gallery/www-back/blocks.jpg
deleted file mode 100644
index 1cd0c6ebceb5..000000000000
Binary files a/extras/source/gallery/www-back/blocks.jpg and /dev/null 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 aedb52e224f7..000000000000
Binary files a/extras/source/gallery/www-back/blow_green.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/blueblop.jpg b/extras/source/gallery/www-back/blueblop.jpg
deleted file mode 100644
index 330cacb7a1e4..000000000000
Binary files a/extras/source/gallery/www-back/blueblop.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/bulging.jpg b/extras/source/gallery/www-back/bulging.jpg
deleted file mode 100644
index 02c083061c52..000000000000
Binary files a/extras/source/gallery/www-back/bulging.jpg and /dev/null 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 a0ab3b3f2ff8..000000000000
Binary files a/extras/source/gallery/www-back/canvas_blue.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/cheese.jpg b/extras/source/gallery/www-back/cheese.jpg
deleted file mode 100644
index dea5795fd0b7..000000000000
Binary files a/extras/source/gallery/www-back/cheese.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/chocolate.jpg b/extras/source/gallery/www-back/chocolate.jpg
deleted file mode 100644
index 7e04116603e5..000000000000
Binary files a/extras/source/gallery/www-back/chocolate.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/citrus.jpg b/extras/source/gallery/www-back/citrus.jpg
deleted file mode 100644
index ceb9ef08c344..000000000000
Binary files a/extras/source/gallery/www-back/citrus.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/confetti.jpg b/extras/source/gallery/www-back/confetti.jpg
deleted file mode 100644
index f04bfab2f4a4..000000000000
Binary files a/extras/source/gallery/www-back/confetti.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/daisy.jpg b/extras/source/gallery/www-back/daisy.jpg
deleted file mode 100644
index 69287fa1d6f9..000000000000
Binary files a/extras/source/gallery/www-back/daisy.jpg and /dev/null 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 351ac420dc59..000000000000
Binary files a/extras/source/gallery/www-back/fluffy-grey.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/fluffy.jpg b/extras/source/gallery/www-back/fluffy.jpg
deleted file mode 100644
index c8398cca3c1f..000000000000
Binary files a/extras/source/gallery/www-back/fluffy.jpg and /dev/null 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 b65a17e03e98..000000000000
Binary files a/extras/source/gallery/www-back/fuzzy-blue.jpg and /dev/null 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 8715e992a4ca..000000000000
Binary files a/extras/source/gallery/www-back/fuzzy_light.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/gregre.gif b/extras/source/gallery/www-back/gregre.gif
deleted file mode 100644
index 9d86063a1087..000000000000
Binary files a/extras/source/gallery/www-back/gregre.gif and /dev/null differ
diff --git a/extras/source/gallery/www-back/grey.gif b/extras/source/gallery/www-back/grey.gif
deleted file mode 100644
index cde670fb5115..000000000000
Binary files a/extras/source/gallery/www-back/grey.gif and /dev/null differ
diff --git a/extras/source/gallery/www-back/grypaws.gif b/extras/source/gallery/www-back/grypaws.gif
deleted file mode 100644
index 9ea9652b768d..000000000000
Binary files a/extras/source/gallery/www-back/grypaws.gif and /dev/null 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 db5d36163879..000000000000
Binary files a/extras/source/gallery/www-back/ice-blue.jpg and /dev/null 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 12ddb212d779..000000000000
Binary files a/extras/source/gallery/www-back/imitation_leather.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/interstices.jpg b/extras/source/gallery/www-back/interstices.jpg
deleted file mode 100644
index 5f5cf7709553..000000000000
Binary files a/extras/source/gallery/www-back/interstices.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/jeans.jpg b/extras/source/gallery/www-back/jeans.jpg
deleted file mode 100644
index 63d13c34a8cf..000000000000
Binary files a/extras/source/gallery/www-back/jeans.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/jeansblk.jpg b/extras/source/gallery/www-back/jeansblk.jpg
deleted file mode 100644
index 25a2f71cf685..000000000000
Binary files a/extras/source/gallery/www-back/jeansblk.jpg and /dev/null 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 ff2ecca7b619..000000000000
Binary files a/extras/source/gallery/www-back/lawn-artificial.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/lawn.jpg b/extras/source/gallery/www-back/lawn.jpg
deleted file mode 100644
index 60382b3b1709..000000000000
Binary files a/extras/source/gallery/www-back/lawn.jpg and /dev/null 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 227afaf6ba91..000000000000
Binary files a/extras/source/gallery/www-back/lightblue-wet.jpg and /dev/null 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 af874d217ffd..000000000000
Binary files a/extras/source/gallery/www-back/linen-fine.jpg and /dev/null 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 e178db00a1a4..000000000000
Binary files a/extras/source/gallery/www-back/lino-green.jpg and /dev/null 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 97b56e0b0044..000000000000
Binary files a/extras/source/gallery/www-back/liquid-blue.jpg and /dev/null 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 e610fc731e79..000000000000
Binary files a/extras/source/gallery/www-back/marble_dark.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/mazes.jpg b/extras/source/gallery/www-back/mazes.jpg
deleted file mode 100644
index 2aa84ade7ea7..000000000000
Binary files a/extras/source/gallery/www-back/mazes.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/mint.gif b/extras/source/gallery/www-back/mint.gif
deleted file mode 100644
index a32311256d6d..000000000000
Binary files a/extras/source/gallery/www-back/mint.gif and /dev/null differ
diff --git a/extras/source/gallery/www-back/notes.gif b/extras/source/gallery/www-back/notes.gif
deleted file mode 100644
index 6637d61aead2..000000000000
Binary files a/extras/source/gallery/www-back/notes.gif and /dev/null differ
diff --git a/extras/source/gallery/www-back/pattern.jpg b/extras/source/gallery/www-back/pattern.jpg
deleted file mode 100644
index 6a6a3d8d4e44..000000000000
Binary files a/extras/source/gallery/www-back/pattern.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/pink.gif b/extras/source/gallery/www-back/pink.gif
deleted file mode 100644
index b4f98594b349..000000000000
Binary files a/extras/source/gallery/www-back/pink.gif and /dev/null differ
diff --git a/extras/source/gallery/www-back/popcorn.jpg b/extras/source/gallery/www-back/popcorn.jpg
deleted file mode 100644
index 4b464604c402..000000000000
Binary files a/extras/source/gallery/www-back/popcorn.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/purple.jpg b/extras/source/gallery/www-back/purple.jpg
deleted file mode 100644
index 71a027a38da9..000000000000
Binary files a/extras/source/gallery/www-back/purple.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/reddark.jpg b/extras/source/gallery/www-back/reddark.jpg
deleted file mode 100644
index a7e5eaff8052..000000000000
Binary files a/extras/source/gallery/www-back/reddark.jpg and /dev/null 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 17062c2d0629..000000000000
Binary files a/extras/source/gallery/www-back/rings-green.jpg and /dev/null 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 4c49bb9c19fd..000000000000
Binary files a/extras/source/gallery/www-back/rings-orange.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/roses.jpg b/extras/source/gallery/www-back/roses.jpg
deleted file mode 100644
index 3bcc34ea464e..000000000000
Binary files a/extras/source/gallery/www-back/roses.jpg and /dev/null 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 48d0943adef9..000000000000
Binary files a/extras/source/gallery/www-back/soft-structure_grey.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/space.jpg b/extras/source/gallery/www-back/space.jpg
deleted file mode 100644
index 808165d35633..000000000000
Binary files a/extras/source/gallery/www-back/space.jpg and /dev/null 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 eb50eeec98af..000000000000
Binary files a/extras/source/gallery/www-back/stone-dark.jpg and /dev/null differ
diff --git a/extras/source/gallery/www-back/structure.jpg b/extras/source/gallery/www-back/structure.jpg
deleted file mode 100644
index b49da3066e97..000000000000
Binary files a/extras/source/gallery/www-back/structure.jpg and /dev/null 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 ed9e6d27c3a1..000000000000
Binary files a/extras/source/gallery/www-back/structure_darkgreen.gif and /dev/null 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 240f2adae06b..000000000000
Binary files a/extras/source/gallery/www-back/structure_green.jpg and /dev/null 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 42270e0c1a58..000000000000
Binary files a/extras/source/gallery/www-back/wall-grey.jpg and /dev/null 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 4f6dfc31816b..000000000000
Binary files a/extras/source/gallery/www-back/wet-turquoise.jpg and /dev/null differ
diff --git a/extras/source/palettes/standard.sob b/extras/source/palettes/standard.sob
index 820190b59258..f8ff573121dd 100644
Binary files a/extras/source/palettes/standard.sob and b/extras/source/palettes/standard.sob differ
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index c3ca32273fdc..c9f4fd2b2cec 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 99b1d06f1494..3b309b8253f0 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 5d422fe8b7bc..655b67414929 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 84284f61dd45..9dc0a101d5e2 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 a7cfa16651b0..35a2436e2cf7 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
More information about the Libreoffice-commits
mailing list