[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/uiconfig

[Samuel Mehrbrodt (via logerrit)]

 sc/uiconfig/scalc/ui/standardfilterdialog.ui |  108 ++-
 1 file changed, 104 insertions(+), 4 deletions(-)

New commits:
commit 653d845bafd4e243b4f6de685d3b4b8b6a08002f
Author: Samuel Mehrbrodt 
AuthorDate: Fri Sep 24 13:51:14 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Sep 29 16:16:08 2021 +0200

Fix color display in standard filter dialog

Add missing UI markup.
Gtk implementation in 6.4 branch does not support displaying the colors
in the dropdown, so currently only the hexadecimal color values are 
displayed.

Change-Id: I7f627cbc1972a3f7eb3052753c159ed102fb0f5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122581
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui 
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index 8e6f1e3610da..b167adba59bc 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -2,10 +2,54 @@
 
 
   
-  
-  
-  
-  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
   
 False
 6
@@ -506,6 +550,20 @@
 False
 True
 liststore1
+0
+1
+
+  
+  
+1
+  
+
+
+  
+  
+3
+  
+
   
   
 False
@@ -555,6 +613,20 @@
 False
 True
 liststore2
+0
+1
+
+  
+  
+1
+  
+
+
+  
+  
+3
+  
+
   
   
 False
@@ -604,6 +676,20 @@
 False
 True
 liststore3
+0
+1
+
+  
+  
+1
+  
+
+
+  
+  
+3
+  
+
   
   
 False
@@ -653,6 +739,20 @@
 False
 True
 liststore4
+0
+1
+
+  
+  
+1
+  
+
+
+  
+  
+3
+  
+
   
   
  

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/uiconfig

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   44 +
 1 file changed, 17 insertions(+), 27 deletions(-)

New commits:
commit bdc19e66f2bc1455b0cf3aff5f520e94365aba73
Author: andreas kainz 
AuthorDate: Wed Sep 9 14:47:26 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Nov 4 17:26:25 2020 +0100

tdf#128135 update Pivot Table Layout to fit minimum height

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102319
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 
(cherry picked from commit d435997f446941adaa76fe4b253946cd08861ffd)

Change-Id: I450625ccac06aec54371ede6bf9b50a221e1ba8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104936
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 4ecf7859557f..076564d1c014 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -49,7 +49,7 @@
 0
 0
 dialog
-
+
   
 
 
@@ -128,7 +128,6 @@
 False
 True
 True
-6
 6
 
   
@@ -212,7 +211,7 @@
   
   
 1
-1
+0
   
 
 
@@ -289,7 +288,7 @@
   
   
 1
-2
+1
   
 
 
@@ -364,7 +363,7 @@
   
   
 0
-2
+1
   
 
 
@@ -442,12 +441,8 @@
   
 0
 0
-2
   
 
-
-  
-
   
   
 True
@@ -533,7 +528,7 @@
 
   
   
-True
+False
 True
 0
   
@@ -564,15 +559,15 @@
 False
 12
 6
-6
+3
 12
+True
 
   
 Ignore empty 
rows
 True
 True
 False
-True
 True
 0
 True
@@ -588,7 +583,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -604,7 +598,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -620,7 +613,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -636,7 +628,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -652,7 +643,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -693,7 +683,6 @@
 12
 6
 True
-True
 6
 12
 
@@ -701,7 +690,6 @@
 True
 False
 True
-True
 0
 none
 
@@ -715,9 +703,8 @@
 True
 False
 True
-True
-6
-12
+3
+6
 
   
 New 
sheet
@@ -825,7 +812,6 @@
 True
 False