tdf#114817 new bitmap presets for Area Fill

Change-Id: Icc48efc2f6c085ccf0754620dc1cbf5132a7f824
Reviewed-on: https://gerrit.libreoffice.org/49551Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>

extras/Gallery_backgrounds.mk

+# -*- 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:

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 \

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 \

extras/Package_gallwwwback.mk

-# -*- 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:

extras/source/gallery/backgrounds/backgrounds.str

+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"

extras/source/gallery/share/gallery_names.ulf

@@ -10,6 +10,9 @@
 [arrows]
 en-US = "Arrows"
 
+[backgrounds]
+en-US = "Backgrounds"
+
 [computers]
 en-US = "Computers"
 

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")

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"

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)

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)

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