[Libreoffice-commits] online.git: loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |   31 ++++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 313db8a8cd33e2a9c98daf9d6b70cdfb5af5175b
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Tue Apr 21 14:49:13 2020 +0530
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Apr 23 13:19:48 2020 +0200

    leaflet: resolved impress slide background gradient not changing
    
    Change-Id: If71b380859c202327a533b121af45232682e52df
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92088
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index f5f92bb6f..f2cb686c6 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -886,10 +886,23 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			break;
 
 		case 'fillattr':
-			var hatch = items.getItemValue('.uno:FillHatch');
-			var bitmap = items.getItemValue('.uno:FillBitmap');
-			if (hatch || bitmap) {
-				// TODO
+			state = items.getItemValue('.uno:FillPageColor');
+			if (state) {
+				return state;
+			}
+			break;
+
+		case 'fillattr2':
+			state = items.getItemValue('.uno:FillPageGradient');
+			if (state) {
+				return state.startcolor;
+			}
+			break;
+
+		case 'fillattr3':
+			state = items.getItemValue('.uno:FillPageGradient');
+			if (state) {
+				return state.endcolor;
 			}
 			break;
 
@@ -1397,6 +1410,16 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		} else if (data.id === 'fillattr') {
 			builder.map.sendUnoCommand('.uno:FillPageColor?Color:string=' + color);
 			return;
+		} else if (data.id === 'fillattr2') {
+			gradientItem = builder.map['stateChangeHandler'].getItemValue('.uno:FillPageGradient');
+			gradientItem.startcolor = color;
+			builder.map.sendUnoCommand('.uno:FillPageGradient?FillPageGradientJSON:string=' + JSON.stringify(gradientItem));
+			return;
+		} else if (data.id === 'fillattr3') {
+			gradientItem = builder.map['stateChangeHandler'].getItemValue('.uno:FillPageGradient');
+			gradientItem.endcolor = color;
+			builder.map.sendUnoCommand('.uno:FillPageGradient?FillPageGradientJSON:string=' + JSON.stringify(gradientItem));
+			return;
 		}
 
 		var command = data.command + '?Color:string=' + color;