diff options
| author | andreas kainz <kainz.a@gmail.com> | 2018-02-11 00:43:03 +0100 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-02-18 14:38:41 +0100 |
| commit | 61bfc53ee710f9c79ac597888a6ee9dfee165ea4 (patch) | |
| tree | ce3495f4e1075ce5e9b04265aa3c392865279f39 | |
| parent | 7273bb3534264867e818c13baffcdf3862189cd2 (diff) | |
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>
109 files changed, 118 insertions, 133 deletions
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 Binary files differnew file mode 100644 index 000000000000..59633aa00a37 --- /dev/null +++ b/extras/source/gallery/backgrounds/brick-wall.png diff --git a/extras/source/gallery/backgrounds/cardboard.jpg b/extras/source/gallery/backgrounds/cardboard.jpg Binary files differnew file mode 100644 index 000000000000..137a09644711 --- /dev/null +++ b/extras/source/gallery/backgrounds/cardboard.jpg diff --git a/extras/source/gallery/backgrounds/circuit-board.jpg b/extras/source/gallery/backgrounds/circuit-board.jpg Binary files differnew file mode 100644 index 000000000000..30596e7d7317 --- /dev/null +++ b/extras/source/gallery/backgrounds/circuit-board.jpg diff --git a/extras/source/gallery/backgrounds/cloud.jpg b/extras/source/gallery/backgrounds/cloud.jpg Binary files differnew file mode 100644 index 000000000000..429ed63f18f8 --- /dev/null +++ b/extras/source/gallery/backgrounds/cloud.jpg diff --git a/extras/source/gallery/backgrounds/coffee.jpg b/extras/source/gallery/backgrounds/coffee.jpg Binary files differnew file mode 100644 index 000000000000..44697632492f --- /dev/null +++ b/extras/source/gallery/backgrounds/coffee.jpg diff --git a/extras/source/gallery/backgrounds/color-stripes.png b/extras/source/gallery/backgrounds/color-stripes.png Binary files differnew file mode 100644 index 000000000000..20513f087f69 --- /dev/null +++ b/extras/source/gallery/backgrounds/color-stripes.png diff --git a/extras/source/gallery/backgrounds/concrete.jpg b/extras/source/gallery/backgrounds/concrete.jpg Binary files differnew file mode 100644 index 000000000000..2c373c8fae32 --- /dev/null +++ b/extras/source/gallery/backgrounds/concrete.jpg diff --git a/extras/source/gallery/backgrounds/crumpled-paper.jpg b/extras/source/gallery/backgrounds/crumpled-paper.jpg Binary files differnew file mode 100644 index 000000000000..138aa307a9b8 --- /dev/null +++ b/extras/source/gallery/backgrounds/crumpled-paper.jpg diff --git a/extras/source/gallery/backgrounds/fence.jpg b/extras/source/gallery/backgrounds/fence.jpg Binary files differnew file mode 100644 index 000000000000..5e7df134a85c --- /dev/null +++ b/extras/source/gallery/backgrounds/fence.jpg diff --git a/extras/source/gallery/backgrounds/floral.png b/extras/source/gallery/backgrounds/floral.png Binary files differnew file mode 100644 index 000000000000..ef34662a94f9 --- /dev/null +++ b/extras/source/gallery/backgrounds/floral.png diff --git a/extras/source/gallery/www-back/fuzzy-darkgrey.jpg b/extras/source/gallery/backgrounds/fuzzy-darkgrey.jpg Binary files differindex ed8c40e25df7..ed8c40e25df7 100644 --- a/extras/source/gallery/www-back/fuzzy-darkgrey.jpg +++ b/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 Binary files differindex 2263906eb142..2263906eb142 100644 --- a/extras/source/gallery/www-back/fuzzy-grey.jpg +++ b/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 Binary files differindex fe3b8954d5cc..fe3b8954d5cc 100644 --- a/extras/source/gallery/www-back/fuzzy-lightgrey.jpg +++ b/extras/source/gallery/backgrounds/fuzzy-lightgrey.jpg diff --git a/extras/source/gallery/backgrounds/giraffe.png b/extras/source/gallery/backgrounds/giraffe.png Binary files differnew file mode 100644 index 000000000000..fdc8008c1991 --- /dev/null +++ b/extras/source/gallery/backgrounds/giraffe.png diff --git a/extras/source/gallery/backgrounds/graph-paper.png b/extras/source/gallery/backgrounds/graph-paper.png Binary files differnew file mode 100644 index 000000000000..c383f035b398 --- /dev/null +++ b/extras/source/gallery/backgrounds/graph-paper.png diff --git a/extras/source/gallery/www-back/ice-light.jpg b/extras/source/gallery/backgrounds/ice-light.jpg Binary files differindex e82653d9812f..e82653d9812f 100644 --- a/extras/source/gallery/www-back/ice-light.jpg +++ b/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 Binary files differnew file mode 100644 index 000000000000..048c44420df6 --- /dev/null +++ b/extras/source/gallery/backgrounds/invoiced-paper.jpg diff --git a/extras/source/gallery/backgrounds/leaf.jpg b/extras/source/gallery/backgrounds/leaf.jpg Binary files differnew file mode 100644 index 000000000000..5fd33a9b85f2 --- /dev/null +++ b/extras/source/gallery/backgrounds/leaf.jpg diff --git a/extras/source/gallery/backgrounds/maple-leaves.jpg b/extras/source/gallery/backgrounds/maple-leaves.jpg Binary files differnew file mode 100644 index 000000000000..aaeab903682c --- /dev/null +++ b/extras/source/gallery/backgrounds/maple-leaves.jpg diff --git a/extras/source/gallery/www-back/marble.jpg b/extras/source/gallery/backgrounds/marble.jpg Binary files differindex 96f220950dca..96f220950dca 100644 --- a/extras/source/gallery/www-back/marble.jpg +++ b/extras/source/gallery/backgrounds/marble.jpg diff --git a/extras/source/gallery/backgrounds/painted-white.jpg b/extras/source/gallery/backgrounds/painted-white.jpg Binary files differnew file mode 100644 index 000000000000..a686c2be5893 --- /dev/null +++ b/extras/source/gallery/backgrounds/painted-white.jpg diff --git a/extras/source/gallery/backgrounds/painted-wood.jpg b/extras/source/gallery/backgrounds/painted-wood.jpg Binary files differnew file mode 100644 index 000000000000..956f5ba469f0 --- /dev/null +++ b/extras/source/gallery/backgrounds/painted-wood.jpg diff --git a/extras/source/gallery/backgrounds/parchment-paper.jpg b/extras/source/gallery/backgrounds/parchment-paper.jpg Binary files differnew file mode 100644 index 000000000000..89d10b938817 --- /dev/null +++ b/extras/source/gallery/backgrounds/parchment-paper.jpg diff --git a/extras/source/gallery/www-back/pebble-light.jpg b/extras/source/gallery/backgrounds/pebble-light.jpg Binary files differindex 9a314557daec..9a314557daec 100644 --- a/extras/source/gallery/www-back/pebble-light.jpg +++ b/extras/source/gallery/backgrounds/pebble-light.jpg diff --git a/extras/source/gallery/www-back/pool.jpg b/extras/source/gallery/backgrounds/pool.jpg Binary files differindex 1f5943f7589c..1f5943f7589c 100644 --- a/extras/source/gallery/www-back/pool.jpg +++ b/extras/source/gallery/backgrounds/pool.jpg diff --git a/extras/source/gallery/backgrounds/rock-wall.jpg b/extras/source/gallery/backgrounds/rock-wall.jpg Binary files differnew file mode 100644 index 000000000000..1395db859cea --- /dev/null +++ b/extras/source/gallery/backgrounds/rock-wall.jpg diff --git a/extras/source/gallery/www-back/sand-light.jpg b/extras/source/gallery/backgrounds/sand-light.jpg Binary files differindex 87715ad29d15..87715ad29d15 100644 --- a/extras/source/gallery/www-back/sand-light.jpg +++ b/extras/source/gallery/backgrounds/sand-light.jpg diff --git a/extras/source/gallery/www-back/sand.jpg b/extras/source/gallery/backgrounds/sand.jpg Binary files differindex 2ec83cdfc20e..2ec83cdfc20e 100644 --- a/extras/source/gallery/www-back/sand.jpg +++ b/extras/source/gallery/backgrounds/sand.jpg diff --git a/extras/source/gallery/www-back/sky.jpg b/extras/source/gallery/backgrounds/sky.jpg Binary files differindex 2ccdb489d5f5..2ccdb489d5f5 100644 --- a/extras/source/gallery/www-back/sky.jpg +++ b/extras/source/gallery/backgrounds/sky.jpg diff --git a/extras/source/gallery/backgrounds/space.png b/extras/source/gallery/backgrounds/space.png Binary files differnew file mode 100644 index 000000000000..b51931e606cd --- /dev/null +++ b/extras/source/gallery/backgrounds/space.png diff --git a/extras/source/gallery/www-back/stone.jpg b/extras/source/gallery/backgrounds/stone-gray.jpg Binary files differindex 26c36d063bcb..26c36d063bcb 100644 --- a/extras/source/gallery/www-back/stone.jpg +++ b/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 Binary files differnew file mode 100644 index 000000000000..c29d57a859bf --- /dev/null +++ b/extras/source/gallery/backgrounds/stone-wall.jpg diff --git a/extras/source/gallery/backgrounds/stone.jpg b/extras/source/gallery/backgrounds/stone.jpg Binary files differnew file mode 100644 index 000000000000..6f2cbf3e1ae3 --- /dev/null +++ b/extras/source/gallery/backgrounds/stone.jpg diff --git a/extras/source/gallery/backgrounds/stones.jpg b/extras/source/gallery/backgrounds/stones.jpg Binary files differnew file mode 100644 index 000000000000..039bfefb5a5f --- /dev/null +++ b/extras/source/gallery/backgrounds/stones.jpg diff --git a/extras/source/gallery/backgrounds/studio.jpg b/extras/source/gallery/backgrounds/studio.jpg Binary files differnew file mode 100644 index 000000000000..a89fecb332f9 --- /dev/null +++ b/extras/source/gallery/backgrounds/studio.jpg diff --git a/extras/source/gallery/backgrounds/surface-black.jpg b/extras/source/gallery/backgrounds/surface-black.jpg Binary files differnew file mode 100644 index 000000000000..f1045bf13fcd --- /dev/null +++ b/extras/source/gallery/backgrounds/surface-black.jpg diff --git a/extras/source/gallery/backgrounds/surface.jpg b/extras/source/gallery/backgrounds/surface.jpg Binary files differnew file mode 100644 index 000000000000..70f434336f57 --- /dev/null +++ b/extras/source/gallery/backgrounds/surface.jpg diff --git a/extras/source/gallery/backgrounds/texture-paper.jpg b/extras/source/gallery/backgrounds/texture-paper.jpg Binary files differnew file mode 100644 index 000000000000..c90c8e594f84 --- /dev/null +++ b/extras/source/gallery/backgrounds/texture-paper.jpg diff --git a/extras/source/gallery/backgrounds/tiger.jpg b/extras/source/gallery/backgrounds/tiger.jpg Binary files differnew file mode 100644 index 000000000000..4bb1cf7aa9c7 --- /dev/null +++ b/extras/source/gallery/backgrounds/tiger.jpg diff --git a/extras/source/gallery/backgrounds/tiles.jpg b/extras/source/gallery/backgrounds/tiles.jpg Binary files differnew file mode 100644 index 000000000000..3ff1210f8c39 --- /dev/null +++ b/extras/source/gallery/backgrounds/tiles.jpg diff --git a/extras/source/gallery/backgrounds/white-diffusion.jpg b/extras/source/gallery/backgrounds/white-diffusion.jpg Binary files differnew file mode 100644 index 000000000000..9518cd1e3446 --- /dev/null +++ b/extras/source/gallery/backgrounds/white-diffusion.jpg diff --git a/extras/source/gallery/www-back/wood.jpg b/extras/source/gallery/backgrounds/wood.jpg Binary files differindex 889a838477f6..889a838477f6 100644 --- a/extras/source/gallery/www-back/wood.jpg +++ b/extras/source/gallery/backgrounds/wood.jpg diff --git a/extras/source/gallery/backgrounds/wooden-board.jpg b/extras/source/gallery/backgrounds/wooden-board.jpg Binary files differnew file mode 100644 index 000000000000..41ea6fdfb5dc --- /dev/null +++ b/extras/source/gallery/backgrounds/wooden-board.jpg diff --git a/extras/source/gallery/backgrounds/wooden-fence.jpg b/extras/source/gallery/backgrounds/wooden-fence.jpg Binary files differnew file mode 100644 index 000000000000..0ab15e33b64b --- /dev/null +++ b/extras/source/gallery/backgrounds/wooden-fence.jpg diff --git a/extras/source/gallery/backgrounds/zebra.png b/extras/source/gallery/backgrounds/zebra.png Binary files differnew file mode 100644 index 000000000000..83740dd0ef38 --- /dev/null +++ b/extras/source/gallery/backgrounds/zebra.png diff --git a/extras/source/gallery/gallery_system/sg3.sdg b/extras/source/gallery/gallery_system/sg3.sdg Binary files differindex 970cc7a56760..269e57253137 100644 --- a/extras/source/gallery/gallery_system/sg3.sdg +++ b/extras/source/gallery/gallery_system/sg3.sdg diff --git a/extras/source/gallery/gallery_system/sg3.thm b/extras/source/gallery/gallery_system/sg3.thm Binary files differindex c3956c1f8126..b81238c16477 100644 --- a/extras/source/gallery/gallery_system/sg3.thm +++ b/extras/source/gallery/gallery_system/sg3.thm 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 Binary files differdeleted file mode 100644 index a7b29ee29bbd..000000000000 --- a/extras/source/gallery/www-back/aqua.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/bathroom.jpg b/extras/source/gallery/www-back/bathroom.jpg Binary files differdeleted file mode 100644 index 058f01ae9237..000000000000 --- a/extras/source/gallery/www-back/bathroom.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/blocks.jpg b/extras/source/gallery/www-back/blocks.jpg Binary files differdeleted file mode 100644 index 1cd0c6ebceb5..000000000000 --- a/extras/source/gallery/www-back/blocks.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/blow_green.jpg b/extras/source/gallery/www-back/blow_green.jpg Binary files differdeleted file mode 100644 index aedb52e224f7..000000000000 --- a/extras/source/gallery/www-back/blow_green.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/blueblop.jpg b/extras/source/gallery/www-back/blueblop.jpg Binary files differdeleted file mode 100644 index 330cacb7a1e4..000000000000 --- a/extras/source/gallery/www-back/blueblop.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/bulging.jpg b/extras/source/gallery/www-back/bulging.jpg Binary files differdeleted file mode 100644 index 02c083061c52..000000000000 --- a/extras/source/gallery/www-back/bulging.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/canvas_blue.jpg b/extras/source/gallery/www-back/canvas_blue.jpg Binary files differdeleted file mode 100644 index a0ab3b3f2ff8..000000000000 --- a/extras/source/gallery/www-back/canvas_blue.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/cheese.jpg b/extras/source/gallery/www-back/cheese.jpg Binary files differdeleted file mode 100644 index dea5795fd0b7..000000000000 --- a/extras/source/gallery/www-back/cheese.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/chocolate.jpg b/extras/source/gallery/www-back/chocolate.jpg Binary files differdeleted file mode 100644 index 7e04116603e5..000000000000 --- a/extras/source/gallery/www-back/chocolate.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/citrus.jpg b/extras/source/gallery/www-back/citrus.jpg Binary files differdeleted file mode 100644 index ceb9ef08c344..000000000000 --- a/extras/source/gallery/www-back/citrus.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/confetti.jpg b/extras/source/gallery/www-back/confetti.jpg Binary files differdeleted file mode 100644 index f04bfab2f4a4..000000000000 --- a/extras/source/gallery/www-back/confetti.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/daisy.jpg b/extras/source/gallery/www-back/daisy.jpg Binary files differdeleted file mode 100644 index 69287fa1d6f9..000000000000 --- a/extras/source/gallery/www-back/daisy.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/fluffy-grey.jpg b/extras/source/gallery/www-back/fluffy-grey.jpg Binary files differdeleted file mode 100644 index 351ac420dc59..000000000000 --- a/extras/source/gallery/www-back/fluffy-grey.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/fluffy.jpg b/extras/source/gallery/www-back/fluffy.jpg Binary files differdeleted file mode 100644 index c8398cca3c1f..000000000000 --- a/extras/source/gallery/www-back/fluffy.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/fuzzy-blue.jpg b/extras/source/gallery/www-back/fuzzy-blue.jpg Binary files differdeleted file mode 100644 index b65a17e03e98..000000000000 --- a/extras/source/gallery/www-back/fuzzy-blue.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/fuzzy_light.jpg b/extras/source/gallery/www-back/fuzzy_light.jpg Binary files differdeleted file mode 100644 index 8715e992a4ca..000000000000 --- a/extras/source/gallery/www-back/fuzzy_light.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/gregre.gif b/extras/source/gallery/www-back/gregre.gif Binary files differdeleted file mode 100644 index 9d86063a1087..000000000000 --- a/extras/source/gallery/www-back/gregre.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/grey.gif b/extras/source/gallery/www-back/grey.gif Binary files differdeleted file mode 100644 index cde670fb5115..000000000000 --- a/extras/source/gallery/www-back/grey.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/grypaws.gif b/extras/source/gallery/www-back/grypaws.gif Binary files differdeleted file mode 100644 index 9ea9652b768d..000000000000 --- a/extras/source/gallery/www-back/grypaws.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/ice-blue.jpg b/extras/source/gallery/www-back/ice-blue.jpg Binary files differdeleted file mode 100644 index db5d36163879..000000000000 --- a/extras/source/gallery/www-back/ice-blue.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/imitation_leather.jpg b/extras/source/gallery/www-back/imitation_leather.jpg Binary files differdeleted file mode 100644 index 12ddb212d779..000000000000 --- a/extras/source/gallery/www-back/imitation_leather.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/interstices.jpg b/extras/source/gallery/www-back/interstices.jpg Binary files differdeleted file mode 100644 index 5f5cf7709553..000000000000 --- a/extras/source/gallery/www-back/interstices.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/jeans.jpg b/extras/source/gallery/www-back/jeans.jpg Binary files differdeleted file mode 100644 index 63d13c34a8cf..000000000000 --- a/extras/source/gallery/www-back/jeans.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/jeansblk.jpg b/extras/source/gallery/www-back/jeansblk.jpg Binary files differdeleted file mode 100644 index 25a2f71cf685..000000000000 --- a/extras/source/gallery/www-back/jeansblk.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/lawn-artificial.jpg b/extras/source/gallery/www-back/lawn-artificial.jpg Binary files differdeleted file mode 100644 index ff2ecca7b619..000000000000 --- a/extras/source/gallery/www-back/lawn-artificial.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/lawn.jpg b/extras/source/gallery/www-back/lawn.jpg Binary files differdeleted file mode 100644 index 60382b3b1709..000000000000 --- a/extras/source/gallery/www-back/lawn.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/lightblue-wet.jpg b/extras/source/gallery/www-back/lightblue-wet.jpg Binary files differdeleted file mode 100644 index 227afaf6ba91..000000000000 --- a/extras/source/gallery/www-back/lightblue-wet.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/linen-fine.jpg b/extras/source/gallery/www-back/linen-fine.jpg Binary files differdeleted file mode 100644 index af874d217ffd..000000000000 --- a/extras/source/gallery/www-back/linen-fine.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/lino-green.jpg b/extras/source/gallery/www-back/lino-green.jpg Binary files differdeleted file mode 100644 index e178db00a1a4..000000000000 --- a/extras/source/gallery/www-back/lino-green.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/liquid-blue.jpg b/extras/source/gallery/www-back/liquid-blue.jpg Binary files differdeleted file mode 100644 index 97b56e0b0044..000000000000 --- a/extras/source/gallery/www-back/liquid-blue.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/marble_dark.jpg b/extras/source/gallery/www-back/marble_dark.jpg Binary files differdeleted file mode 100644 index e610fc731e79..000000000000 --- a/extras/source/gallery/www-back/marble_dark.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/mazes.jpg b/extras/source/gallery/www-back/mazes.jpg Binary files differdeleted file mode 100644 index 2aa84ade7ea7..000000000000 --- a/extras/source/gallery/www-back/mazes.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/mint.gif b/extras/source/gallery/www-back/mint.gif Binary files differdeleted file mode 100644 index a32311256d6d..000000000000 --- a/extras/source/gallery/www-back/mint.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/notes.gif b/extras/source/gallery/www-back/notes.gif Binary files differdeleted file mode 100644 index 6637d61aead2..000000000000 --- a/extras/source/gallery/www-back/notes.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/pattern.jpg b/extras/source/gallery/www-back/pattern.jpg Binary files differdeleted file mode 100644 index 6a6a3d8d4e44..000000000000 --- a/extras/source/gallery/www-back/pattern.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/pink.gif b/extras/source/gallery/www-back/pink.gif Binary files differdeleted file mode 100644 index b4f98594b349..000000000000 --- a/extras/source/gallery/www-back/pink.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/popcorn.jpg b/extras/source/gallery/www-back/popcorn.jpg Binary files differdeleted file mode 100644 index 4b464604c402..000000000000 --- a/extras/source/gallery/www-back/popcorn.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/purple.jpg b/extras/source/gallery/www-back/purple.jpg Binary files differdeleted file mode 100644 index 71a027a38da9..000000000000 --- a/extras/source/gallery/www-back/purple.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/reddark.jpg b/extras/source/gallery/www-back/reddark.jpg Binary files differdeleted file mode 100644 index a7e5eaff8052..000000000000 --- a/extras/source/gallery/www-back/reddark.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/rings-green.jpg b/extras/source/gallery/www-back/rings-green.jpg Binary files differdeleted file mode 100644 index 17062c2d0629..000000000000 --- a/extras/source/gallery/www-back/rings-green.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/rings-orange.jpg b/extras/source/gallery/www-back/rings-orange.jpg Binary files differdeleted file mode 100644 index 4c49bb9c19fd..000000000000 --- a/extras/source/gallery/www-back/rings-orange.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/roses.jpg b/extras/source/gallery/www-back/roses.jpg Binary files differdeleted file mode 100644 index 3bcc34ea464e..000000000000 --- a/extras/source/gallery/www-back/roses.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/soft-structure_grey.jpg b/extras/source/gallery/www-back/soft-structure_grey.jpg Binary files differdeleted file mode 100644 index 48d0943adef9..000000000000 --- a/extras/source/gallery/www-back/soft-structure_grey.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/space.jpg b/extras/source/gallery/www-back/space.jpg Binary files differdeleted file mode 100644 index 808165d35633..000000000000 --- a/extras/source/gallery/www-back/space.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/stone-dark.jpg b/extras/source/gallery/www-back/stone-dark.jpg Binary files differdeleted file mode 100644 index eb50eeec98af..000000000000 --- a/extras/source/gallery/www-back/stone-dark.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/structure.jpg b/extras/source/gallery/www-back/structure.jpg Binary files differdeleted file mode 100644 index b49da3066e97..000000000000 --- a/extras/source/gallery/www-back/structure.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/structure_darkgreen.gif b/extras/source/gallery/www-back/structure_darkgreen.gif Binary files differdeleted file mode 100644 index ed9e6d27c3a1..000000000000 --- a/extras/source/gallery/www-back/structure_darkgreen.gif +++ /dev/null diff --git a/extras/source/gallery/www-back/structure_green.jpg b/extras/source/gallery/www-back/structure_green.jpg Binary files differdeleted file mode 100644 index 240f2adae06b..000000000000 --- a/extras/source/gallery/www-back/structure_green.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/wall-grey.jpg b/extras/source/gallery/www-back/wall-grey.jpg Binary files differdeleted file mode 100644 index 42270e0c1a58..000000000000 --- a/extras/source/gallery/www-back/wall-grey.jpg +++ /dev/null diff --git a/extras/source/gallery/www-back/wet-turquoise.jpg b/extras/source/gallery/www-back/wet-turquoise.jpg Binary files differdeleted file mode 100644 index 4f6dfc31816b..000000000000 --- a/extras/source/gallery/www-back/wet-turquoise.jpg +++ /dev/null diff --git a/extras/source/palettes/standard.sob b/extras/source/palettes/standard.sob Binary files differindex 820190b59258..f8ff573121dd 100644 --- a/extras/source/palettes/standard.sob +++ b/extras/source/palettes/standard.sob 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 |
