[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - framework/source

[Heiko Tietze (via logerrit)]

 framework/source/fwe/helper/titlehelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 534c59c8bc951b610adb2882afb78a64e8914f73
Author: Heiko Tietze 
AuthorDate: Tue Jul 21 08:30:35 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jul 21 10:59:15 2020 +0200

Revert "Disable flavour in title bar for Linux."

This reverts commit 5a782225adc069a9b39986f7ced37eb78e542ae3.

Reason for revert: 
https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/

Change-Id: I2af7fdb4959ef0b81160ec52510e29c0e65401dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99056
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/framework/source/fwe/helper/titlehelper.cxx 
b/framework/source/fwe/helper/titlehelper.cxx
index e1a9738267d0..d02287da16b4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -518,10 +518,10 @@ void TitleHelper::impl_updateTitleForFrame (const 
css::uno::Reference< css::fram
 // document name (from the above "component title").
 impl_appendProductName  (sTitle);
 
-#if defined(WNT) || defined(MACOSX)
 if (!std::string_view(PRODUCTFLAVOR).empty())
+{
 sTitle.append(" " PRODUCTFLAVOR);
-#endif
+}
 
 impl_appendModuleName   (sTitle);
 impl_appendDebugVersion (sTitle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/source

[Heiko Tietze (via logerrit)]

 framework/source/fwe/helper/titlehelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db470e2cb53cf2f7c8da9b7a06ab752de85c09d2
Author: Heiko Tietze 
AuthorDate: Tue Jul 21 08:30:28 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jul 21 10:58:49 2020 +0200

Revert "Disable flavour in title bar for Linux."

This reverts commit 6ddd8673f9985afd48b3212444a942ebe37197f6.

Reason for revert: 
https://blog.documentfoundation.org/blog/2020/07/20/update-on-marketing-and-communication-plans-for-the-libreoffice-7-x-series/

Change-Id: I922e34a5dfe7add0a63f5b9a936a32758b6e949c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99055
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/framework/source/fwe/helper/titlehelper.cxx 
b/framework/source/fwe/helper/titlehelper.cxx
index e1a9738267d0..d02287da16b4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -518,10 +518,10 @@ void TitleHelper::impl_updateTitleForFrame (const 
css::uno::Reference< css::fram
 // document name (from the above "component title").
 impl_appendProductName  (sTitle);
 
-#if defined(WNT) || defined(MACOSX)
 if (!std::string_view(PRODUCTFLAVOR).empty())
+{
 sTitle.append(" " PRODUCTFLAVOR);
-#endif
+}
 
 impl_appendModuleName   (sTitle);
 impl_appendDebugVersion (sTitle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source

[Heiko Tietze (via logerrit)]

 sc/source/core/data/colorscale.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8192e7ad06538a3df44de14950b162b05ac26063
Author: Heiko Tietze 
AuthorDate: Fri Jul 3 22:27:11 2020 +0200
Commit: Eike Rathke 
CommitDate: Sat Jul 4 01:28:57 2020 +0200

Revert "tdf#126733: inverted emoticons sets for the conditional formatting"

This reverts commit a330d8eef09a3135bf6ae94b31b7ea944f256bdc.

Reason for revert: Regression for existing documents

Change-Id: I7bf70ddfa54c40732ca902f258530f34cac6cd98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97910
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit a54dd72bce539faa0de7f18affd4fe6e426fd2d4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97917
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 9d157eeb1a5a..693da4ae62f2 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1249,11 +1249,11 @@ const OUStringLiteral a3Flags[] = {
 };
 
 const OUStringLiteral a3Smilies[] = {
-BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
+BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
 };
 
 const OUStringLiteral a3ColorSmilies[] = {
-BMP_ICON_SET_NEGATIVE_RED_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_POSITIVE_GREEN_SMILIE
+BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_NEGATIVE_RED_SMILIE
 };
 
 const OUStringLiteral a3Stars[] = {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Heiko Tietze (via logerrit)]

 sc/source/core/data/colorscale.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 92c2318db92c3f102243ef1f8a9a492796932ff6
Author: Heiko Tietze 
AuthorDate: Fri Jul 3 22:27:11 2020 +0200
Commit: Eike Rathke 
CommitDate: Sat Jul 4 01:27:39 2020 +0200

Revert "tdf#126733: inverted emoticons sets for the conditional formatting"

This reverts commit a330d8eef09a3135bf6ae94b31b7ea944f256bdc.

Reason for revert: Regression for existing documents

Change-Id: I7bf70ddfa54c40732ca902f258530f34cac6cd98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97910
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 3d1f3625cf60..3fe99a328cf1 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1249,11 +1249,11 @@ const OUStringLiteral a3Flags[] = {
 };
 
 const OUStringLiteral a3Smilies[] = {
-BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_POSITIVE_YELLOW_SMILIE
+BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
 };
 
 const OUStringLiteral a3ColorSmilies[] = {
-BMP_ICON_SET_NEGATIVE_RED_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_POSITIVE_GREEN_SMILIE
+BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, 
BMP_ICON_SET_NEGATIVE_RED_SMILIE
 };
 
 const OUStringLiteral a3Stars[] = {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - extras/Package_gallmytheme.mk extras/Package_gallsystem.mk extras/source

[Heiko Tietze (via logerrit)]

 dev/null  |binary
 extras/Package_gallmytheme.mk |   21 -
 extras/Package_gallsystem.mk  |   42 ++
 extras/source/gallery/share/gallery_names.ulf |   29 ++---
 4 files changed, 40 insertions(+), 52 deletions(-)

New commits:
commit a6718454e6a0ab6f7eb35c4b1f5d8234a704f554
Author: Heiko Tietze 
AuthorDate: Mon Jun 15 16:52:58 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Jun 17 16:06:02 2020 +0200

Resolves tdf#132904 and tdf#133788 - Gallery clean-up

Rename
* sg1  -> bullets
* sg24 -> symbolshapes
* sg36 -> fontwork

Delete
* sg3 (backgrounds) -> 7273bb3534264867e818c13baffcdf3862189cd2
* sg4 (www-graf)-> 82ab7a1559170889c5647a04dc3e85edc38a4e0f

Translation
* ulf completed

Visibility
* New gallery content moved to share/

Change-Id: I718c627a71d4ed0d9eef61ff53814da7ec3922be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96382
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 86b1b062cfc2768a971bb842de1c16f8646d4b4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96501
Reviewed-by: Heiko Tietze 

diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index c4e8744ddf44..88149916095d 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -12,25 +12,4 @@ $(eval $(call 
gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
 $(eval $(call 
gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
-   arrows.sdg \
-   arrows.sdv \
-   arrows.thm \
-   bpmn.sdg \
-   bpmn.sdv \
-   bpmn.thm \
-   flowchart.sdg \
-   flowchart.sdv \
-   flowchart.thm \
-   icons.sdg \
-   icons.sdv \
-   icons.thm \
-   shapes.sdg \
-   shapes.sdv \
-   shapes.thm \
-   network.sdg \
-   network.sdv \
-   network.thm \
-   diagrams.sdg \
-   diagrams.sdv \
-   diagrams.thm \
 ))
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 1f499213afd1..c17099ce7050 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -10,18 +10,36 @@
 $(eval $(call 
gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
 $(eval $(call 
gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
-   sg1.sdg \
-   sg1.sdv \
-   sg1.thm \
-   sg4.sdg \
-   sg4.sdv \
-   sg4.thm \
-   sg24.sdg \
-   sg24.sdv \
-   sg24.thm \
-   sg36.sdg \
-   sg36.sdv \
-   sg36.thm \
+   arrows.sdg \
+   arrows.sdv \
+   arrows.thm \
+   bpmn.sdg \
+   bpmn.sdv \
+   bpmn.thm \
+   bullets.sdg \
+   bullets.sdv \
+   bullets.thm \
+   diagrams.sdg \
+   diagrams.sdv \
+   diagrams.thm \
+   flowchart.sdg \
+   flowchart.sdv \
+   flowchart.thm \
+   fontwork.sdg \
+   fontwork.sdv \
+   fontwork.thm \
+   icons.sdg \
+   icons.sdv \
+   icons.thm \
+   network.sdg \
+   network.sdv \
+   network.thm \
+   shapes.sdg \
+   shapes.sdv \
+   shapes.thm \
+   symbolshapes.sdg \
+   symbolshapes.sdv \
+   symbolshapes.thm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg 
b/extras/source/gallery/gallery_system/arrows.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdg
rename to extras/source/gallery/gallery_system/arrows.sdg
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv 
b/extras/source/gallery/gallery_system/arrows.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdv
rename to extras/source/gallery/gallery_system/arrows.sdv
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm 
b/extras/source/gallery/gallery_system/arrows.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.thm
rename to extras/source/gallery/gallery_system/arrows.thm
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg 
b/extras/source/gallery/gallery_system/bpmn.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdg
rename to extras/source/gallery/gallery_system/bpmn.sdg
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv 
b/extras/source/gallery/gallery_system/bpmn.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdv
rename to extras/source/gallery/gallery_system/bpmn.sdv
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm 
b/extras/source/gallery/gallery_system/bpmn.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.thm
rename to extras/source/gallery/gallery_system/bpmn.thm
diff --git a/extras/source/g

[Libreoffice-commits] core.git: extras/Package_gallmytheme.mk extras/Package_gallsystem.mk extras/source

[Heiko Tietze (via logerrit)]

 dev/null  |binary
 extras/Package_gallmytheme.mk |   21 -
 extras/Package_gallsystem.mk  |   42 ++
 extras/source/gallery/share/gallery_names.ulf |   29 ++---
 4 files changed, 40 insertions(+), 52 deletions(-)

New commits:
commit 86b1b062cfc2768a971bb842de1c16f8646d4b4b
Author: Heiko Tietze 
AuthorDate: Mon Jun 15 16:52:58 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 17 12:35:56 2020 +0200

Resolves tdf#132904 and tdf#133788 - Gallery clean-up

Rename
* sg1  -> bullets
* sg24 -> symbolshapes
* sg36 -> fontwork

Delete
* sg3 (backgrounds) -> 7273bb3534264867e818c13baffcdf3862189cd2
* sg4 (www-graf)-> 82ab7a1559170889c5647a04dc3e85edc38a4e0f

Translation
* ulf completed

Visibility
* New gallery content moved to share/

Change-Id: I718c627a71d4ed0d9eef61ff53814da7ec3922be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96382
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index c4e8744ddf44..88149916095d 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -12,25 +12,4 @@ $(eval $(call 
gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
 $(eval $(call 
gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
-   arrows.sdg \
-   arrows.sdv \
-   arrows.thm \
-   bpmn.sdg \
-   bpmn.sdv \
-   bpmn.thm \
-   flowchart.sdg \
-   flowchart.sdv \
-   flowchart.thm \
-   icons.sdg \
-   icons.sdv \
-   icons.thm \
-   shapes.sdg \
-   shapes.sdv \
-   shapes.thm \
-   network.sdg \
-   network.sdv \
-   network.thm \
-   diagrams.sdg \
-   diagrams.sdv \
-   diagrams.thm \
 ))
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 1f499213afd1..c17099ce7050 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -10,18 +10,36 @@
 $(eval $(call 
gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
 $(eval $(call 
gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
-   sg1.sdg \
-   sg1.sdv \
-   sg1.thm \
-   sg4.sdg \
-   sg4.sdv \
-   sg4.thm \
-   sg24.sdg \
-   sg24.sdv \
-   sg24.thm \
-   sg36.sdg \
-   sg36.sdv \
-   sg36.thm \
+   arrows.sdg \
+   arrows.sdv \
+   arrows.thm \
+   bpmn.sdg \
+   bpmn.sdv \
+   bpmn.thm \
+   bullets.sdg \
+   bullets.sdv \
+   bullets.thm \
+   diagrams.sdg \
+   diagrams.sdv \
+   diagrams.thm \
+   flowchart.sdg \
+   flowchart.sdv \
+   flowchart.thm \
+   fontwork.sdg \
+   fontwork.sdv \
+   fontwork.thm \
+   icons.sdg \
+   icons.sdv \
+   icons.thm \
+   network.sdg \
+   network.sdv \
+   network.thm \
+   shapes.sdg \
+   shapes.sdv \
+   shapes.thm \
+   symbolshapes.sdg \
+   symbolshapes.sdv \
+   symbolshapes.thm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg 
b/extras/source/gallery/gallery_system/arrows.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdg
rename to extras/source/gallery/gallery_system/arrows.sdg
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv 
b/extras/source/gallery/gallery_system/arrows.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdv
rename to extras/source/gallery/gallery_system/arrows.sdv
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm 
b/extras/source/gallery/gallery_system/arrows.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.thm
rename to extras/source/gallery/gallery_system/arrows.thm
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg 
b/extras/source/gallery/gallery_system/bpmn.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdg
rename to extras/source/gallery/gallery_system/bpmn.sdg
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv 
b/extras/source/gallery/gallery_system/bpmn.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdv
rename to extras/source/gallery/gallery_system/bpmn.sdv
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm 
b/extras/source/gallery/gallery_system/bpmn.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.thm
rename to extras/source/gallery/gallery_system/bpmn.thm
diff --git a/extras/source/gallery/gallery_system/sg1.sdg 
b/extras/source/gallery/gallery_system/bullets.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.sdg
re

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/aboutdialog.ui |   69 ++---
 1 file changed, 51 insertions(+), 18 deletions(-)

New commits:
commit 1c2581ddbdcade6ee55e37e0d05158152820a2d5
Author: Heiko Tietze 
AuthorDate: Mon Jun 8 11:33:47 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jun 16 15:20:07 2020 +0200

Resolves tdf#133662 - Copy version info reworked

* Heading for version info added with a tool button
  to copy info using also the shortcut ctrl/cmd+C
* Copy button from the footer buttonbox removed

Change-Id: I47d77ea1bc1ac2df25c1fb035abcb96d56a5f4f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95791
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 382c553d272dec3ff9acba598e1cb70ea270c19d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96416

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index f014f13290f0..b2eb269f6a86 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -24,21 +24,6 @@
 12
 True
 end
-
-  
-Copy _Version Info
-True
-True
-True
-True
-  
-  
-True
-True
-0
-True
-  
-
 
   
 gtk-close
@@ -83,7 +68,7 @@
   
 0
 0
-5
+6
   
 
 
@@ -109,6 +94,7 @@
 True
 False
 start
+6
 
   
 True
@@ -272,7 +258,7 @@
   
   
 1
-4
+5
   
 
 
@@ -374,6 +360,48 @@ LibreOffice was based on OpenOffice.org
 3
   
 
+
+  
+True
+False
+
+  
+True
+False
+Version Information
+0
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+True
+Copy all version information in 
English
+imCopy
+
+  
+  
+False
+True
+end
+1
+  
+
+  
+  
+1
+4
+  
+
   
   
 False
@@ -387,4 +415,9 @@ LibreOffice was based on OpenOffice.org
   btnClose
 
   
+  
+True
+False
+gtk-copy
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/aboutdialog.ui |   69 ++---
 1 file changed, 51 insertions(+), 18 deletions(-)

New commits:
commit d43e03e76e0bcbf1222584c1892d8377b8e09a61
Author: Heiko Tietze 
AuthorDate: Mon Jun 8 11:33:47 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jun 16 09:56:38 2020 +0200

Resolves tdf#133662 - Copy version info reworked

* Heading for version info added with a tool button
  to copy info using also the shortcut ctrl/cmd+C
* Copy button from the footer buttonbox removed

Change-Id: I47d77ea1bc1ac2df25c1fb035abcb96d56a5f4f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95791
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index f014f13290f0..b2eb269f6a86 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -24,21 +24,6 @@
 12
 True
 end
-
-  
-Copy _Version Info
-True
-True
-True
-True
-  
-  
-True
-True
-0
-True
-  
-
 
   
 gtk-close
@@ -83,7 +68,7 @@
   
 0
 0
-5
+6
   
 
 
@@ -109,6 +94,7 @@
 True
 False
 start
+6
 
   
 True
@@ -272,7 +258,7 @@
   
   
 1
-4
+5
   
 
 
@@ -374,6 +360,48 @@ LibreOffice was based on OpenOffice.org
 3
   
 
+
+  
+True
+False
+
+  
+True
+False
+Version Information
+0
+
+  
+
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+True
+Copy all version information in 
English
+imCopy
+
+  
+  
+False
+True
+end
+1
+  
+
+  
+  
+1
+4
+  
+
   
   
 False
@@ -387,4 +415,9 @@ LibreOffice was based on OpenOffice.org
   btnClose
 
   
+  
+True
+False
+gtk-copy
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/appl/appserv.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 6256b86f10d9a2bc51e72088192f3bfcf9d00437
Author: Heiko Tietze 
AuthorDate: Thu Jun 4 15:48:10 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Jun 4 16:32:58 2020 +0200

Revert "Resolves tdf#127401 - Chinese locale pointing to wrong hub forward 
address"

This reverts commit 2788cc07e9d0d078b53a7280d524175c03c51e12.

Reason for revert: 

Change-Id: I47277e7344d5533cc09a3fd6637a0780b36fe739
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95427
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c61a8ab7a3a7..6dd813fdf7be 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -551,7 +551,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
 // Open donation page based on language + script (BCP47) with 
language as fall back.
 OUString aLang = 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
-if (aLang == "zh") aLang = "zh-cn";//tdf#127401
 OUString aBcp47 = 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47();
 OUString sURL(officecfg::Office::Common::Menus::DonationURL::get() 
+ //https://hub.libreoffice.org/donation/
 "?BCP47=" + aBcp47 + "&LOlang=" + aLang );
@@ -561,11 +560,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 case SID_WHATSNEW:
 {
 // Open release notes depending on version and locale
-OUString aLang = 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
-if (aLang == "zh") aLang = "zh-cn";//tdf#127401
 OUString 
sURL(officecfg::Office::Common::Menus::ReleaseNotesURL::get() + 
//https://hub.libreoffice.org/ReleaseNotes/
 "?LOvers=" + utl::ConfigManager::getProductVersion() +
-"&LOlocale=" + aLang );
+"&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() );
 sfx2::openUriExternally(sURL, false);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/appl/appserv.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2788cc07e9d0d078b53a7280d524175c03c51e12
Author: Heiko Tietze 
AuthorDate: Wed Jun 3 19:49:28 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Jun 4 08:59:02 2020 +0200

Resolves tdf#127401 - Chinese locale pointing to wrong hub forward address

zh is replaced by zh-cn for donation and whatsnew commands

Change-Id: Ibd56e94983882bd9090d176cb42ae0a7a1f88065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95450
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 6dd813fdf7be..c61a8ab7a3a7 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -551,6 +551,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
 // Open donation page based on language + script (BCP47) with 
language as fall back.
 OUString aLang = 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
+if (aLang == "zh") aLang = "zh-cn";//tdf#127401
 OUString aBcp47 = 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47();
 OUString sURL(officecfg::Office::Common::Menus::DonationURL::get() 
+ //https://hub.libreoffice.org/donation/
 "?BCP47=" + aBcp47 + "&LOlang=" + aLang );
@@ -560,9 +561,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 case SID_WHATSNEW:
 {
 // Open release notes depending on version and locale
+OUString aLang = 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
+if (aLang == "zh") aLang = "zh-cn";//tdf#127401
 OUString 
sURL(officecfg::Office::Common::Menus::ReleaseNotesURL::get() + 
//https://hub.libreoffice.org/ReleaseNotes/
 "?LOvers=" + utl::ConfigManager::getProductVersion() +
-"&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() );
+"&LOlocale=" + aLang );
 sfx2::openUriExternally(sURL, false);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/inc sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/inc/bitmaps.hlst  |   15 ---
 sfx2/source/control/recentdocsview.cxx |2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 8c08eefeb512d4cbc86c4c5308d86a59bd232beb
Author: Heiko Tietze 
AuthorDate: Thu May 28 13:48:22 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 4 02:11:26 2020 +0200

Resolves tdf#130936 - Proper Icon Size for MIME type Icon in Start Center

Icons are now in 48px

Change-Id: I484458adf047999bc2ea0cbf16e7ff3fff131eec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95028
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 997a504f33bbd43c02a96a2a593a03e58bd3b72c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95416
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index 6ec00cd863de..7e97d1219996 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -67,13 +67,13 @@
 #define SFX_THUMBNAIL_SHEET "res/ots_96_8.png"
 #define SFX_THUMBNAIL_PRESENTATION  "res/otp_96_8.png"
 #define SFX_THUMBNAIL_DRAWING   "res/otg_96_8.png"
-#define SFX_FILE_THUMBNAIL_TEXT "res/writer128.png"
-#define SFX_FILE_THUMBNAIL_SHEET"res/calc128.png"
-#define SFX_FILE_THUMBNAIL_PRESENTATION "res/impress128.png"
-#define SFX_FILE_THUMBNAIL_DRAWING  "res/draw128.png"
-#define SFX_FILE_THUMBNAIL_DATABASE "res/base128.png"
-#define SFX_FILE_THUMBNAIL_MATH "res/math128.png"
-#define SFX_FILE_THUMBNAIL_DEFAULT  "res/main128.png"
+#define SFX_FILE_THUMBNAIL_TEXT "res/odt_48_8.png"
+#define SFX_FILE_THUMBNAIL_SHEET"res/ods_48_8.png"
+#define SFX_FILE_THUMBNAIL_PRESENTATION "res/odp_48_8.png"
+#define SFX_FILE_THUMBNAIL_DRAWING  "res/odg_48_8.png"
+#define SFX_FILE_THUMBNAIL_DATABASE "res/odb_48_8.png"
+#define SFX_FILE_THUMBNAIL_MATH "res/odf_48_8.png"
+#define SFX_FILE_THUMBNAIL_DEFAULT  "res/mainapp_48_8.png"
 
 #define BMP_RECENTDOC_REMOVE"res/recentdoc_remove.png"
 #define BMP_RECENTDOC_REMOVE_HIGHLIGHTED
"res/recentdoc_remove_highlighted.png"
@@ -88,6 +88,7 @@
 
 #define SFX_BMP_CLOSE_DOC   "sfx2/res/closedoc.png"
 
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 468c03b8b632..a5aae89acb7c 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -266,7 +266,7 @@ void RecentDocsView::Reload()
 Size aSize(aThumbnail.GetSizePixel());
 m_pVirDev->SetOutputSizePixel(aSize);
 m_pVirDev->DrawBitmapEx(Point(), aThumbnail);
-m_pVirDev->DrawBitmapEx(Point(aSize.Width()-50,aSize.Height()-50), 
Size(40,40), aModule);
+m_pVirDev->DrawBitmapEx(Point(aSize.Width()-53,aSize.Height()-53), 
Size(48, 48), aModule);
 aThumbnail = m_pVirDev->GetBitmapEx(Point(), aSize);
 m_pVirDev.disposeAndClear();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/inc sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/inc/bitmaps.hlst  |   15 ---
 sfx2/source/control/recentdocsview.cxx |2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 997a504f33bbd43c02a96a2a593a03e58bd3b72c
Author: Heiko Tietze 
AuthorDate: Thu May 28 13:48:22 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Jun 3 11:50:30 2020 +0200

Resolves tdf#130936 - Proper Icon Size for MIME type Icon in Start Center

Icons are now in 48px

Change-Id: I484458adf047999bc2ea0cbf16e7ff3fff131eec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95028
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index 6ec00cd863de..7e97d1219996 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -67,13 +67,13 @@
 #define SFX_THUMBNAIL_SHEET "res/ots_96_8.png"
 #define SFX_THUMBNAIL_PRESENTATION  "res/otp_96_8.png"
 #define SFX_THUMBNAIL_DRAWING   "res/otg_96_8.png"
-#define SFX_FILE_THUMBNAIL_TEXT "res/writer128.png"
-#define SFX_FILE_THUMBNAIL_SHEET"res/calc128.png"
-#define SFX_FILE_THUMBNAIL_PRESENTATION "res/impress128.png"
-#define SFX_FILE_THUMBNAIL_DRAWING  "res/draw128.png"
-#define SFX_FILE_THUMBNAIL_DATABASE "res/base128.png"
-#define SFX_FILE_THUMBNAIL_MATH "res/math128.png"
-#define SFX_FILE_THUMBNAIL_DEFAULT  "res/main128.png"
+#define SFX_FILE_THUMBNAIL_TEXT "res/odt_48_8.png"
+#define SFX_FILE_THUMBNAIL_SHEET"res/ods_48_8.png"
+#define SFX_FILE_THUMBNAIL_PRESENTATION "res/odp_48_8.png"
+#define SFX_FILE_THUMBNAIL_DRAWING  "res/odg_48_8.png"
+#define SFX_FILE_THUMBNAIL_DATABASE "res/odb_48_8.png"
+#define SFX_FILE_THUMBNAIL_MATH "res/odf_48_8.png"
+#define SFX_FILE_THUMBNAIL_DEFAULT  "res/mainapp_48_8.png"
 
 #define BMP_RECENTDOC_REMOVE"res/recentdoc_remove.png"
 #define BMP_RECENTDOC_REMOVE_HIGHLIGHTED
"res/recentdoc_remove_highlighted.png"
@@ -88,6 +88,7 @@
 
 #define SFX_BMP_CLOSE_DOC   "sfx2/res/closedoc.png"
 
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 468c03b8b632..a5aae89acb7c 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -266,7 +266,7 @@ void RecentDocsView::Reload()
 Size aSize(aThumbnail.GetSizePixel());
 m_pVirDev->SetOutputSizePixel(aSize);
 m_pVirDev->DrawBitmapEx(Point(), aThumbnail);
-m_pVirDev->DrawBitmapEx(Point(aSize.Width()-50,aSize.Height()-50), 
Size(40,40), aModule);
+m_pVirDev->DrawBitmapEx(Point(aSize.Width()-53,aSize.Height()-53), 
Size(48, 48), aModule);
 aThumbnail = m_pVirDev->GetBitmapEx(Point(), aSize);
 m_pVirDev.disposeAndClear();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/uiconfig

[Heiko Tietze (via logerrit)]

 sw/uiconfig/swriter/statusbar/statusbar.xml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 194538345691272bf9d7c642f069cc1061a0b4d9
Author: Heiko Tietze 
AuthorDate: Mon May 25 12:09:35 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon May 25 20:10:36 2020 +0200

Resolves tdf#133265 - Save state indicator must not be hidden

Document state indicator mandatory now

Change-Id: I719f8a97a867addcd6a544567b1173e6da0f7db8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94780
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/statusbar/statusbar.xml 
b/sw/uiconfig/swriter/statusbar/statusbar.xml
index f85f07daa068..42a3ebf57251 100644
--- a/sw/uiconfig/swriter/statusbar/statusbar.xml
+++ b/sw/uiconfig/swriter/statusbar/statusbar.xml
@@ -19,12 +19,12 @@
 -->
 http://openoffice.org/2001/statusbar"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
  
- 
- 
+ 
+ 
  
  
  
- 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/uiconfig

[Heiko Tietze (via logerrit)]

 sw/uiconfig/swriter/ui/optgeneralpage.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8fee3f553bf396fad0237f19873e10c08782660f
Author: Heiko Tietze 
AuthorDate: Tue May 19 10:13:01 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue May 19 12:21:22 2020 +0200

Resolves tdf#132996 - Wrong position/scaling of dropdown

Fill explicitely set to Start

Change-Id: Ib17e74e41afe3bad04ae0b665f88df044544c0a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94481
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui 
b/sw/uiconfig/swriter/ui/optgeneralpage.ui
index 50a5a3e96088..bf336913af6a 100644
--- a/sw/uiconfig/swriter/ui/optgeneralpage.ui
+++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui
@@ -220,6 +220,8 @@
   
 True
 False
+start
+True
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

[Heiko Tietze (via logerrit)]

 svx/source/tbxctrls/SvxPresetListBox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5fccbf0f6f55d697efa20d0d2282d39631fe6c59
Author: Heiko Tietze 
AuthorDate: Thu May 14 17:17:36 2020 +0200
Commit: Heiko Tietze 
CommitDate: Sat May 16 10:16:26 2020 +0200

Resolves tdf#132852 - Area fill dialog spacing

WB_ITEMBORDER added to the widget style

Change-Id: Ica898d3f23a7973bd002c3fcf52302b42cb0f269
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94237
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx 
b/svx/source/tbxctrls/SvxPresetListBox.cxx
index adb623bf5dd5..eb31bec38b9b 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -33,7 +33,7 @@ 
SvxPresetListBox::SvxPresetListBox(std::unique_ptr pWindow
 void SvxPresetListBox::SetDrawingArea(weld::DrawingArea* pDrawingArea)
 {
 ValueSet::SetDrawingArea(pDrawingArea);
-SetExtraSpacing(4);
+SetStyle(GetStyle() | WB_ITEMBORDER);
 }
 
 void SvxPresetListBox::Resize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk instsetoo_native/util

[Heiko Tietze (via logerrit)]

 instsetoo_native/CustomTarget_setup.mk  |2 +-
 instsetoo_native/util/openoffice.lst.in |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 692efa7bdaf8d143602f23520c230202f2bafdf7
Author: Heiko Tietze 
AuthorDate: Fri May 15 11:50:21 2020 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 15 14:56:24 2020 +0200

Resolves tdf#133024 - Position of text in splash screen

Moved to 170, see also a165bb8565539e2d0533362a99236829c23e9be8

Change-Id: I61f4c3ab4cfd069365e539b803c3c4d084166c10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94287
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index e2fe7ce5d625..5692f45f2e89 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -141,7 +141,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressSize=385,8' \
&& echo 'ProgressPositionHigh=30,200' \
&& echo 'ProgressSizeHigh=650,12' \
-   && echo 'ProgressTextBaseline=160' \
+   && echo 'ProgressTextBaseline=170' \
&& echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index a30779a8e220..758eaf0389f6 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -21,7 +21,7 @@ Globals
 PROGRESSSIZE 385,8
 PROGRESSPOSITIONHIGH 30,200
 PROGRESSSIZEHIGH 650,12
-PROGRESSTEXTBASELINE 160
+PROGRESSTEXTBASELINE 170
 PROGRESSTEXTCOLOR 0,0,0
 NATIVEPROGRESS false
 REGISTRYLAYERNAME Layers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc |2 ++
 cui/source/tabpages/tpcolor.cxx |   15 +++
 2 files changed, 17 insertions(+)

New commits:
commit c895a6d8298a349784cd0aafff4bf518ac8d0a7d
Author: Heiko Tietze 
AuthorDate: Fri May 15 10:51:10 2020 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 15 11:46:52 2020 +0200

Resolves tdf#132799 - Deleting of colors unclear

Tooltips added for disabled states

Change-Id: Iad8bdd1c22ce6619e233a4a20b4efcc2d4c5a27c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94264
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index fb5a67ef015d..c70c46d59a39 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -395,6 +395,8 @@
 #define RID_SVXSTR_COMMANDTIP   
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
 
 #define RID_SVXSTR_QRCODEDATALONG   
NC_("RID_SVXSTR_QRCODEDATALONG", "Text exceeds the maximum bits for Error 
Correction, Enter shorter text")
+#define RID_SVXSTR_DELETEUSERCOLOR1 
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
+#define RID_SVXSTR_DELETEUSERCOLOR2 
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
 
 #endif
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 62d6d321fe1c..5933985a9b50 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -125,6 +125,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, 
weld::DialogController*
 // disable modify buttons
 // Color palettes can't be modified
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
 
 // disable preset color values
 m_xRGBpreset->set_sensitive(false);
@@ -365,6 +366,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, 
weld::Button&, void)
 m_xValSetColorList->InsertItem( nId + 1 , aCurrentColor, aName );
 m_xValSetColorList->SelectItem( nId + 1 );
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
 ImpColorCountChanged();
 }
 
@@ -421,7 +423,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, 
weld::Button&, void)
 SelectValSetHdl_Impl(m_xValSetColorList.get());
 }
 else
+{
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
+}
 }
 
 IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void)
@@ -454,7 +459,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, 
weld::ComboBox&, void)
 }
 }
 if (nPos != 0)
+{
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) 
);
+}
 
 m_xValSetColorList->Resize();
 }
@@ -476,14 +484,21 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, 
ValueSet*, pValSet, void)
 {
 m_xValSetRecentList->SetNoSelection();
 if (m_xSelectPalette->get_active() == 0 && 
m_xValSetColorList->GetSelectedItemId() != 0)
+{
 m_xBtnDelete->set_sensitive(true);
+m_xBtnDelete->set_tooltip_text("");
+}
 else
+{
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( 
SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
+}
 }
 if (pValSet == m_xValSetRecentList.get())
 {
 m_xValSetColorList->SetNoSelection();
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/shell/logo.svg  |2 +-
 icon-themes/colibre/brand/shell/logo_inverted.svg |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20b3c706ccef238171af41daa7add2c6f80934fb
Author: Heiko Tietze 
AuthorDate: Thu May 14 10:46:26 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu May 14 15:18:50 2020 +0200

Resolves tdf#132871 - Truncated text in brand image

Text converted to path in SVG

Change-Id: I2c5fda66850853d89396c8c6c7a88d8bf6b382e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94185
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/colibre/brand/shell/logo.svg 
b/icon-themes/colibre/brand/shell/logo.svg
index 877f7ded9c8e..e7381d3f6614 100644
--- a/icon-themes/colibre/brand/shell/logo.svg
+++ b/icon-themes/colibre/brand/shell/logo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">Community 
Edition
\ No newline at end of file
+http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
diff --git a/icon-themes/colibre/brand/shell/logo_inverted.svg 
b/icon-themes/colibre/brand/shell/logo_inverted.svg
index b607a6503aa4..159a22a80d6c 100644
--- a/icon-themes/colibre/brand/shell/logo_inverted.svg
+++ b/icon-themes/colibre/brand/shell/logo_inverted.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; version="1.2" width="345.611" 
height="71.5" viewBox="0 0 9144.293 1891.771" preserveAspectRatio="xMidYMid" 
fill-rule="evenodd" stroke-width="28.222" stroke-linejoin="round">Community 
Edition
\ No newline at end of file
+http://www.w3.org/2000/svg"; stroke-linejoin="round" 
stroke-width="28.222" fill-rule="evenodd" preserveAspectRatio="xMidYMid" 
viewBox="0 0 9144.293 1891.771" height="71.5" width="345.611" version="1.2">
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk instsetoo_native/util

[Heiko Tietze (via logerrit)]

 instsetoo_native/CustomTarget_setup.mk  |2 +-
 instsetoo_native/util/openoffice.lst.in |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a165bb8565539e2d0533362a99236829c23e9be8
Author: Heiko Tietze 
AuthorDate: Thu May 14 11:58:39 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu May 14 15:18:02 2020 +0200

Resolves tdf#133024 - Position of text in splash screen

Moved to 160

Change-Id: I86cb1881161142e265e849b7490fda88b47a23bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94188
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 4d845441c6a6..e2fe7ce5d625 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -141,7 +141,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressSize=385,8' \
&& echo 'ProgressPositionHigh=30,200' \
&& echo 'ProgressSizeHigh=650,12' \
-   && echo 'ProgressTextBaseline=150' \
+   && echo 'ProgressTextBaseline=160' \
&& echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 1a2fdb5540f0..a30779a8e220 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -16,12 +16,12 @@ Globals
 UREPACKAGEPREFIX libreoffice
 SOLSUREPACKAGEPREFIX libreoffice
 PROGRESSBARCOLOR 0,0,0
-PROGRESSSIZE 444,8
-PROGRESSSIZEHIGH 617,12
-PROGRESSPOSITION 35,153
-PROGRESSPOSITIONHIGH 46,212
 PROGRESSFRAMECOLOR 102,102,102
-PROGRESSTEXTBASELINE 145
+PROGRESSPOSITION 30,145
+PROGRESSSIZE 385,8
+PROGRESSPOSITIONHIGH 30,200
+PROGRESSSIZEHIGH 650,12
+PROGRESSTEXTBASELINE 160
 PROGRESSTEXTCOLOR 0,0,0
 NATIVEPROGRESS false
 REGISTRYLAYERNAME Layers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

[Heiko Tietze (via logerrit)]

 svx/source/tbxctrls/tbcontrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 535d857975e453401c0c455bdda82e1a81c7e110
Author: Heiko Tietze 
AuthorDate: Wed May 13 12:15:37 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed May 13 19:29:06 2020 +0200

Resolves tdf#132435 - Font selection drop down too narrow

Showing 18 chars now

Change-Id: If6482cd25c74c4fea9eefca76b4828eff0ede220
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94112
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ce6a935c4714..08ee5e149baf 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -104,7 +104,7 @@
 
 #define MAX_MRU_FONTNAME_ENTRIES5
 
-#define COMBO_WIDTH_IN_CHARS15
+#define COMBO_WIDTH_IN_CHARS18
 
 // namespaces
 using namespace ::editeng;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/about.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c206fd36389d0d96132c055dcb2afb2d6e02a9b5
Author: Heiko Tietze 
AuthorDate: Thu May 7 11:59:43 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu May 7 15:23:25 2020 +0200

Copy build ID in full length

Change-Id: Ic64f62cb0acc30efaaf24f9ce17c1f2d983c4e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93628
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 953670ffa7ae..33d343b00a4f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -260,7 +260,7 @@ IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, 
void) {
 
   OUString sInfo;
   sInfo += "Version: " + m_pVersionLabel->get_label() + "\n";
-  sInfo += "Build ID: " + m_pBuildLabel->get_label() + "\n";
+  sInfo += "Build ID: " + GetBuildString() + "\n";
   sInfo += m_pEnvLabel->get_label();
   sInfo += m_pUILabel->get_label() + "\n";
   sInfo += "Locale: " + m_pLocaleLabel->get_label() + "\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/source

[Heiko Tietze (via logerrit)]

 setup_native/source/packinfo/osxdndinstall.png |binary
 1 file changed

New commits:
commit dadbdf6674154d2052f4ae14afed3bcee392010d
Author: Heiko Tietze 
AuthorDate: Tue May 5 17:56:29 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed May 6 08:53:17 2020 +0200

Resolves tdf#132701 - macOS installer image must be 72dpi

See also 12b389e838743dec662c70c4772553a96ad4f9ac

Change-Id: Ib46cd37e29beac4c18b2f9ce5a74b01f6c357cbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93500
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/setup_native/source/packinfo/osxdndinstall.png 
b/setup_native/source/packinfo/osxdndinstall.png
index bab0797ad0af..b31d1b52aa5c 100644
Binary files a/setup_native/source/packinfo/osxdndinstall.png and 
b/setup_native/source/packinfo/osxdndinstall.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig icon-themes/colibre setup_native/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc   |2 
 cui/source/dialogs/about.cxx  |   11 -
 cui/uiconfig/ui/aboutdialog.ui|   20 +-
 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/intro.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |  188 --
 icon-themes/colibre/brand/shell/logo_inverted.svg |  188 --
 icon-themes/colibre/brand_dev/intro-highres.png   |binary
 icon-themes/colibre/brand_dev/intro.png   |binary
 setup_native/source/packinfo/osxdndinstall.png|binary
 10 files changed, 21 insertions(+), 388 deletions(-)

New commits:
commit 1bc96e1d9c4d372761ac4b6a2891cbcc3768a60f
Author: Heiko Tietze 
AuthorDate: Mon May 4 21:48:17 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue May 5 07:52:28 2020 +0200

Some improvements to About box and branding

* Label left-aligned (tdf#132322)
* Long build string cut at 25 chars
* Extra text such as Tinderbox info wraps now at Misc
* UI-Language shortened to just UI
* More padding between about image and text

* Splash screen uses Vegur font
* Splash with small border
* Non-TDF logos have a "Community Edition" text

Change-Id: I1ec31e22052e365f28fe91de3e083252975911c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93444
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index df99edb217b2..fb5a67ef015d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -386,7 +386,7 @@
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
+#define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
 
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c07a8c964586..953670ffa7ae 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -71,10 +71,13 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pVersionLabel->set_label(GetVersionString());
 
   OUString sbuildId = GetBuildString();
+  const long nMaxChar = 25;
   if (IsStringValidGitHash(sbuildId)) {
-m_pBuildLabel->set_label(sbuildId);
-m_pBuildLabel->set_uri(
-"https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h="; + 
sbuildId);
+
m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=";
+   + sbuildId);
+m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? 
sbuildId.replaceAt(
+ nMaxChar, sbuildId.getLength() - nMaxChar, 
"...")
+ : sbuildId);
   } else {
 m_pBuildCaption->hide();
 m_pBuildLabel->hide();
@@ -104,7 +107,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
 m_pBrandImage->set_image(m_pVirDev.get());
 m_pVirDev.disposeAndClear();
   }
-  if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth)) {
+  if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 
0.9)) {
 ScopedVclPtr m_pVirDev =
 m_pAboutImage->create_virtual_device();
 m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 5f3610856e34..9c4dee2e2d70 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -76,7 +76,7 @@
 center
 center
 12
-12
+24
 True
 True
   
@@ -116,8 +116,7 @@
 True
 Version:
 True
-50
-1
+0
   
   
 0
@@ -130,7 +129,7 @@
 False
 True
 Build:
-1
+0
   
   
 0
@@ -143,7 +142,7 @@
 False
 True
 Environment:
-1
+0
   
   
 0
@@ -196,7 +195,8 @@
 False
 True
 Misc:
-  

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc  |3 ---
 cui/source/dialogs/about.cxx |   34 --
 2 files changed, 8 insertions(+), 29 deletions(-)

New commits:
commit 35f5520fc83a2c69a5d5eef283a37b1553c8ed65
Author: Heiko Tietze 
AuthorDate: Thu Apr 30 16:32:59 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 30 20:45:59 2020 +0200

Drop obsolete variable strings

Change-Id: I0cd96b3466f94681567663625aa662717630e92f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93220
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1049f7e7ff4f..df99edb217b2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -381,14 +381,11 @@
 
 #define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", 
"%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
 #define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/";)
-#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"$BUILDID")
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"$LOCALE")
 #define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 845ad5496a37..c07a8c964586 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -142,7 +142,7 @@ bool AboutDialog::IsStringValidGitHash(const OUString 
&hash) {
 }
 
 OUString AboutDialog::GetVersionString() {
-  OUString sVersion = CuiResId(RID_SVXSTR_ABOUT_VERSION);
+  OUString sVersion = 
CuiResId("%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX");
 
 #ifdef _WIN64
   sVersion += " (x64)";
@@ -163,18 +163,7 @@ OUString AboutDialog::GetBuildString() {
   }
   OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file");
 
-  OUString sBuildStr;
-
-  if (!sBuildId.trim().isEmpty()) {
-sBuildStr = CuiResId(RID_SVXSTR_ABOUT_BUILDID);
-if (sBuildStr.indexOf("$BUILDID") == -1) {
-  SAL_WARN("cui.dialogs", "translated Build Id string in translations "
-  "doesn't contain $BUILDID placeholder");
-  sBuildStr += " $BUILDID";
-}
-sBuildStr = sBuildStr.replaceAll("$BUILDID", sBuildId);
-  }
-  return sBuildStr;
+  return sBuildId;
 }
 
 OUString AboutDialog::GetEnvString() { return Application::GetHWOSConfInfo(1); 
}
@@ -182,29 +171,22 @@ OUString AboutDialog::GetUIString() { return 
Application::GetHWOSConfInfo(2); }
 
 OUString AboutDialog::GetLocaleString() {
 
-  OUString aLocaleStr;
+  OUString sLocaleStr;
 
   rtl_Locale *pLocale;
   osl_getProcessLocale(&pLocale);
   if (pLocale && pLocale->Language) {
 if (pLocale->Country && rtl_uString_getLength(pLocale->Country) > 0)
-  aLocaleStr = OUString::unacquired(&pLocale->Language) + "_" +
+  sLocaleStr = OUString::unacquired(&pLocale->Language) + "_" +
OUString::unacquired(&pLocale->Country);
 else
-  aLocaleStr = OUString(pLocale->Language);
+  sLocaleStr = OUString(pLocale->Language);
 if (pLocale->Variant && rtl_uString_getLength(pLocale->Variant) > 0)
-  aLocaleStr += OUString(pLocale->Variant);
+  sLocaleStr += OUString(pLocale->Variant);
   }
 
-  aLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" +
-   aLocaleStr + ")";
-  OUString sLocaleStr(CuiResId(RID_SVXSTR_ABOUT_LOCALE));
-  if (sLocaleStr.indexOf("$LOCALE") == -1) {
-SAL_WARN("cui.dialogs", "translated locale string in translations doesn't "
-"contain $LOCALE placeholder");
-sLocaleStr += " $LOCALE";
-  }
-  sLocaleStr = sLocaleStr.replaceAll("$LOCALE", aLocaleStr);
+  sLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" +
+   sLocaleStr + ")";
 
   OUString aUILocaleStr =
   Application::GetSettings().GetUILanguageTag().getBcp47();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinf

[Libreoffice-commits] core.git: icon-themes/colibre instsetoo_native/inc_common setup_native/source

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/flat_logo.svg | 1187 
--
 icon-themes/colibre/brand/intro-highres.png |binary
 icon-themes/colibre/brand/intro.png |binary
 icon-themes/colibre/brand/shell/logo.svg|  116 
 icon-themes/colibre/brand/shell/logo_inverted.svg   |  114 
 icon-themes/colibre/brand_dev/intro-highres.png |binary
 icon-themes/colibre/brand_dev/intro.png |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp  |binary
 setup_native/source/packinfo/osxdndinstall.png  |binary
 10 files changed, 31 insertions(+), 1386 deletions(-)

New commits:
commit 492675180203b3409074923d7993429237611f99
Author: Heiko Tietze 
AuthorDate: Thu Apr 30 11:38:23 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 30 12:27:00 2020 +0200

Resolves tdf#130778 - Branding for 7.0

Remaining installer images added
TDF tagline removed
White background on all splash screens

Change-Id: Iafde896fd3ed58957ec16ba43565c56e85db925c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93199
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/colibre/brand/flat_logo.svg 
b/icon-themes/colibre/brand/flat_logo.svg
deleted file mode 100644
index dc9279be615f..
--- a/icon-themes/colibre/brand/flat_logo.svg
+++ /dev/null
@@ -1,1187 +0,0 @@
-
-http://xml.openoffice.org/svg/export";
-   xmlns:dc="http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://creativecommons.org/ns#";
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-   xmlns:svg="http://www.w3.org/2000/svg";
-   xmlns="http://www.w3.org/2000/svg";
-   xmlns:xlink="http://www.w3.org/1999/xlink";
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   version="1.2"
-   width="171.45mm"
-   height="28.22mm"
-   viewBox="0 0 17145 2822"
-   preserveAspectRatio="xMidYMid"
-   fill-rule="evenodd"
-   stroke-width="28.222"
-   stroke-linejoin="round"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="flat_logo.svg">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svgio/source

[Heiko Tietze (via logerrit)]

 svgio/source/svgreader/svgdocumenthandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5b2e4ae435859ba0e72bafd30f68054892b4c83
Author: Heiko Tietze 
AuthorDate: Wed Apr 29 15:43:28 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Apr 29 21:36:46 2020 +0200

Resolves tdf#132513 - SVG warns on metadata

No warnings required for unknown tags, so better go with SAL_INFO

Change-Id: Ie9269161d485c457d81b8c2b94a952b5025a46c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93164
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx 
b/svgio/source/svgreader/svgdocumenthandler.cxx
index 6b925c03745e..1a44d64ae127 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -405,7 +405,7 @@ namespace svgio::svgreader
 default:
 {
 /// invalid token, ignore
-SAL_WARN( "svgio", "Unknown Base SvgToken <" + aName + "> 
(!)" );
+SAL_INFO( "svgio", "Unknown Base SvgToken <" + aName + "> 
(!)" );
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/vcl vcl/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc|6 -
 cui/source/dialogs/about.cxx   |  179 +++--
 cui/source/inc/about.hxx   |   16 ++-
 cui/uiconfig/ui/aboutdialog.ui |  195 -
 include/vcl/svapp.hxx  |4 
 vcl/source/app/svapp.cxx   |   70 +++---
 6 files changed, 340 insertions(+), 130 deletions(-)

New commits:
commit ab846145bbd56f4308c8657df8b1354a403edd74
Author: Heiko Tietze 
AuthorDate: Wed Apr 29 11:39:57 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Apr 29 19:09:39 2020 +0200

Resolves tdf#132322 - Link to Gerrit hash reintroduced

Mulit-line label split, Build realized as link_button

Required changes also solve tdf#132066 partially as many
localized strings are not anymore copied to clipboard

Change-Id: I346fdc65cd1734f17854eccd587fe0b7e216e720
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93119
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9c81a8e104f9..1049f7e7ff4f 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -381,14 +381,14 @@
 
 #define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", "Version: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
+#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", 
"%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
 #define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/";)
-#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"Build ID: $BUILDID")
+#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"$BUILDID")
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"Locale: $LOCALE")
+#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"$LOCALE")
 #define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ed58d06acc1c..845ad5496a37 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -19,23 +19,23 @@
 
 #include 
 
-#include  //OSL_ENSURE
-#include  //osl_getProcessLocale
+#include //OSL_ENSURE
+#include  //osl_getProcessLocale
 #include  //rtl::isAsciiHexDigit
-#include  //SAL_WARN
-#include  //GetSettings
+#include//SAL_WARN
+#include   //GetSettings
+#include  //Application::
+#include //VirtualDevice
 #include 
-#include  //Application::
-#include  //VirtualDevice
 
+#include  //EXTRA_BUILDID
+#include   //CuiResId
 #include 
+#include  //SfxApplication::loadBrandSvg
+#include 
 #include 
 #include  //utl::Bootstrap::getBuildVersion
 #include  //ConfigManager::
-#include  //EXTRA_BUILDID
-#include  //CuiResId
-#include  //SfxApplication::loadBrandSvg
-#include 
 
 #include 
 #include 
@@ -58,13 +58,36 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pCopyButton(m_xBuilder->weld_button("btnCopyVersion")),
   m_pBrandImage(m_xBuilder->weld_image("imBrand")),
   m_pAboutImage(m_xBuilder->weld_image("imAbout")),
-  m_pVersionLabel(m_xBuilder->weld_label("lbVersion")),
+  m_pVersionLabel(m_xBuilder->weld_label("lbVersionString")),
+  m_pBuildCaption(m_xBuilder->weld_label("lbBuild")),
+  m_pBuildLabel(m_xBuilder->weld_link_button("lbBuildString")),
+  m_pEnvLabel(m_xBuilder->weld_label("lbEnvString")),
+  m_pUILabel(m_xBuilder->weld_label("lbUIString")),
+  m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")),
+  m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")),
   m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
+
+  // Labels
   m_pVersionLabel->set_label(GetVersionString());
+
+  OUString sbuildId = GetBuildString();
+  if (IsStringValidGitHash(sbuildId)) {
+m_pBuildLabel->set_label(sbuildId);
+m_pBuildLabel->set_uri(
+"https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h="; + 
sbuildId);
+  } else {
+m_pBuildCaption->hide();
+   

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcb23ee8d29c47f55ca26382d3c6be924a6fec40
Author: Heiko Tietze 
AuthorDate: Fri Apr 24 15:50:11 2020 +0200
Commit: Heiko Tietze 
CommitDate: Sat Apr 25 09:23:12 2020 +0200

Fix for print dialog

Scroll window must not scroll horizontally

Change-Id: Id1ccf5399d05b846f1d8272657a5a5fa2df0a744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92860
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index d0ebb7abe103..63a55cb64ce6 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -344,8 +344,8 @@
   
 True
 True
+never
 in
-500
 450
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui | 1721 -
 1 file changed, 858 insertions(+), 863 deletions(-)

New commits:
commit 26ada4335a5804735ae37cf9a89f8145e0931fd7
Author: Heiko Tietze 
AuthorDate: Thu Apr 23 13:40:29 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 23 20:13:44 2020 +0200

tdf#127782 - New Print dialog is too high

ScrollWindow behind the tab control

Change-Id: I5560f4368f94a45eeb1e3af3bf18df0f305ab3da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92758
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f3935ecf24c8..d0ebb7abe103 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -66,7 +66,7 @@
 0
 0
 dialog
-
+
   
 
 
@@ -146,38 +146,30 @@
   
 
 
-  
+  
 True
 False
-6
+True
+True
 
-  
+  
 True
 False
+6
+vertical
+12
 
-  
+  
 True
-True
+False
 vertical
-6
 
-  
+  
 True
 False
-vertical
-
-  
-True
-False
-GDK_STRUCTURE_MASK | 
GDK_SCROLL_MASK
-Print preview
-  
-  
-True
-True
-0
-  
-
+GDK_STRUCTURE_MASK | 
GDK_SCROLL_MASK
+Print preview
+6
   
   
 True
@@ -185,103 +177,29 @@
 0
   
 
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+False
 
-  
+  
 True
 False
+6
 
-  
+  
 True
-False
-10
-6
-
-  
-True
-True
-True
-Last page
-imgLast
-  
-  
-False
-True
-end
-0
-  
-
-
-  
-True
-True
-True
-Next page
-imgForward
-  
-  
-False
-False
-end
-1
-  
-
-
-  
-True
-False
-/ %n
-  
-  
-False
-True
-end
-2
-  
-
-
-  
-True
-True
-3
-1
-  
-  
-False
-True
-end
-3
-  
-
-
-

[Libreoffice-commits] core.git: cui/source

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/about.cxx |   22 +++---
 1 file changed, 3 insertions(+), 19 deletions(-)

New commits:
commit 8f85ca5aefcf1046d2276585b10144bb97d2a870
Author: Heiko Tietze 
AuthorDate: Tue Apr 21 20:19:26 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 22 02:32:14 2020 +0200

Resolves build error from I4c2107b8120797a7cd532b59ca5ccb58ab61a2ae

Change-Id: I2791a51104d73daae5f140ee5b396aa2a64857ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92656
Tested-by: Rene Engelhard 
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index e96fb2a50ee1..d04d15a3b49b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -37,10 +37,8 @@
 #include  //SfxApplication::loadBrandSvg
 #include 
 
-#include 
 #include 
-#include 
-#include 
+#include 
 
 #include 
 #if HAVE_FEATURE_OPENCL
@@ -252,20 +250,6 @@ IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, 
void) {
   css::uno::Reference xClipboard =
   css::datatransfer::clipboard::SystemClipboard::create(
   comphelper::getProcessComponentContext());
-
-  if (xClipboard.is()) {
-css::uno::Reference xDataObj(
-new TETextDataObject(m_pVersionLabel->get_label()));
-try {
-  xClipboard->setContents(xDataObj, nullptr);
-
-  css::uno::Reference
-  xFlushableClipboard(xClipboard, css::uno::UNO_QUERY);
-  if (xFlushableClipboard.is())
-xFlushableClipboard->flushClipboard();
-} catch (const css::uno::Exception &) {
-  TOOLS_WARN_EXCEPTION("cui.dialogs", "Caught exception trying to copy");
-}
-  }
+  vcl::unohelper::TextDataObject::CopyStringTo(m_pVersionLabel->get_label(), 
xClipboard);
 }
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre instsetoo_native/CustomTarget_setup.mk sfx2/source

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro-highres.png |binary
 icon-themes/colibre/brand/intro.png |binary
 icon-themes/colibre/brand_dev/intro-highres.png |binary
 icon-themes/colibre/brand_dev/intro.png |binary
 instsetoo_native/CustomTarget_setup.mk  |8 
 sfx2/source/control/recentdocsview.cxx  |8 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 951b7eef8894bce7f119ecc0123c7e37fe6b4b4f
Author: Heiko Tietze 
AuthorDate: Mon Apr 20 17:04:16 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Apr 21 17:04:50 2020 +0200

Relates tdf#130778 - Branding for 7.0

Better splash screen images
Start center image depending on initial size

Change-Id: I18823e04537bb217eaa7610c71c8021907dbbb94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92583
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/colibre/brand/intro-highres.png 
b/icon-themes/colibre/brand/intro-highres.png
index d27f8858dc6c..8e11c7a79399 100644
Binary files a/icon-themes/colibre/brand/intro-highres.png and 
b/icon-themes/colibre/brand/intro-highres.png differ
diff --git a/icon-themes/colibre/brand/intro.png 
b/icon-themes/colibre/brand/intro.png
index 23ead5c5fda1..5c105f155e99 100644
Binary files a/icon-themes/colibre/brand/intro.png and 
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand_dev/intro-highres.png 
b/icon-themes/colibre/brand_dev/intro-highres.png
index acbb1b864d3c..f830836fe81d 100644
Binary files a/icon-themes/colibre/brand_dev/intro-highres.png and 
b/icon-themes/colibre/brand_dev/intro-highres.png differ
diff --git a/icon-themes/colibre/brand_dev/intro.png 
b/icon-themes/colibre/brand_dev/intro.png
index db8139e52abf..6c928c6100d9 100644
Binary files a/icon-themes/colibre/brand_dev/intro.png and 
b/icon-themes/colibre/brand_dev/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index d9f0d6d51ac4..27fd118c4b9e 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -137,10 +137,10 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressBarColor=0,0,0' \
&& echo 'ProgressFrameColor=102,102,102' \
&& echo 'ProgressPosition=30,145' \
-   && echo 'ProgressSize=265,8' \
-   && echo 'ProgressPositionHigh=46,212' \
-   && echo 'ProgressSizeHigh=617,12' \
-   && echo 'ProgressTextBaseline=160' \
+   && echo 'ProgressSize=385,8' \
+   && echo 'ProgressPositionHigh=30,200' \
+   && echo 'ProgressSizeHigh=650,12' \
+   && echo 'ProgressTextBaseline=150' \
&& echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index b4b5fea1c2ec..468c03b8b632 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -136,8 +136,6 @@ RecentDocsView::RecentDocsView( vcl::Window* pParent )
 setItemMaxTextLength( 30 );
 setItemDimensions( mnItemMaxSize, mnItemMaxSize, gnTextHeight, 
gnItemPadding );
 
-maWelcomeImage = SfxApplication::GetApplicationLogo(500);
-
 maFillColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsBackgroundColor::get());
 maTextColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsTextColor::get());
 maHighlightColor = 
Color(officecfg::Office::Common::Help::StartCenter::StartCenterThumbnailsHighlightColor::get());
@@ -355,6 +353,12 @@ void RecentDocsView::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rect
 
 if (mItemList.empty())
 {
+if (maWelcomeImage.IsEmpty())
+{
+const long aWidth(aRect.GetWidth() > aRect.getHeight() ? 
aRect.GetHeight()/2 : aRect.GetWidth()/2);
+maWelcomeImage = SfxApplication::GetApplicationLogo(aWidth);
+}
+
 // No recent files to be shown yet. Show a welcome screen.
 rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
 SetMessageFont(rRenderContext);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/aboutdialog.ui |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 1fe4486cd56a8e7f6f19f5a8453c167faac8faa4
Author: Heiko Tietze 
AuthorDate: Mon Apr 20 14:34:33 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Apr 20 16:06:45 2020 +0200

Resolves tdf#132180 - Stretched brand image at the ABout dialog

Explicitly centering the image solves the issue

Change-Id: Ib5c4a7e772f01de72c19d74490f6a802378885ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92565
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index d61aea94cf88..bbbac5187d92 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -73,8 +73,11 @@
   
 True
 False
+center
+center
 12
 True
+True
   
   
 0
@@ -86,9 +89,13 @@
   
 True
 False
+center
+center
 24
 24
 24
+True
+True
 0
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/about.cxx   |   27 +++
 cui/source/inc/about.hxx   |3 +++
 cui/uiconfig/ui/aboutdialog.ui |   16 +++-
 3 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit d2323f3df20e77a1b1245783fac077b49456732d
Author: Heiko Tietze 
AuthorDate: Fri Apr 17 13:20:36 2020 +0200
Commit: Mike Kaganski 
CommitDate: Mon Apr 20 14:27:03 2020 +0200

Resolves tdf#132179 - Improve accessibility for the About dialog

Button added to copy version info
Static text made non-selectable to avoid uncommon tabbing

Change-Id: I4c2107b8120797a7cd532b59ca5ccb58ab61a2ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92418
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ec5d6b98930b..e96fb2a50ee1 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -37,6 +37,11 @@
 #include  //SfxApplication::loadBrandSvg
 #include 
 
+#include 
+#include 
+#include 
+#include 
+
 #include 
 #if HAVE_FEATURE_OPENCL
 #include 
@@ -52,6 +57,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pWebsiteButton(m_xBuilder->weld_link_button("btnWebsite")),
   m_pReleaseNotesButton(m_xBuilder->weld_link_button("btnReleaseNotes")),
   m_pCloseButton(m_xBuilder->weld_button("btnClose")),
+  m_pCopyButton(m_xBuilder->weld_button("btnCopyVersion")),
   m_pBrandImage(m_xBuilder->weld_image("imBrand")),
   m_pAboutImage(m_xBuilder->weld_image("imAbout")),
   m_pVersionLabel(m_xBuilder->weld_label("lbVersion")),
@@ -101,6 +107,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pReleaseNotesButton->set_uri(sURL);
 
   //Handler
+  m_pCopyButton->connect_clicked(LINK(this, AboutDialog, HandleClick));
   m_pCloseButton->grab_focus();
 }
 
@@ -241,4 +248,24 @@ OUString AboutDialog::GetCopyrightString() {
   return aCopyrightString;
 }
 
+IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, void) {
+  css::uno::Reference xClipboard =
+  css::datatransfer::clipboard::SystemClipboard::create(
+  comphelper::getProcessComponentContext());
+
+  if (xClipboard.is()) {
+css::uno::Reference xDataObj(
+new TETextDataObject(m_pVersionLabel->get_label()));
+try {
+  xClipboard->setContents(xDataObj, nullptr);
+
+  css::uno::Reference
+  xFlushableClipboard(xClipboard, css::uno::UNO_QUERY);
+  if (xFlushableClipboard.is())
+xFlushableClipboard->flushClipboard();
+} catch (const css::uno::Exception &) {
+  TOOLS_WARN_EXCEPTION("cui.dialogs", "Caught exception trying to copy");
+}
+  }
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index ab03768a27df..bd90143a83e6 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -29,6 +29,7 @@ private:
 std::unique_ptr m_pWebsiteButton;
 std::unique_ptr m_pReleaseNotesButton;
 std::unique_ptr m_pCloseButton;
+std::unique_ptr m_pCopyButton;
 
 std::unique_ptr m_pBrandImage;
 std::unique_ptr m_pAboutImage;
@@ -41,6 +42,8 @@ private:
 static OUString GetLocaleString();
 static bool IsStringValidGitHash(const OUString& hash);
 
+DECL_LINK(HandleClick, weld::Button&, void);
+
 public:
 AboutDialog(weld::Window* pParent);
 virtual ~AboutDialog() override;
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index e1a1c1a18b71..d61aea94cf88 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -24,6 +24,21 @@
 12
 True
 end
+
+  
+Copy _Version Info
+True
+True
+True
+True
+  
+  
+True
+True
+0
+True
+  
+
 
   
 gtk-close
@@ -136,7 +151,6 @@ CPU threads
 Locale:
 Calc:
 True
-True
 50
 0
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gla11y compilerplugins/clang configure.ac cui/inc cui/source cui/uiconfig icon-themes/colibre icon-themes/karasa_jaga icon-themes/sukapura icon-themes/tango include

[Heiko Tietze (via logerrit)]

 bin/gla11y   |1 
 compilerplugins/clang/constantparam.booleans.results |8 
 configure.ac |6 
 cui/inc/strings.hrc  |3 
 cui/source/dialogs/about.cxx |  446 -
 cui/source/factory/dlgfact.cxx   |   19 
 cui/source/factory/dlgfact.hxx   |   19 
 cui/source/inc/about.hxx |   28 
 cui/uiconfig/ui/aboutdialog.ui   |  205 
 dev/null |binary
 icon-themes/colibre/brand/flat_logo.svg  | 1188 +++
 icon-themes/colibre/brand/shell/about.svg| 6417 ++-
 icon-themes/colibre/brand/shell/logo.svg |  271 
 icon-themes/colibre/brand/shell/logo_inverted.svg|  271 
 include/sfx2/sfxdlg.hxx  |1 
 include/vcl/abstdlg.hxx  |   10 
 include/vcl/weld.hxx |3 
 sc/qa/uitest/calc_tests7/tdf106667.py|2 
 sfx2/inc/bitmaps.hlst|1 
 sfx2/inc/recentdocsview.hxx  |2 
 sfx2/source/appl/appmisc.cxx |   31 
 sfx2/source/appl/appserv.cxx |2 
 sfx2/source/control/recentdocsview.cxx   |   11 
 solenv/sanitizers/ui/cui.suppr   |5 
 sw/qa/uitest/writer_tests5/about_test.py |2 
 uitest/calc_tests/about_test.py  |2 
 uitest/demo_ui/hierarchy.py  |2 
 vcl/inc/salvtables.hxx   |3 
 vcl/source/app/salvtables.cxx|   57 
 vcl/source/window/builder.cxx|4 
 vcl/unx/gtk3/gtk3gtkinst.cxx |  124 
 31 files changed, 8609 insertions(+), 535 deletions(-)

New commits:
commit 9b1c9ac6edcdeae431d6104c586ca7feffbb6483
Author: Heiko Tietze 
AuthorDate: Wed Apr 8 12:58:34 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Apr 15 17:35:44 2020 +0200

Related tdf#130778: New About dialog

More flexible dialog
logo & about images as SVGs

Change-Id: Icefa035893e241a7dee6aa28236e6b89b38477de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91908
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/bin/gla11y b/bin/gla11y
index 1ae67b173959..b1d98c7c0fb8 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -47,7 +47,6 @@ widgets_toplevel = [
 'GtkOffscreenWindow',
 'GtkApplicationWindow',
 'GtkDialog',
-'GtkAboutDialog',
 'GtkFileChooserDialog',
 'GtkColorChooserDialog',
 'GtkFontChooserDialog',
diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index ec68cb590a62..9c78e715448a 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -1778,10 +1778,6 @@ include/vcl/weld.hxx:2102
 class std::unique_ptr > weld::Builder::weld_dialog(const class rtl::OString &,_Bool)
 _Bool bTakeOwnership
 1
-include/vcl/weld.hxx:2103
-class std::unique_ptr > 
weld::Builder::weld_about_dialog(const class rtl::OString &,_Bool)
-_Bool bTakeOwnership
-1
 include/vcl/weld.hxx:2106
 class std::unique_ptr > 
weld::Builder::weld_assistant(const class rtl::OString &,_Bool)
 _Bool bTakeOwnership
@@ -4210,10 +4206,6 @@ vcl/qa/cppunit/BitmapTest.cxx:68
 void assertColorsAreSimilar(int,const class 
std::__cxx11::basic_string, class 
std::allocator > &,const class BitmapColor &,const class BitmapColor &)
 int maxDifference
 1
-vcl/source/app/salvtables.cxx:1624
-void (anonymous 
namespace)::SalInstanceAboutDialog::SalInstanceAboutDialog(class 
vcl::AboutDialog *,class SalInstanceBuilder *,_Bool)
-_Bool bTakeOwnership
-0
 vcl/source/app/salvtables.cxx:1694
 void (anonymous 
namespace)::SalInstanceAssistant::SalInstanceAssistant(class vcl::RoadmapWizard 
*,class SalInstanceBuilder *,_Bool)
 _Bool bTakeOwnership
diff --git a/configure.ac b/configure.ac
index b8b40177e98e..f1539c699b1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2186,7 +2186,7 @@ AC_ARG_WITH(branding,
 AS_HELP_STRING([--with-branding=/path/to/images],
 [Use given path to retrieve branding images set.])
 [
-  Search for intro.png about.svg and flat_logo.svg.
+  Search for intro.png about.svg and logo.svg.
   If any is missing, default ones will be used instead.
 
   Search also progress.conf for progress
@@ -12553,8 +12553,8 @@ dnl branding
 dnl ===
 AC_MSG_CHECKING([for alternative branding images directory])
 # initialize m

[Libreoffice-commits] core.git: icon-themes/colibre instsetoo_native/CustomTarget_setup.mk

[Heiko Tietze (via logerrit)]

 icon-themes/colibre/brand/intro.png |binary
 icon-themes/colibre/brand_dev/intro.png |binary
 instsetoo_native/CustomTarget_setup.mk  |6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0db34d1c5dd7d06435c5a5d58a42da2cbe007006
Author: Heiko Tietze 
AuthorDate: Wed Apr 15 13:27:00 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Apr 15 17:35:28 2020 +0200

Related tdf#130778: New images for splash screen

Taken from the proposal at the BZ ticket; hires missing

Change-Id: I95e19d5acb6c1b580c51e2af8dac272b459cf20c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92263
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/icon-themes/colibre/brand/intro.png 
b/icon-themes/colibre/brand/intro.png
index f60a408353dd..23ead5c5fda1 100644
Binary files a/icon-themes/colibre/brand/intro.png and 
b/icon-themes/colibre/brand/intro.png differ
diff --git a/icon-themes/colibre/brand_dev/intro.png 
b/icon-themes/colibre/brand_dev/intro.png
index 29755ea5268d..db8139e52abf 100644
Binary files a/icon-themes/colibre/brand_dev/intro.png and 
b/icon-themes/colibre/brand_dev/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 9757f435dc91..d9f0d6d51ac4 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -136,11 +136,11 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'NativeProgress=false' \
&& echo 'ProgressBarColor=0,0,0' \
&& echo 'ProgressFrameColor=102,102,102' \
-   && echo 'ProgressPosition=35,153' \
-   && echo 'ProgressSize=444,8' \
+   && echo 'ProgressPosition=30,145' \
+   && echo 'ProgressSize=265,8' \
&& echo 'ProgressPositionHigh=46,212' \
&& echo 'ProgressSizeHigh=617,12' \
-   && echo 'ProgressTextBaseline=145' \
+   && echo 'ProgressTextBaseline=160' \
&& echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |  911 +
 1 file changed, 486 insertions(+), 425 deletions(-)

New commits:
commit ecc95d33e1a0e5f13fbbe655576828ee7dd35b6d
Author: Heiko Tietze 
AuthorDate: Thu Jan 9 11:17:25 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Apr 8 13:09:26 2020 +0200

Resolves tdf#127782 - New Print dialog is too high

Expander added

Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 96b4bf352b1dc43637080719c91eef61fef74bf8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91725

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 215e7d82f686..fc98a18a89a9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -502,7 +502,7 @@
   
 0
 0
-3
+2
   
 
 
@@ -534,7 +534,6 @@
   
 1
 1
-2
   
 
 
@@ -553,7 +552,7 @@
   
 0
 2
-3
+2
   
 
 
@@ -572,191 +571,207 @@
   
 0
 3
-3
-  
-
-
-  
-False
-start
-_From which print:
-True
-printextrabox
-  
-  
-0
-6
-  
-
-
-  
-False
-True
-  
-  
-1
-6
 2
   
 
 
-  
-True
-False
-start
-Paper 
_sides:
-True
-sidesbox
-  
-  
-0
-7
-  
-
-
-  
-True
-False
-True
-
-  Print on one side (simplex)
-  Print on both sides (duplex long edge)
-  Print on both sides (duplex short edge)
-
-  
-  
-1
-7
-2
-  
-
-
-  
-True
-False
-start
-_Number of 
copies:
-True
- 

[Libreoffice-commits] core.git: extras/Gallery_bullets.mk extras/Module_extras.mk extras/Package_gallbullets.mk extras/Package_gallsystem.mk extras/source Repository.mk scp2/source

[Heiko Tietze (via logerrit)]

 Repository.mk |1 
 extras/Gallery_bullets.mk |   39 -
 extras/Module_extras.mk   |2 
 extras/Package_gallbullets.mk |  107 ++
 extras/Package_gallsystem.mk  |3 
 extras/source/gallery/bullets/Bullet01-Circle-DarkRed.svg |1 
 extras/source/gallery/bullets/Bullet02-Circle-Blue.svg|1 
 extras/source/gallery/bullets/Bullet03-Circle-Green.svg   |1 
 extras/source/gallery/bullets/Bullet04-Square-Black.svg   |1 
 extras/source/gallery/bullets/Bullet05-Square-Orange.svg  |1 
 extras/source/gallery/bullets/Bullet06-Square-Purple.svg  |1 
 extras/source/gallery/bullets/Bullet07-Diamond-Blue.svg   |1 
 extras/source/gallery/bullets/Bullet08-Diamond-LightBlue.svg  |1 
 extras/source/gallery/bullets/Bullet09-Diamond-Red.svg|1 
 extras/source/gallery/bullets/Bullet10-Star-Yellow.svg|1 
 extras/source/gallery/bullets/Bullet11-Star-Blue.svg  |1 
 extras/source/gallery/bullets/Bullet12-Triangle-Blue.svg  |1 
 extras/source/gallery/bullets/Bullet13-Triangle-DarkGreen.svg |1 
 extras/source/gallery/bullets/Bullet14-Arrow-Red.svg  |1 
 extras/source/gallery/bullets/Bullet15-Arrow-Blue.svg |1 
 extras/source/gallery/bullets/Bullet16-Box-Blue.svg   |1 
 extras/source/gallery/bullets/Bullet17-Box-Red.svg|1 
 extras/source/gallery/bullets/Bullet18-Asterisk-LightBlue.svg |1 
 extras/source/gallery/bullets/Bullet19-Leaves-Red.svg |1 
 extras/source/gallery/bullets/Bullet20-Target-Blue.svg|1 
 extras/source/gallery/bullets/Bullet21-Arrow-Blue.svg |1 
 extras/source/gallery/bullets/Bullet22-Arrow-DarkBlue.svg |1 
 extras/source/gallery/bullets/Bullet23-Arrow-Brown.svg|1 
 extras/source/gallery/bullets/Bullet24-Flag-Red.svg   |1 
 extras/source/gallery/bullets/Bullet25-Flag-Green.svg |1 
 extras/source/gallery/bullets/Bullet26-X-Red.svg  |1 
 extras/source/gallery/bullets/Bullet27-X-Black.svg|1 
 extras/source/gallery/bullets/Bullet28-Checkmark-Green.svg|1 
 extras/source/gallery/bullets/Bullet29-Checkmark-Blue.svg |1 
 extras/source/gallery/bullets/Bullet30-Square-DarkRed.svg |1 
 extras/source/gallery/bullets/ball.svg|  386 --
 extras/source/gallery/bullets/blkpearl.gif|binary
 extras/source/gallery/bullets/bluarrow.gif|binary
 extras/source/gallery/bullets/bluball.gif |binary
 extras/source/gallery/bullets/bludiamd.gif|binary
 extras/source/gallery/bullets/bluered.gif |binary
 extras/source/gallery/bullets/blusqare.gif|binary
 extras/source/gallery/bullets/blustar.gif |binary
 extras/source/gallery/bullets/book.svg|  322 
 extras/source/gallery/bullets/bullets.str |2 
 extras/source/gallery/bullets/check.svg   |1 
 extras/source/gallery/bullets/checkbox.svg|2 
 extras/source/gallery/bullets/circle-gray.svg |1 
 extras/source/gallery/bullets/circle-green.svg|1 
 extras/source/gallery/bullets/circle-red.svg  |1 
 extras/source/gallery/bullets/circle-yellow.svg   |1 
 extras/source/gallery/bullets/coffee_1.gif|binary
 extras/source/gallery/bullets/coffee_2.gif|binary
 extras/source/gallery/bullets/coffee_3.gif|binary
 extras/source/gallery/bullets/coffee_4.gif|binary
 extras/source/gallery/bullets/coffee_5.gif|binary
 extras/source/gallery/bullets/con-blue.gif|binary
 extras/source/gallery/bullets/con-cyan.gif|binary
 extras/source/gallery/bullets/con-green.gif   |binary
 extras/source/gallery/bullets/con-lilac.gif   |binary
 extras/source/gallery/bullets/con-oran.gif|binary
 extras/source/gallery/bullets/con-pink.gif|binary
 extras/source/gallery/bullets/con-red.gif |binary
 extras/source/gallery/bullets/con-yellow.gif  |binary
 extras/source/gallery/bullets/corner_1.gif|binary
 extras/source/gallery/bullets/corner_2.gif|binary
 extras/source/gallery/bullets/corner_3.gif|binary
 extras/source/gallery/bullets/corner_4.gif|binary
 extras/source/gallery/bullets/cross.svg   |1 
 extras/source/gallery/bullets/darkball.gif|binary
 extras/

[Libreoffice-commits] core.git: extras/Package_palettes.mk extras/source

[Heiko Tietze (via logerrit)]

 extras/Package_palettes.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 730c5317a968f4e99d4d2d28499b1d6204a07285
Author: Heiko Tietze 
AuthorDate: Thu Apr 2 16:58:35 2020 +0200
Commit: Miklos Vajna 
CommitDate: Fri Apr 3 10:03:27 2020 +0200

Rename mso-highlight color palette to customizatio

Change-Id: I00fde624d8e654b1dcd10bd163f219fa73a49e91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91584
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index ed911286593b..19b07555919c 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -19,7 +19,7 @@ $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,
libreoffice.soc \
material.soc \
modern.sog \
-   mso-highlight.soc \
+   compatibility.soc \
standard.sob \
standard.soc \
standard.sod \
diff --git a/extras/source/palettes/mso-highlight.soc 
b/extras/source/palettes/compatibility.soc
similarity index 100%
rename from extras/source/palettes/mso-highlight.soc
rename to extras/source/palettes/compatibility.soc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/Gallery_bpmn.mk extras/Module_extras.mk extras/source scp2/source

[Heiko Tietze (via logerrit)]

 dev/null  |binary
 extras/Gallery_bpmn.mk|   18 --
 extras/Module_extras.mk   |1 -
 extras/source/gallery/bpmn/bpmn.str   |2 --
 extras/source/gallery/share/gallery_names.ulf |3 ---
 scp2/source/ooo/file_extra_ooo.scp|1 -
 6 files changed, 25 deletions(-)

New commits:
commit dc26debf57e37a91f041e1972ee8027c49085e5f
Author: Heiko Tietze 
AuthorDate: Fri Mar 13 18:11:35 2020 +0100
Commit: Heiko Tietze 
CommitDate: Sat Mar 14 10:22:02 2020 +0100

Revert "Resolves tdf#99675: Add BPMN images to the gallery"

This reverts commit 2e74fdc559eb1b7bab1a6661203400017f93b234.

Reason for revert: Does not work

Change-Id: I8014d2d046385a795777208330e2a6af1b9f5222
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90395
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/extras/Gallery_bpmn.mk b/extras/Gallery_bpmn.mk
deleted file mode 100644
index 3da98d178e58..
--- a/extras/Gallery_bpmn.mk
+++ /dev/null
@@ -1,18 +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_Gallery_Gallery,bpmn,extras/source/gallery/bpmn))
-
-$(eval $(call gb_Gallery_add_files,bpmn,$(LIBO_SHARE_FOLDER)/gallery/bpmn,\
-   extras/source/gallery/bpmn/bpmn.sdg \
-   extras/source/gallery/bpmn/bpmn.sdv \
-   extras/source/gallery/bpmn/bpmn.thm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 656d93bb93fd..534fb2814de2 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_Module_add_l10n_targets,extras,\
 ifneq ($(WITH_GALLERY_BUILD),)
 $(eval $(call gb_Module_add_targets,extras,\
Gallery_arrows \
-   Gallery_bpmn \
Gallery_backgrounds \
Gallery_computers \
Gallery_diagrams \
diff --git a/extras/source/gallery/bpmn/bpmn.sdg 
b/extras/source/gallery/bpmn/bpmn.sdg
deleted file mode 100644
index b937c02f3d9d..
Binary files a/extras/source/gallery/bpmn/bpmn.sdg and /dev/null differ
diff --git a/extras/source/gallery/bpmn/bpmn.sdv 
b/extras/source/gallery/bpmn/bpmn.sdv
deleted file mode 100644
index 483ef14af3db..
Binary files a/extras/source/gallery/bpmn/bpmn.sdv and /dev/null differ
diff --git a/extras/source/gallery/bpmn/bpmn.str 
b/extras/source/gallery/bpmn/bpmn.str
deleted file mode 100644
index bae770e142d2..
--- a/extras/source/gallery/bpmn/bpmn.str
+++ /dev/null
@@ -1,2 +0,0 @@
-# Translated by desktop-translate and ulfex
-name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/bpmn/bpmn.thm 
b/extras/source/gallery/bpmn/bpmn.thm
deleted file mode 100644
index b25ac6ea9472..
Binary files a/extras/source/gallery/bpmn/bpmn.thm and /dev/null differ
diff --git a/extras/source/gallery/share/gallery_names.ulf 
b/extras/source/gallery/share/gallery_names.ulf
index d9ca45ba6d97..0d1da8dbec8a 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -10,9 +10,6 @@
 [arrows]
 en-US = "Arrows"
 
-[bpmn]
-en-US = "BPMN"
-
 [backgrounds]
 en-US = "Backgrounds"
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 978852eacf50..b752d79d283f 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -39,7 +39,6 @@ End
 #if defined (WITH_GALLERY_BUILD)
 
 GALLERY_FILELIST(arrows)
-GALLERY_FILELIST(bpmn)
 GALLERY_FILELIST(computers)
 GALLERY_FILELIST(diagrams)
 GALLERY_FILELIST(education)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-2' - vcl/source

[Heiko Tietze (via logerrit)]

 vcl/source/window/printdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a87ba7743db3d11740111f2f41ad76d81256dfae
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 11:58:02 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Mar 11 10:28:07 2020 +0100

Resolves tdf#127782 - New Print dialog is too high

Amends Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb

Change-Id: Ic669332245ad9c5ee6366765da8a5bc632dd159c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89423
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit b268715912d4c2034b9b9d38e75446bef7bbb11f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89921
(cherry picked from commit 9c3171d4209f8eceb0152d7d9f70456c5813914e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89922
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Xisco Faulí 
Tested-by: Heiko Tietze 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b42a1ce41213..7d340559806a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -147,8 +147,8 @@ void PrintDialog::PrintPreviewWindow::Resize()
 
 void PrintDialog::PrintPreviewWindow::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 {
-pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 55,
-   pDrawingArea->get_text_height() * 40);
+pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 45,
+   pDrawingArea->get_text_height() * 30);
 CustomWidgetController::SetDrawingArea(pDrawingArea);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Heiko Tietze (via logerrit)]

 vcl/source/window/printdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c3171d4209f8eceb0152d7d9f70456c5813914e
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 11:58:02 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Mar 4 21:17:58 2020 +0100

Resolves tdf#127782 - New Print dialog is too high

Amends Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb

Change-Id: Ic669332245ad9c5ee6366765da8a5bc632dd159c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89423
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit b268715912d4c2034b9b9d38e75446bef7bbb11f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89921

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b42a1ce41213..7d340559806a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -147,8 +147,8 @@ void PrintDialog::PrintPreviewWindow::Resize()
 
 void PrintDialog::PrintPreviewWindow::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 {
-pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 55,
-   pDrawingArea->get_text_height() * 40);
+pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 45,
+   pDrawingArea->get_text_height() * 30);
 CustomWidgetController::SetDrawingArea(pDrawingArea);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source

[Heiko Tietze (via logerrit)]

 sc/source/ui/inc/tabview.hxx  |3 +--
 sc/source/ui/view/tabview.cxx |   35 ---
 2 files changed, 5 insertions(+), 33 deletions(-)

New commits:
commit bc4f1869e6b8c9e500483e4210cfc004bbd8d8a2
Author: Heiko Tietze 
AuthorDate: Mon Feb 24 17:15:11 2020 +0100
Commit: Heiko Tietze 
CommitDate: Thu Feb 27 13:50:30 2020 +0100

Resolves tdf#127508 - Flat table header in Calc

Amends 67fd62b3edc86c2891f279b25cf9919c4ca1 with
flat corner button

Change-Id: Ia26aff0844069dd435cf4edd7524c19f5f0f22ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89365
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit d8c7864407249fd1ed69713dfdf4fa533a9efb0b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89575
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 80888efebccb..b4af1dd213b1 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -71,14 +71,13 @@ class ScCornerButton : public vcl::Window
 {
 private:
 ScViewData* const pViewData;
-bool constbAdd;
 
 protected:
 virtual voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect ) override;
 virtual voidResize() override;
 virtual voidMouseButtonDown( const MouseEvent& rMEvt ) override;
 public:
-ScCornerButton( vcl::Window* pParent, ScViewData* pData, 
bool bAdditional );
+ScCornerButton( vcl::Window* pParent, ScViewData* pData );
 virtual ~ScCornerButton() override;
 
 virtual voidStateChanged( StateChangedType nType ) override;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 53e03e61de07..f45a575ec461 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -68,10 +68,9 @@ using namespace ::com::sun::star;
 
 //  Corner-Button
 
-ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool 
bAdditional ) :
+ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData ) :
 Window( pParent, WinBits( 0 ) ),
-pViewData( pData ),
-bAdd( bAdditional )
+pViewData( pData )
 {
 EnableRTL( false );
 }
@@ -94,32 +93,6 @@ void ScCornerButton::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rect
 bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( 
pViewData->GetTabNo() );
 long nDarkX = bLayoutRTL ? 0 : nPosX;
 
-if (!bAdd)
-{
-// match the shaded look of column/row headers
-
-Color aFace(rStyleSettings.GetFaceColor());
-Color aWhite(COL_WHITE);
-Color aCenter(aFace);
-aCenter.Merge(aWhite, 0xd0);  // lighten up a bit
-Color aOuter(aFace );
-aOuter.Merge(aWhite, 0xa0);   // lighten up more
-
-long nCenterX = (aSize.Width() / 2) - 1;
-long nCenterY = (aSize.Height() / 2) - 1;
-
-rRenderContext.SetLineColor();
-rRenderContext.SetFillColor(aCenter);
-rRenderContext.DrawRect(tools::Rectangle(nCenterX, nCenterY, nCenterX, 
nPosY));
-rRenderContext.DrawRect(tools::Rectangle(nCenterX, nCenterY, nDarkX, 
nCenterY));
-rRenderContext.SetFillColor(aOuter);
-rRenderContext.DrawRect(tools::Rectangle(0, 0, nPosX, nCenterY - 1));
-if (bLayoutRTL)
-rRenderContext.DrawRect(tools::Rectangle(nCenterX + 1, nCenterY, 
nPosX, nPosY));
-else
-rRenderContext.DrawRect(tools::Rectangle(0, nCenterY, nCenterX - 
1, nPosY));
-}
-
 //  both buttons have the same look now - only dark right/bottom lines
 rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
 rRenderContext.DrawLine(Point(0, nPosY), Point(nPosX, nPosY));
@@ -201,8 +174,8 @@ ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& 
rDocSh, ScTabViewShell*
 aVScrollBottom( VclPtr::Create( pFrameWin, WinBits( WB_VSCROLL 
| WB_DRAG ) ) ),
 aHScrollLeft( VclPtr::Create( pFrameWin, WinBits( WB_HSCROLL | 
WB_DRAG ) ) ),
 aHScrollRight( VclPtr::Create( pFrameWin, WinBits( WB_HSCROLL | 
WB_DRAG ) ) ),
-aCornerButton( VclPtr::Create( pFrameWin, &aViewData, 
false ) ),
-aTopButton( VclPtr::Create( pFrameWin, &aViewData, true ) 
),
+aCornerButton( VclPtr::Create( pFrameWin, &aViewData ) ),
+aTopButton( VclPtr::Create( pFrameWin, &aViewData ) ),
 aScrollBarBox( VclPtr::Create( pFrameWin, WB_SIZEABLE ) ),
 mxInputHintOO(),
 pTimerWindow( nullptr ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/control/recentdocsview.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ff703b87e1f9872aeff36a47ac813390befc5522
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 14:16:22 2020 +0100
Commit: Xisco Faulí 
CommitDate: Wed Feb 26 14:27:34 2020 +0100

Resolves tdf#130742 - Flat ODF in start center

Added fodt,fods,fopd,fodg to typeMatchesExtension

Change-Id: Ife8139af87ecc5af8a5e98c9d9dd7830c3a3231a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89455
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit f4b5b12fbe7eb0260119445ac39a28427fef3ee6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89514
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 414f1236ce9f..61a2f35ac861 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -154,21 +154,21 @@ bool RecentDocsView::typeMatchesExtension(ApplicationType 
type, const OUString &
 {
 bool bRet = false;
 
-if (rExt == "odt" || rExt == "doc" || rExt == "docx" ||
+if (rExt == "odt" || rExt == "fodt" || rExt == "doc" || rExt == "docx" ||
 rExt == "rtf" || rExt == "txt" || rExt == "odm" || rExt == "otm")
 {
 bRet = static_cast(type & ApplicationType::TYPE_WRITER);
 }
-else if (rExt == "ods" || rExt == "xls" || rExt == "xlsx")
+else if (rExt == "ods" || rExt == "fods" || rExt == "xls" || rExt == 
"xlsx")
 {
 bRet = static_cast(type & ApplicationType::TYPE_CALC);
 }
-else if (rExt == "odp" || rExt == "pps" || rExt == "ppt" ||
+else if (rExt == "odp" || rExt == "fodp" || rExt == "pps" || rExt == "ppt" 
||
 rExt == "pptx")
 {
 bRet = static_cast(type & ApplicationType::TYPE_IMPRESS);
 }
-else if (rExt == "odg")
+else if (rExt == "odg" || rExt == "fodg")
 {
 bRet = static_cast(type & ApplicationType::TYPE_DRAW);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/control/recentdocsview.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f4b5b12fbe7eb0260119445ac39a28427fef3ee6
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 14:16:22 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Feb 26 10:18:24 2020 +0100

Resolves tdf#130742 - Flat ODF in start center

Added fodt,fods,fopd,fodg to typeMatchesExtension

Change-Id: Ife8139af87ecc5af8a5e98c9d9dd7830c3a3231a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89455
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index d875c73dda17..e9120d355a01 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -148,21 +148,21 @@ bool RecentDocsView::typeMatchesExtension(ApplicationType 
type, const OUString &
 {
 bool bRet = false;
 
-if (rExt == "odt" || rExt == "doc" || rExt == "docx" ||
+if (rExt == "odt" || rExt == "fodt" || rExt == "doc" || rExt == "docx" ||
 rExt == "rtf" || rExt == "txt" || rExt == "odm" || rExt == "otm")
 {
 bRet = static_cast(type & ApplicationType::TYPE_WRITER);
 }
-else if (rExt == "ods" || rExt == "xls" || rExt == "xlsx")
+else if (rExt == "ods" || rExt == "fods" || rExt == "xls" || rExt == 
"xlsx")
 {
 bRet = static_cast(type & ApplicationType::TYPE_CALC);
 }
-else if (rExt == "odp" || rExt == "pps" || rExt == "ppt" ||
+else if (rExt == "odp" || rExt == "fodp" || rExt == "pps" || rExt == "ppt" 
||
 rExt == "pptx")
 {
 bRet = static_cast(type & ApplicationType::TYPE_IMPRESS);
 }
-else if (rExt == "odg")
+else if (rExt == "odg" || rExt == "fodg")
 {
 bRet = static_cast(type & ApplicationType::TYPE_DRAW);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Heiko Tietze (via logerrit)]

 sc/source/ui/inc/tabview.hxx  |3 +--
 sc/source/ui/view/tabview.cxx |   35 ---
 2 files changed, 5 insertions(+), 33 deletions(-)

New commits:
commit d8c7864407249fd1ed69713dfdf4fa533a9efb0b
Author: Heiko Tietze 
AuthorDate: Mon Feb 24 17:15:11 2020 +0100
Commit: Mike Kaganski 
CommitDate: Wed Feb 26 09:33:53 2020 +0100

Resolves tdf#127508 - Flat table header in Calc

Amends 67fd62b3edc86c2891f279b25cf9919c4ca1 with
flat corner button

Change-Id: Ia26aff0844069dd435cf4edd7524c19f5f0f22ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89365
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index dc65f970d78e..8a8d3e9125cc 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -71,14 +71,13 @@ class ScCornerButton : public vcl::Window
 {
 private:
 ScViewData* const pViewData;
-bool constbAdd;
 
 protected:
 virtual voidPaint( vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect ) override;
 virtual voidResize() override;
 virtual voidMouseButtonDown( const MouseEvent& rMEvt ) override;
 public:
-ScCornerButton( vcl::Window* pParent, ScViewData* pData, 
bool bAdditional );
+ScCornerButton( vcl::Window* pParent, ScViewData* pData );
 virtual ~ScCornerButton() override;
 
 virtual voidStateChanged( StateChangedType nType ) override;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 53e03e61de07..f45a575ec461 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -68,10 +68,9 @@ using namespace ::com::sun::star;
 
 //  Corner-Button
 
-ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool 
bAdditional ) :
+ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData ) :
 Window( pParent, WinBits( 0 ) ),
-pViewData( pData ),
-bAdd( bAdditional )
+pViewData( pData )
 {
 EnableRTL( false );
 }
@@ -94,32 +93,6 @@ void ScCornerButton::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rect
 bool bLayoutRTL = pViewData->GetDocument()->IsLayoutRTL( 
pViewData->GetTabNo() );
 long nDarkX = bLayoutRTL ? 0 : nPosX;
 
-if (!bAdd)
-{
-// match the shaded look of column/row headers
-
-Color aFace(rStyleSettings.GetFaceColor());
-Color aWhite(COL_WHITE);
-Color aCenter(aFace);
-aCenter.Merge(aWhite, 0xd0);  // lighten up a bit
-Color aOuter(aFace );
-aOuter.Merge(aWhite, 0xa0);   // lighten up more
-
-long nCenterX = (aSize.Width() / 2) - 1;
-long nCenterY = (aSize.Height() / 2) - 1;
-
-rRenderContext.SetLineColor();
-rRenderContext.SetFillColor(aCenter);
-rRenderContext.DrawRect(tools::Rectangle(nCenterX, nCenterY, nCenterX, 
nPosY));
-rRenderContext.DrawRect(tools::Rectangle(nCenterX, nCenterY, nDarkX, 
nCenterY));
-rRenderContext.SetFillColor(aOuter);
-rRenderContext.DrawRect(tools::Rectangle(0, 0, nPosX, nCenterY - 1));
-if (bLayoutRTL)
-rRenderContext.DrawRect(tools::Rectangle(nCenterX + 1, nCenterY, 
nPosX, nPosY));
-else
-rRenderContext.DrawRect(tools::Rectangle(0, nCenterY, nCenterX - 
1, nPosY));
-}
-
 //  both buttons have the same look now - only dark right/bottom lines
 rRenderContext.SetLineColor(rStyleSettings.GetDarkShadowColor());
 rRenderContext.DrawLine(Point(0, nPosY), Point(nPosX, nPosY));
@@ -201,8 +174,8 @@ ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& 
rDocSh, ScTabViewShell*
 aVScrollBottom( VclPtr::Create( pFrameWin, WinBits( WB_VSCROLL 
| WB_DRAG ) ) ),
 aHScrollLeft( VclPtr::Create( pFrameWin, WinBits( WB_HSCROLL | 
WB_DRAG ) ) ),
 aHScrollRight( VclPtr::Create( pFrameWin, WinBits( WB_HSCROLL | 
WB_DRAG ) ) ),
-aCornerButton( VclPtr::Create( pFrameWin, &aViewData, 
false ) ),
-aTopButton( VclPtr::Create( pFrameWin, &aViewData, true ) 
),
+aCornerButton( VclPtr::Create( pFrameWin, &aViewData ) ),
+aTopButton( VclPtr::Create( pFrameWin, &aViewData ) ),
 aScrollBarBox( VclPtr::Create( pFrameWin, WB_SIZEABLE ) ),
 mxInputHintOO(),
 pTimerWindow( nullptr ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Heiko Tietze (via logerrit)]

 vcl/source/window/printdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b268715912d4c2034b9b9d38e75446bef7bbb11f
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 11:58:02 2020 +0100
Commit: Heiko Tietze 
CommitDate: Tue Feb 25 16:24:08 2020 +0100

Resolves tdf#127782 - New Print dialog is too high

Amends Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb

Change-Id: Ic669332245ad9c5ee6366765da8a5bc632dd159c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89423
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index ad54af15ce7e..614b8d4eaf13 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -147,8 +147,8 @@ void PrintDialog::PrintPreviewWindow::Resize()
 
 void PrintDialog::PrintPreviewWindow::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 {
-pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 55,
-   pDrawingArea->get_text_height() * 40);
+pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() 
* 45,
+   pDrawingArea->get_text_height() * 30);
 CustomWidgetController::SetDrawingArea(pDrawingArea);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/effectspage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7448b69b4aaa982940e49c5ace9842f07dd81938
Author: Heiko Tietze 
AuthorDate: Wed Feb 19 13:38:02 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Feb 19 19:58:55 2020 +0100

Proper alignment for label

Amends I321c7e0e3cb2d67a07724523c885d50577a116a5

Change-Id: Ib89bddf36c81dbfaa4c6562a342cf3f8a423eaa5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89017
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index e7e5ffbca830..401d7f2fa00d 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -591,6 +591,7 @@
 _Transparency:
 True
 fonttransparencymtr
+0
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/svx sd/inc sd/source

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/dlgname.cxx |   13 ++--
 cui/source/factory/dlgfact.cxx |   14 +
 cui/source/factory/dlgfact.hxx |3 ++
 cui/source/inc/dlgname.hxx |7 ++
 include/svx/svxdlg.hxx |1 
 sd/inc/strings.hrc |1 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |6 +
 sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx |1 
 8 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit a4f5c8d38e307bb37f08e8f6ef3cfc9ffac84304
Author: Heiko Tietze 
AuthorDate: Fri Dec 13 12:01:34 2019 +0100
Commit: Heiko Tietze 
CommitDate: Mon Feb 17 09:31:45 2020 +0100

Resolves tdf#129032 - Missing warning when renaming page

Edit field has type normal or error now
Edit field and okay button return feedback per tooltip

Change-Id: Ib2caf3280227cb00af25889ed111503745b471dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85101
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 133f1753fecd..d8044366b470 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -41,10 +41,19 @@ SvxNameDialog::SvxNameDialog(weld::Window* pParent, const 
OUString& rName, const
 IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl, weld::Entry&, void)
 {
 // Do not allow empty names
+bool bEnable;
 if (m_aCheckNameHdl.IsSet())
-m_xBtnOK->set_sensitive(!m_xEdtName->get_text().isEmpty() && 
m_aCheckNameHdl.Call(*this));
+bEnable = !m_xEdtName->get_text().isEmpty() && 
m_aCheckNameHdl.Call(*this);
 else
-m_xBtnOK->set_sensitive(!m_xEdtName->get_text().isEmpty());
+bEnable = !m_xEdtName->get_text().isEmpty();
+m_xBtnOK->set_sensitive(bEnable);
+// tdf#129032: feedback on reason to disabled controls
+m_xEdtName->set_message_type(bEnable ? weld::EntryMessageType::Normal : 
weld::EntryMessageType::Error);
+OUString rTip = "";
+if (!bEnable && m_aCheckNameTooltipHdl.IsSet())
+   rTip = m_aCheckNameTooltipHdl.Call(*this);
+m_xBtnOK->set_tooltip_text(rTip);
+m_xEdtName->set_tooltip_text(rTip);
 }
 
 // #i68101#
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index d924938ad1d4..600882742427 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -740,6 +740,15 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const 
LinkSetCheckNameHdl( Link(), 
bCheckImmediately );
 }
 
+void AbstractSvxNameDialog_Impl::SetCheckNameTooltipHdl( const 
Link& rLink)
+{
+aCheckNameTooltipHdl = rLink;
+if( rLink.IsSet() )
+m_xDlg->SetCheckNameTooltipHdl( LINK(this, AbstractSvxNameDialog_Impl, 
CheckNameTooltipHdl));
+else
+m_xDlg->SetCheckNameTooltipHdl( Link());
+}
+
 void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& rHelpId)
 {
 m_xDlg->SetEditHelpId(rHelpId);
@@ -760,6 +769,11 @@ IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameHdl, 
SvxNameDialog&, bool)
 return aCheckNameHdl.Call(*this);
 }
 
+IMPL_LINK_NOARG(AbstractSvxNameDialog_Impl, CheckNameTooltipHdl, 
SvxNameDialog&, OUString)
+{
+return aCheckNameTooltipHdl.Call(*this);
+}
+
 void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName)
 {
 rName = m_xDlg->GetName();
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 9c60124748a1..0181e293f49d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -446,6 +446,7 @@ public:
 virtual short Execute() override;
 virtual voidGetName( OUString& rName ) override ;
 virtual voidSetCheckNameHdl( const Link& 
rLink, bool bCheckImmediately = false ) override ;
+virtual voidSetCheckNameTooltipHdl( const Link& rLink ) override ;
 virtual voidSetEditHelpId(const OString&) override ;
 //from class Window
 virtual voidSetHelpId( const OString& ) override ;
@@ -453,7 +454,9 @@ public:
 private:
 std::unique_ptr m_xDlg;
 Link aCheckNameHdl;
+Link aCheckNameTooltipHdl;
 DECL_LINK(CheckNameHdl, SvxNameDialog&, bool);
+DECL_LINK(CheckNameTooltipHdl, SvxNameDialog&, OUString);
 };
 
 class SvxObjectNameDialog;
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index a1e90f32db71..8fd754990885 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -30,6 +30,7 @@ private:
 std::unique_ptr m_xBtnOK;
 
 Link m_aCheckNameHdl;
+Link m_aCheckNameTooltipHdl;
 
 DECL_LINK(ModifyHdl, weld::Entry&, void);
 
@@ -60,6 +61,12 @@ public:
 m_xBtnOK->set_sensitive(rLink.Call(*this));
 }
 
+void SetCheckNameTooltipHdl(const Link& rLink)
+{
+m_aCheckNameTooltipHdl = rLink;
+m_xBtnOK->s

[Libreoffice-commits] core.git: sw/source

[Heiko Tietze (via logerrit)]

 sw/source/ui/misc/docfnote.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2b3c96a03f2e3c12148ec00c93f06e093d384db9
Author: Heiko Tietze 
AuthorDate: Mon Jan 13 11:09:58 2020 +0100
Commit: Heiko Tietze 
CommitDate: Tue Jan 14 09:44:31 2020 +0100

Related tdf#129836 - Alphabetize styles in the footnotes/endnotes dialog

Page and paragraph dropdowns were missing
in Ie9bc4f63412dabd6032f0a9b7225384823f2f39a

Change-Id: Ied25eeb1360718315190104213172da594e4b05c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/8
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 9542740f5979..a4a101c77535 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -171,6 +171,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
 m_xParaTemplBox->append_text(pStyle->GetName());
 pStyle = pStyleSheetPool->Next();
 }
+m_xParaTemplBox->make_sorted();
 
 OUString sStr;
 SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(bEndNote ? 
RES_POOLCOLL_ENDNOTE
@@ -205,6 +206,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
 if (m_xPageTemplBox->find_text(rPageDesc.GetName()) == -1)
 m_xPageTemplBox->append_text(rPageDesc.GetName());
 }
+m_xPageTemplBox->make_sorted();
 
 
m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*pSh->GetDoc())->GetName());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |  911 +
 1 file changed, 486 insertions(+), 425 deletions(-)

New commits:
commit 96b4bf352b1dc43637080719c91eef61fef74bf8
Author: Heiko Tietze 
AuthorDate: Thu Jan 9 11:17:25 2020 +0100
Commit: Heiko Tietze 
CommitDate: Tue Jan 14 09:42:57 2020 +0100

Resolves tdf#127782 - New Print dialog is too high

Expander added

Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 215e7d82f686..fc98a18a89a9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -502,7 +502,7 @@
   
 0
 0
-3
+2
   
 
 
@@ -534,7 +534,6 @@
   
 1
 1
-2
   
 
 
@@ -553,7 +552,7 @@
   
 0
 2
-3
+2
   
 
 
@@ -572,191 +571,207 @@
   
 0
 3
-3
-  
-
-
-  
-False
-start
-_From which print:
-True
-printextrabox
-  
-  
-0
-6
-  
-
-
-  
-False
-True
-  
-  
-1
-6
 2
   
 
 
-  
-True
-False
-start
-Paper 
_sides:
-True
-sidesbox
-  
-  
-0
-7
-  
-
-
-  
-True
-False
-True
-
-  Print on one side (simplex)
-  Print on both sides (duplex long edge)
-  Print on both sides (duplex short edge)
-
-  
-  
-1
-7
-2
-  
-
-
-  
-True
-False
-start
-_Number of 
copies:
-True
-copycount
-  
-  
- 

[Libreoffice-commits] core.git: sw/source

[Heiko Tietze (via logerrit)]

 sw/source/ui/misc/docfnote.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 17747ef473d71dc3aa62242f4ddb5a94aa0da983
Author: Heiko Tietze 
AuthorDate: Thu Jan 9 15:22:23 2020 +0100
Commit: Heiko Tietze 
CommitDate: Thu Jan 9 16:19:45 2020 +0100

Resolves tdf#129836 - Alphabetize styles in the footnotes/endnotes dialog

List is sorted now

Change-Id: Ie9bc4f63412dabd6032f0a9b7225384823f2f39a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86490
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 0265fb6fef9d..9542740f5979 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -250,10 +250,10 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
 m_xFootnoteCharTextTemplBox->clear();
 m_xFootnoteCharAnchorTemplBox->clear();
 ::FillCharStyleListBox(*m_xFootnoteCharTextTemplBox,
-pSh->GetView().GetDocShell());
+pSh->GetView().GetDocShell(), true);
 
 ::FillCharStyleListBox(*m_xFootnoteCharAnchorTemplBox,
-pSh->GetView().GetDocShell());
+pSh->GetView().GetDocShell(), true);
 }
 
 // Handler behind the button to collect the footnote at the page. In this case
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/optviewpage.ui |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit f2d54bb55d23d000d2c69860cb145ae379e1ea10
Author: Heiko Tietze 
AuthorDate: Mon Jan 6 13:48:14 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Jan 8 17:30:51 2020 +0100

Resolves tdf#129622 - Layout problem in Options-LibreOffice-View

horizontal fill set for the questionable controls

Change-Id: Iab194709ec3ad4881ace36a605ebb4a0d37fe8a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86275
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit beed7183ac6323eb052e7c586d6a807fcb32eb1f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86427

diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 188a3f9e2d09..db59ad52b4ba 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -269,6 +269,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -298,6 +299,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -327,6 +329,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -719,11 +722,4 @@
   
 
   
-  
-10
-90
-75
-1
-10
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source sw/uiconfig

[Heiko Tietze (via logerrit)]

 sw/source/ui/config/optpage.cxx   |3 ---
 sw/source/uibase/config/cfgitems.cxx  |4 
 sw/source/uibase/inc/cfgitems.hxx |1 -
 sw/source/uibase/inc/optpage.hxx  |1 -
 sw/uiconfig/swriter/ui/viewoptionspage.ui |   21 +++--
 5 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit 468a740f0fe09f8939368eca3067b4101c84c057
Author: Heiko Tietze 
AuthorDate: Tue Jan 7 14:55:14 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Jan 8 10:06:58 2020 +0100

Resolves tdf#129793 - Remove "Field codes" option

var m_xFieldNameCB, elem m_bFieldName, ui fieldcode removed

Change-Id: I6711f9b8c4f84d6ef19bc295243df0341f8c4f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86350
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 7f601ceabc8f..4f1a0c3bbf9c 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -105,7 +105,6 @@ SwContentOptPage::SwContentOptPage(weld::Container* pPage, 
weld::DialogControlle
 , m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
 , m_xTableCB(m_xBuilder->weld_check_button("tables"))
 , m_xDrwCB(m_xBuilder->weld_check_button("drawings"))
-, m_xFieldNameCB(m_xBuilder->weld_check_button("fieldcodes"))
 , m_xPostItCB(m_xBuilder->weld_check_button("comments"))
 , m_xSettingsFrame(m_xBuilder->weld_frame("settingsframe"))
 , m_xSettingsLabel(m_xBuilder->weld_label("settingslabel"))
@@ -205,7 +204,6 @@ void SwContentOptPage::Reset(const SfxItemSet* rSet)
 m_xTableCB->set_active(pElemAttr->m_bTable);
 m_xGrfCB->set_active(pElemAttr->m_bGraphic);
 m_xDrwCB->set_active(pElemAttr->m_bDrawing);
-m_xFieldNameCB->set_active(pElemAttr->m_bFieldName);
 m_xPostItCB->set_active(pElemAttr->m_bNotes);
 m_xCrossCB->set_active(pElemAttr->m_bCrosshair);
 m_xVRulerCBox->set_active(pElemAttr->m_bVertRuler);
@@ -230,7 +228,6 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
 aElem.m_bTable= m_xTableCB->get_active();
 aElem.m_bGraphic  = m_xGrfCB->get_active();
 aElem.m_bDrawing  = m_xDrwCB->get_active();
-aElem.m_bFieldName= m_xFieldNameCB->get_active();
 aElem.m_bNotes= m_xPostItCB->get_active();
 aElem.m_bCrosshair= m_xCrossCB->get_active();
 aElem.m_bVertRuler= m_xVRulerCBox->get_active();
diff --git a/sw/source/uibase/config/cfgitems.cxx 
b/sw/source/uibase/config/cfgitems.cxx
index 688216d4130e..5f283f520d44 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -89,7 +89,6 @@ SwElemItem::SwElemItem() :
 m_bTable  =
 m_bGraphic=
 m_bDrawing=
-m_bFieldName  =
 m_bNotes  = false;
 m_bShowInlineTooltips = true;
 m_bFieldHiddenText =
@@ -106,7 +105,6 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt) :
 m_bTable  = rVOpt.IsTable();
 m_bGraphic= rVOpt.IsGraphic();
 m_bDrawing= rVOpt.IsDraw() && rVOpt.IsControl();
-m_bFieldName  = rVOpt.IsFieldName();
 m_bNotes  = rVOpt.IsPostIts();
 m_bShowInlineTooltips = rVOpt.IsShowInlineTooltips();
 m_bFieldHiddenText = rVOpt.IsShowHiddenField();
@@ -131,7 +129,6 @@ bool SwElemItem::operator==( const SfxPoolItem& rAttr ) 
const
 m_bTable== rItem.m_bTable  &&
 m_bGraphic  == rItem.m_bGraphic&&
 m_bDrawing  == rItem.m_bDrawing&&
-m_bFieldName== rItem.m_bFieldName  &&
 m_bNotes== rItem.m_bNotes  &&
 m_bShowInlineTooltips   == rItem.m_bShowInlineTooltips &&
 m_bFieldHiddenText == rItem.m_bFieldHiddenText &&
@@ -148,7 +145,6 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
 rVOpt.SetGraphic(m_bGraphic   );
 rVOpt.SetDraw   (m_bDrawing   );
 rVOpt.SetControl(m_bDrawing   );
-rVOpt.SetFieldName  (m_bFieldName );
 rVOpt.SetPostIts(m_bNotes );
 rVOpt.SetShowInlineTooltips( m_bShowInlineTooltips );
 rVOpt.SetShowHiddenField(m_bFieldHiddenText );
diff --git a/sw/source/uibase/inc/cfgitems.hxx 
b/sw/source/uibase/inc/cfgitems.hxx
index 40f21ff6e98d..a800704e679f 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -74,7 +74,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
 bool m_bTable :1;
 bool m_bGraphic   :1;
 bool m_bDrawing   :1;
-bool m_bFieldName :1;
 bool m_bNotes :1;
 bool m_bShowInlineTooltips :

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/optviewpage.ui |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit beed7183ac6323eb052e7c586d6a807fcb32eb1f
Author: Heiko Tietze 
AuthorDate: Mon Jan 6 13:48:14 2020 +0100
Commit: Heiko Tietze 
CommitDate: Mon Jan 6 15:01:54 2020 +0100

Resolves tdf#129622 - Layout problem in Options-LibreOffice-View

horizontal fill set for the questionable controls

Change-Id: Iab194709ec3ad4881ace36a605ebb4a0d37fe8a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86275
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index f6c260351f7c..23fd4c4ee63e 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -269,6 +269,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -298,6 +299,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -327,6 +329,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -775,11 +778,4 @@
   
 
   
-  
-10
-90
-75
-1
-10
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/hyperlinkinternetpage.ui |   82 +--
 1 file changed, 47 insertions(+), 35 deletions(-)

New commits:
commit 04a28f1c3c657338fefd61ea926357d3fad23325
Author: Heiko Tietze 
AuthorDate: Fri Dec 13 09:51:44 2019 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 13 10:58:32 2019 +0100

Resolves tdf#129295 - Hyperlink Text below URL

Added also an a11y label for the protocol web/ftp

Change-Id: I962de691156386e86707fdbd5a4198ca4bf45929
Reviewed-on: https://gerrit.libreoffice.org/85093
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui 
b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index e3921b9b2260..4780a73829f9 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -6,7 +6,6 @@
 True
 False
 True
-True
 6
 vertical
 12
@@ -20,6 +19,7 @@
   
 True
 False
+False
 6
 12
 
@@ -27,7 +27,6 @@
 True
 False
 True
-True
 6
 12
 
@@ -103,7 +102,7 @@
   
   
 0
-2
+3
   
 
 
@@ -118,7 +117,7 @@
   
   
 0
-3
+4
   
 
 
@@ -130,7 +129,7 @@
   
   
 1
-2
+3
   
 
 
@@ -142,7 +141,7 @@
   
   
 1
-3
+4
   
 
 
@@ -157,7 +156,7 @@
   
   
 1
-4
+5
   
 
 
@@ -179,7 +178,44 @@
   
 
 
-  
+  
+True
+False
+Te_xt:
+True
+indication
+0
+  
+  
+0
+2
+  
+
+
+  
+True
+True
+True
+  
+  
+1
+2
+  
+
+
+  
+lbProtocol
+True
+False
+Proto_col:
+True
+linktyp_internet
+0
+  
+  
+0
+0
+  
 
 
   
@@ -241,21 +277,6 @@
 0
   
 
-
-  
-True
-False
-start
-Te_xt:
-True
-indication
-0
-  
-  
-0
-1
-  
-
 
   
 True
@@ -268,17 +289,6 @@
   
   
 0
-2
-  
-
-
-  
-True
-True
-True
-  
-  
-1
 1
   
 
@@ -290,7 +300,7 @@
   
   
 1
-2
+1
   
 
 
@@ -389,6 +399,8 @@
   
   
   
+  
+  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source sw/uiconfig

[Heiko Tietze (via logerrit)]

 sw/source/ui/config/optpage.cxx |   38 +---
 sw/source/uibase/inc/optpage.hxx|7 -
 sw/uiconfig/swriter/ui/optformataidspage.ui |  132 +++-
 3 files changed, 39 insertions(+), 138 deletions(-)

New commits:
commit c1a0911b99b6c2a4e260c86eab1aa1ee1e173c0a
Author: Heiko Tietze 
AuthorDate: Tue Dec 10 15:50:36 2019 +0100
Commit: Heiko Tietze 
CommitDate: Wed Dec 11 10:08:46 2019 +0100

Direct cursor fillmode as combobox

UI only update of many radio buttons into one
combo box to comply with HIG

Change-Id: If96ee339159def4c3dfa5d3b2f9adb218d1faee3
Reviewed-on: https://gerrit.libreoffice.org/84864
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index ebc5ed7ae9de..800fbb887fc4 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1208,11 +1208,7 @@ 
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
 , m_xCharHiddenCB(m_xBuilder->weld_check_button("hiddentext"))
 , m_xDirectCursorFrame(m_xBuilder->weld_frame("directcrsrframe"))
 , m_xOnOffCB(m_xBuilder->weld_check_button("cursoronoff"))
-, m_xFillMarginRB(m_xBuilder->weld_radio_button("fillmargin"))
-, m_xFillIndentRB(m_xBuilder->weld_radio_button("fillindent"))
-, m_xFillTabRB(m_xBuilder->weld_radio_button("filltab"))
-, m_xFillTabAndSpaceRB(m_xBuilder->weld_radio_button("filltabandspace"))
-, m_xFillSpaceRB(m_xBuilder->weld_radio_button("fillspace"))
+, 
m_xDirectCursorFillMode(m_xBuilder->weld_combo_box("cxDirectCursorFillMode"))
 , m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
 , m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
 , m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
@@ -1229,12 +1225,7 @@ 
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
 }
 m_xOnOffCB->set_active( bIsOn );
 
-m_xFillIndentRB->set_active( FILL_INDENT == eMode );
-m_xFillMarginRB->set_active( FILL_MARGIN == eMode );
-m_xFillTabRB->set_active( FILL_TAB == eMode );
-m_xFillSpaceRB->set_active( FILL_SPACE == eMode );
-m_xFillTabAndSpaceRB->set_active( FILL_TAB_SPACE == eMode );
-
+m_xDirectCursorFillMode->set_active( eMode );
 if(SfxItemState::SET != rSet.GetItemState(SID_HTML_MODE, false, &pItem )
 || !(static_cast(pItem)->GetValue() & 
HTMLMODE_ON))
 return;
@@ -1244,12 +1235,7 @@ 
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
 
 m_xDirectCursorFrame->hide();
 m_xOnOffCB->hide();
-m_xFillMarginRB->hide();
-m_xFillIndentRB->hide();
-m_xFillTabRB->hide();
-m_xFillSpaceRB->hide();
-m_xFillTabAndSpaceRB->hide();
-
+m_xDirectCursorFillMode->hide();
 m_xCursorProtFrame->hide();
 m_xCursorInProtCB->hide();
 }
@@ -1276,16 +1262,7 @@ bool SwShdwCursorOptionsTabPage::FillItemSet( 
SfxItemSet* rSet )
 aOpt.SetOn( m_xOnOffCB->get_active() );
 
 sal_uInt8 eMode;
-if( m_xFillIndentRB->get_active() )
-eMode= FILL_INDENT;
-else if( m_xFillMarginRB->get_active() )
-eMode = FILL_MARGIN;
-else if( m_xFillTabRB->get_active() )
-eMode = FILL_TAB;
-else if ( m_xFillTabAndSpaceRB->get_active() )
-eMode = FILL_TAB_SPACE;
-else
-eMode = FILL_SPACE;
+eMode = m_xDirectCursorFillMode->get_active();
 aOpt.SetMode( eMode );
 
 bool bRet = false;
@@ -1343,12 +1320,7 @@ void SwShdwCursorOptionsTabPage::Reset( const 
SfxItemSet* rSet )
 }
 m_xOnOffCB->set_active( bIsOn );
 
-m_xFillIndentRB->set_active( FILL_INDENT == eMode );
-m_xFillMarginRB->set_active( FILL_MARGIN == eMode );
-m_xFillTabRB->set_active( FILL_TAB == eMode );
-m_xFillSpaceRB->set_active( FILL_SPACE == eMode );
-m_xFillTabAndSpaceRB->set_active( FILL_TAB_SPACE == eMode );
-
+m_xDirectCursorFillMode->set_active( eMode );
 if (m_pWrtShell) {
 m_xMathBaselineAlignmentCB->set_active( 
m_pWrtShell->GetDoc()->getIDocumentSettingAccess().get( 
DocumentSettingId::MATH_BASELINE_ALIGNMENT ) );
 m_xMathBaselineAlignmentCB->save_state();
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 13c5d6194aef..0fb643768eeb 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -232,12 +232,7 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage
 std::unique_ptr m_xDirectCursorFrame;
 std::unique_ptr m_xOnOffCB;
 
-std::unique_ptr m_xFillMarginRB;
-std::unique_ptr m_xFillIndentRB;
-std::unique_ptr m_xFillTabRB;
-std::unique_ptr m_xFillTabAndSpaceRB;
-std::unique_ptr m_xFillSpaceRB;
-
+std::unique_ptr m_xDirectCursorFillMode;
 std::unique_ptr m_xCursorProtFrame;
 std::unique_ptr m_xCursorInProtCB;
 
diff --git a/sw/uiconfig/swrit

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 30912c4953b18bd47ef870aa7edcd2847e702934
Author: Heiko Tietze 
AuthorDate: Thu Dec 5 16:17:02 2019 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 6 08:22:44 2019 +0100

Resolves tdf#129140 - Wording in printer dialog

Wording improved

Change-Id: I67fcee9bdae869eb57882b1944e8975d4c564735
Reviewed-on: https://gerrit.libreoffice.org/84572
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 291b1acd3b9664ed41954458648448d7799d4df9)
Reviewed-on: https://gerrit.libreoffice.org/84590

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 1822f688a1c9..215e7d82f686 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -619,9 +619,9 @@
 False
 True
 
-  Print only in one side
-  Print in both sides (long edge)
-  Print in both sides (short edge)
+  Print on one side (simplex)
+  Print on both sides (duplex long edge)
+  Print on both sides (duplex short edge)
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/uiconfig/ui/printdialog.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 291b1acd3b9664ed41954458648448d7799d4df9
Author: Heiko Tietze 
AuthorDate: Thu Dec 5 16:17:02 2019 +0100
Commit: Heiko Tietze 
CommitDate: Fri Dec 6 07:16:36 2019 +0100

Resolves tdf#129140 - Wording in printer dialog

Wording improved

Change-Id: I67fcee9bdae869eb57882b1944e8975d4c564735
Reviewed-on: https://gerrit.libreoffice.org/84572
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 1822f688a1c9..215e7d82f686 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -619,9 +619,9 @@
 False
 True
 
-  Print only in one side
-  Print in both sides (long edge)
-  Print in both sides (short edge)
+  Print on one side (simplex)
+  Print on both sides (duplex long edge)
+  Print on both sides (duplex short edge)
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - extras/source include/svx svx/inc

[Heiko Tietze (via logerrit)]

 extras/source/palettes/standard.sog |2 +-
 include/svx/strings.hrc |2 +-
 svx/inc/strings.hxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cea9ac1a30698d280e195cb7a1912b8d45dff91e
Author: Heiko Tietze 
AuthorDate: Wed Nov 27 08:32:21 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Nov 27 13:29:45 2019 +0100

Resolves tdf#129052 - Misspelled gradient

“Mahagoni” => “Mahogany”

Change-Id: I7bc63a7353f850366b153802ec8d7272340e3095
Reviewed-on: https://gerrit.libreoffice.org/83856
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 464f19536c2864a911f089d2988be2c3c3ce79b6)
Reviewed-on: https://gerrit.libreoffice.org/83877
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extras/source/palettes/standard.sog 
b/extras/source/palettes/standard.sog
index 665ec064a4ce..036faa856de4 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1 @@
-http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:ooo="http://openoffice.org/2004/office";>
+http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:ooo="http://openoffice.org/2004/office";>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index d6d8c510ec03..3eea6ce8aa4c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -788,7 +788,7 @@
 #define RID_SVXSTR_GRDT81   
NC_("RID_SVXSTR_GRDT81", "Neon Light")
 #define RID_SVXSTR_GRDT82   
NC_("RID_SVXSTR_GRDT82", "Sunshine")
 #define RID_SVXSTR_GRDT83   
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84   
NC_("RID_SVXSTR_GRDT84", "Mahagoni")
+#define RID_SVXSTR_GRDT84   
NC_("RID_SVXSTR_GRDT84", "Mahogany")
 // /gradients
 #define RID_SVXSTR_HATCH0   
NC_("RID_SVXSTR_HATCH0", "Black 45 Degrees Wide")
 #define RID_SVXSTR_HATCH1   
NC_("RID_SVXSTR_HATCH1", "Black 45 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 353b97c54c83..0162a333a650 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -202,7 +202,7 @@
 #define RID_SVXSTR_GRDT81_DEF   "Neon Light"
 #define RID_SVXSTR_GRDT82_DEF   "Sunshine"
 #define RID_SVXSTR_GRDT83_DEF   "Present"
-#define RID_SVXSTR_GRDT84_DEF   "Mahagoni"
+#define RID_SVXSTR_GRDT84_DEF   "Mahogany"
 // Reference-strings for standard-hatch-table
 #define RID_SVXSTR_HATCH0_DEF   "Black 45 Degrees Wide"
 #define RID_SVXSTR_HATCH1_DEF   "Black 45 Degrees"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source include/svx svx/inc

[Heiko Tietze (via logerrit)]

 extras/source/palettes/standard.sog |2 +-
 include/svx/strings.hrc |2 +-
 svx/inc/strings.hxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 464f19536c2864a911f089d2988be2c3c3ce79b6
Author: Heiko Tietze 
AuthorDate: Wed Nov 27 08:32:21 2019 +0100
Commit: Heiko Tietze 
CommitDate: Wed Nov 27 11:02:03 2019 +0100

Resolves tdf# 129052 - Misspelled gradient

“Mahagoni” => “Mahogany”

Change-Id: I7bc63a7353f850366b153802ec8d7272340e3095
Reviewed-on: https://gerrit.libreoffice.org/83856
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/extras/source/palettes/standard.sog 
b/extras/source/palettes/standard.sog
index 665ec064a4ce..036faa856de4 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1 @@
-http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:ooo="http://openoffice.org/2004/office";>
+http://www.w3.org/1999/xlink"; 
xmlns:svg="http://www.w3.org/2000/svg"; 
xmlns:ooo="http://openoffice.org/2004/office";>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index d6d8c510ec03..3eea6ce8aa4c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -788,7 +788,7 @@
 #define RID_SVXSTR_GRDT81   
NC_("RID_SVXSTR_GRDT81", "Neon Light")
 #define RID_SVXSTR_GRDT82   
NC_("RID_SVXSTR_GRDT82", "Sunshine")
 #define RID_SVXSTR_GRDT83   
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84   
NC_("RID_SVXSTR_GRDT84", "Mahagoni")
+#define RID_SVXSTR_GRDT84   
NC_("RID_SVXSTR_GRDT84", "Mahogany")
 // /gradients
 #define RID_SVXSTR_HATCH0   
NC_("RID_SVXSTR_HATCH0", "Black 45 Degrees Wide")
 #define RID_SVXSTR_HATCH1   
NC_("RID_SVXSTR_HATCH1", "Black 45 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 353b97c54c83..0162a333a650 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -202,7 +202,7 @@
 #define RID_SVXSTR_GRDT81_DEF   "Neon Light"
 #define RID_SVXSTR_GRDT82_DEF   "Sunshine"
 #define RID_SVXSTR_GRDT83_DEF   "Present"
-#define RID_SVXSTR_GRDT84_DEF   "Mahagoni"
+#define RID_SVXSTR_GRDT84_DEF   "Mahogany"
 // Reference-strings for standard-hatch-table
 #define RID_SVXSTR_HATCH0_DEF   "Black 45 Degrees Wide"
 #define RID_SVXSTR_HATCH1_DEF   "Black 45 Degrees"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - officecfg/registry

[Heiko Tietze (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |6 
+++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 36eb42eceac26470b9d660ff9dcb105a43d688b5
Author: Heiko Tietze 
AuthorDate: Mon Nov 25 16:24:57 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Nov 26 23:39:09 2019 +0100

Resolves tdf#129003 - Capitalization of menu entry "Show Tip-Of-The-Day"

Now Tip-of-the-Day

Change-Id: I715d87cdd6b5d9a7d06a218ed8d1922037fea91b
Reviewed-on: https://gerrit.libreoffice.org/83694
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit f8a5377c9ec208adac5eb394c0c2920dbb764bd0)
Reviewed-on: https://gerrit.libreoffice.org/83806
Reviewed-by: Adolfo Jayme Barrientos 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 34cdc64758af..71095e856e49 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5013,10 +5013,10 @@
   ~Tip of the day
 
 
-  Show Tip-Of-The-Day
+  Show Tip-of-the-Day
 
 
-  Show the Tip-Of-The-Day dialog
+  Show the Tip-of-the-Day dialog
 
 
   1
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 185cfe69f26e..d3056a325eba 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5532,19 +5532,19 @@
   
 
 
-  Determines whether the Tip-Of-The-Day dialog is shown on 
startup.
+  Determines whether the Tip-of-the-Day dialog is shown on 
startup.
 
 true
   
   
   
-  The last time when the Tip-of-the-day dialog was 
shown.
+  The last time when the Tip-of-the-Day dialog was 
shown.
   
   -1 
   
   
   
-  The last shown Tip-of-the-day.
+  The last shown Tip-of-the-Day.
   
   0
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Heiko Tietze (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 
++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |6 
+++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f8a5377c9ec208adac5eb394c0c2920dbb764bd0
Author: Heiko Tietze 
AuthorDate: Mon Nov 25 16:24:57 2019 +0100
Commit: Heiko Tietze 
CommitDate: Tue Nov 26 17:52:18 2019 +0100

Resolves tdf#129003 - Capitalization of menu entry "Show Tip-Of-The-Day"

Now Tip-of-the-Day

Change-Id: I715d87cdd6b5d9a7d06a218ed8d1922037fea91b
Reviewed-on: https://gerrit.libreoffice.org/83694
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 75a6a98c62a2..08ff909b5db5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5028,10 +5028,10 @@
   ~Tip of the day
 
 
-  Show Tip-Of-The-Day
+  Show Tip-of-the-Day
 
 
-  Show the Tip-Of-The-Day dialog
+  Show the Tip-of-the-Day dialog
 
 
   1
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 185cfe69f26e..d3056a325eba 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5532,19 +5532,19 @@
   
 
 
-  Determines whether the Tip-Of-The-Day dialog is shown on 
startup.
+  Determines whether the Tip-of-the-Day dialog is shown on 
startup.
 
 true
   
   
   
-  The last time when the Tip-of-the-day dialog was 
shown.
+  The last time when the Tip-of-the-Day dialog was 
shown.
   
   -1 
   
   
   
-  The last shown Tip-of-the-day.
+  The last shown Tip-of-the-Day.
   
   0
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Heiko Tietze (via logerrit)]

 sw/source/ui/misc/bookmark.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit cd87801ee235c5f30d070f2eeea6d432e21259bf
Author: Heiko Tietze 
AuthorDate: Fri Nov 22 16:15:47 2019 +0100
Commit: Heiko Tietze 
CommitDate: Tue Nov 26 17:51:54 2019 +0100

tdf#128252 - Make "Hide" and "With condition" experimental

Unlcear functions made experimental until documentation is available

Change-Id: I9e08752802409b05647d23f9ddd6514f109d1592
Reviewed-on: https://gerrit.libreoffice.org/83509
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit c327be2613005a1bb5a5302ce56d4e2ec9da85b5)
Reviewed-on: https://gerrit.libreoffice.org/83766

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 2fd11375504b..3c99ab0c6848 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -334,6 +335,15 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* 
pParent, SwWrtShell& rS,
 
 m_xForbiddenChars->set_label(SwResId(STR_BOOKMARK_FORBIDDENCHARS) + " " + 
BookmarkTable::aForbiddenChars);
 m_xForbiddenChars->set_visible(false);
+
+SvtMiscOptions aMiscOpt;
+if ( !aMiscOpt.IsExperimentalMode() )
+{
+m_xHideCB->set_visible( false );
+m_xConditionFT->set_visible( false );
+m_xConditionED->set_visible( false );
+}
+
 }
 
 IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, nColumn, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Heiko Tietze (via logerrit)]

 sw/source/ui/misc/bookmark.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit c327be2613005a1bb5a5302ce56d4e2ec9da85b5
Author: Heiko Tietze 
AuthorDate: Fri Nov 22 16:15:47 2019 +0100
Commit: Heiko Tietze 
CommitDate: Tue Nov 26 14:38:48 2019 +0100

tdf#128252 - Make "Hide" and "With condition" experimental

Unlcear functions made experimental until documentation is available

Change-Id: I9e08752802409b05647d23f9ddd6514f109d1592
Reviewed-on: https://gerrit.libreoffice.org/83509
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 2fd11375504b..3c99ab0c6848 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -334,6 +335,15 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* 
pParent, SwWrtShell& rS,
 
 m_xForbiddenChars->set_label(SwResId(STR_BOOKMARK_FORBIDDENCHARS) + " " + 
BookmarkTable::aForbiddenChars);
 m_xForbiddenChars->set_visible(false);
+
+SvtMiscOptions aMiscOpt;
+if ( !aMiscOpt.IsExperimentalMode() )
+{
+m_xHideCB->set_visible( false );
+m_xConditionFT->set_visible( false );
+m_xConditionED->set_visible( false );
+}
+
 }
 
 IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, nColumn, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/source cui/uiconfig include/sfx2 sfx2/source

[Heiko Tietze (via logerrit)]

 cui/source/tabpages/tpbitmap.cxx|5 
 cui/source/tabpages/tpgradnt.cxx|4 
 cui/source/tabpages/tphatch.cxx |4 
 cui/source/tabpages/tppattern.cxx   |4 
 cui/uiconfig/ui/bitmaptabpage.ui|  157 -
 cui/uiconfig/ui/gradientpage.ui |  221 ++--
 cui/uiconfig/ui/hatchpage.ui|3 
 cui/uiconfig/ui/patterntabpage.ui   |  147 ---
 include/sfx2/dialoghelper.hxx   |2 
 sfx2/source/dialog/dialoghelper.cxx |5 
 10 files changed, 245 insertions(+), 307 deletions(-)

New commits:
commit de6b9cd633e41f2a38f437143fb40c6e0a1d337d
Author: Heiko Tietze 
AuthorDate: Thu Nov 14 15:50:32 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Nov 15 16:42:56 2019 +0100

Revert "tdf#126128 Reduce page properties dialog's height."

Discussion in BZ.

This reverts commit 80109586e6cb6d3e2e0a53a9079c3125ec9b8368.

Change-Id: I01e23a7eeaa78d60f106dfa67a54ff9d7904cb19
Reviewed-on: https://gerrit.libreoffice.org/82698
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 687c6761e84101f8a798ac7f622c2eab4f84d7b2)
Reviewed-on: https://gerrit.libreoffice.org/82763
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 946da898ad08..7d1f17be236b 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -119,11 +119,8 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, 
weld::DialogControlle
 m_xBtnImport->hide();
 
 // Calculate size of display boxes
-
-Size aBitmapLBSize = 
getPagePropertiesOptimalSize(m_xBitmapLB->GetDrawingArea()->get_ref_device());
-m_xBitmapLB->set_size_request(aBitmapLBSize.Width(), 
aBitmapLBSize.Height());
-
 Size aSize = 
getDrawPreviewOptimalSize(m_aCtlBitmapPreview.GetDrawingArea()->get_ref_device());
+m_xBitmapLB->set_size_request(aSize.Width(), aSize.Height());
 m_xCtlBitmapPreview->set_size_request(aSize.Width(), aSize.Height());
 
 SfxItemPool* pPool = m_rXFSet.GetPool();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index ac7832e2b4d2..f8affa0f044e 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -68,10 +68,8 @@ SvxGradientTabPage::SvxGradientTabPage(weld::Container* 
pPage, weld::DialogContr
 , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", 
m_aCtlPreview))
 , m_xGradientLBWin(new weld::CustomWeld(*m_xBuilder, "gradientpresetlist", 
*m_xGradientLB))
 {
-Size aSize = 
getPagePropertiesOptimalSize(m_xGradientLB->GetDrawingArea()->get_ref_device());
+Size aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xGradientLB->set_size_request(aSize.Width(), aSize.Height());
-
-aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
 // this page needs ExchangeSupport
 SetExchangeSupport();
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 76de2709df89..aeb5d9c85fcb 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -63,10 +63,8 @@ SvxHatchTabPage::SvxHatchTabPage(weld::Container* pPage, 
weld::DialogController*
 , m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist", 
*m_xHatchLB))
 , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", 
m_aCtlPreview))
 {
-Size aSize =  
getPagePropertiesOptimalSize(m_xHatchLB->GetDrawingArea()->get_ref_device());
+Size aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xHatchLBWin->set_size_request(aSize.Width(), aSize.Height());
-
-aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
 
 // this page needs ExchangeSupport
diff --git a/cui/source/tabpages/tppattern.cxx 
b/cui/source/tabpages/tppattern.cxx
index aa3b561a2c7d..713a7c3a6628 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -87,10 +87,8 @@ SvxPatternTabPage::SvxPatternTabPage(weld::Container* pPage, 
weld::DialogControl
 , m_xPatternLBWin(new weld::CustomWeld(*m_xBuilder, "patternpresetlist", 
*m_xPatternLB))
 {
 // size of the bitmap display
-Size aSize = 
getPagePropertiesOptimalSize(m_xPatternLB->GetDrawingArea()->get_ref_device());
+Size aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xPatternLB->set_size_request(aSize.Width(), aSize.Height());
-
-aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
 
 m_xBitmapCtl.reset(new SvxBitmapCtl);
diff --git a/cui/uiconfig/u

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b402568d460091c89daf06897dbd050f8ed980fd
Author: Heiko Tietze 
AuthorDate: Fri Sep 13 10:55:28 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Nov 15 11:10:59 2019 +0100

Revert "Resolves tdf#127317 - Make text of tips of the day selectable"

Selectable text makes the GtkLabel unwrap; revert is needed until the 
control works properly

This reverts commit 54a3044ebd7f946235ba1d0a8af11ad94872afb7.

Change-Id: I7b63e0e29a22f3feddac99ac42735a1880a9b1c2
Reviewed-on: https://gerrit.libreoffice.org/78864
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 22f3cca81039ac97bee96ba47498fbea1ccc1557)
Reviewed-on: https://gerrit.libreoffice.org/82750

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index 2e7a70672c7d..080200ef8933 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -139,7 +139,6 @@
 False
 True
 True
-True
 50
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/gradientpage.ui   |2 --
 cui/uiconfig/ui/hatchpage.ui  |2 --
 cui/uiconfig/ui/patterntabpage.ui |2 --
 3 files changed, 6 deletions(-)

New commits:
commit 3c4f7a704e6b8c80598d9301097b774685ac6a09
Author: Heiko Tietze 
AuthorDate: Thu Nov 14 15:53:10 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Nov 15 10:20:54 2019 +0100

Revert "ensure gtk creates a default label widget for the MenuButtons"

Discussion on BZ, have to revert this patch first.

This reverts commit 3937d3d035a03530b78acc648c07b6e099fb6770.

Change-Id: I8ab49e7296bc403f2706f986b2711025f468c4be
Reviewed-on: https://gerrit.libreoffice.org/82699
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit d3756b274a23cb208ddd03de34a1312d4ada1a91)
Reviewed-on: https://gerrit.libreoffice.org/82748

diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index 06cd4adcacae..f07f89486549 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -625,7 +625,6 @@
 False
 0
 True
-
 
   
 
@@ -685,7 +684,6 @@
 False
 0
 True
-
 
   
 
diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui
index eee29f40309d..2111ac913ea4 100644
--- a/cui/uiconfig/ui/hatchpage.ui
+++ b/cui/uiconfig/ui/hatchpage.ui
@@ -293,7 +293,6 @@
 center
 0
 True
-
 
   
 
@@ -332,7 +331,6 @@
 center
 0
 True
-
 
   
 
diff --git a/cui/uiconfig/ui/patterntabpage.ui 
b/cui/uiconfig/ui/patterntabpage.ui
index e394e066a08e..8662d05c6356 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -305,7 +305,6 @@
 False
 0
 True
-
 
   
 
@@ -351,7 +350,6 @@
 False
 0
 True
-
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/sfx2 sfx2/source

[Heiko Tietze (via logerrit)]

 cui/source/tabpages/tpbitmap.cxx|5 
 cui/source/tabpages/tpgradnt.cxx|4 
 cui/source/tabpages/tphatch.cxx |4 
 cui/source/tabpages/tppattern.cxx   |4 
 cui/uiconfig/ui/bitmaptabpage.ui|  157 -
 cui/uiconfig/ui/gradientpage.ui |  221 ++--
 cui/uiconfig/ui/hatchpage.ui|3 
 cui/uiconfig/ui/patterntabpage.ui   |  147 ---
 include/sfx2/dialoghelper.hxx   |2 
 sfx2/source/dialog/dialoghelper.cxx |5 
 10 files changed, 245 insertions(+), 307 deletions(-)

New commits:
commit 687c6761e84101f8a798ac7f622c2eab4f84d7b2
Author: Heiko Tietze 
AuthorDate: Thu Nov 14 15:50:32 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Nov 15 08:42:24 2019 +0100

Revert "tdf#126128 Reduce page properties dialog's height."

Discussion in BZ.

This reverts commit 80109586e6cb6d3e2e0a53a9079c3125ec9b8368.

Change-Id: I01e23a7eeaa78d60f106dfa67a54ff9d7904cb19
Reviewed-on: https://gerrit.libreoffice.org/82698
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 946da898ad08..7d1f17be236b 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -119,11 +119,8 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, 
weld::DialogControlle
 m_xBtnImport->hide();
 
 // Calculate size of display boxes
-
-Size aBitmapLBSize = 
getPagePropertiesOptimalSize(m_xBitmapLB->GetDrawingArea()->get_ref_device());
-m_xBitmapLB->set_size_request(aBitmapLBSize.Width(), 
aBitmapLBSize.Height());
-
 Size aSize = 
getDrawPreviewOptimalSize(m_aCtlBitmapPreview.GetDrawingArea()->get_ref_device());
+m_xBitmapLB->set_size_request(aSize.Width(), aSize.Height());
 m_xCtlBitmapPreview->set_size_request(aSize.Width(), aSize.Height());
 
 SfxItemPool* pPool = m_rXFSet.GetPool();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index ac7832e2b4d2..f8affa0f044e 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -68,10 +68,8 @@ SvxGradientTabPage::SvxGradientTabPage(weld::Container* 
pPage, weld::DialogContr
 , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", 
m_aCtlPreview))
 , m_xGradientLBWin(new weld::CustomWeld(*m_xBuilder, "gradientpresetlist", 
*m_xGradientLB))
 {
-Size aSize = 
getPagePropertiesOptimalSize(m_xGradientLB->GetDrawingArea()->get_ref_device());
+Size aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xGradientLB->set_size_request(aSize.Width(), aSize.Height());
-
-aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
 // this page needs ExchangeSupport
 SetExchangeSupport();
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 76de2709df89..aeb5d9c85fcb 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -63,10 +63,8 @@ SvxHatchTabPage::SvxHatchTabPage(weld::Container* pPage, 
weld::DialogController*
 , m_xHatchLBWin(new weld::CustomWeld(*m_xBuilder, "hatchpresetlist", 
*m_xHatchLB))
 , m_xCtlPreview(new weld::CustomWeld(*m_xBuilder, "previewctl", 
m_aCtlPreview))
 {
-Size aSize =  
getPagePropertiesOptimalSize(m_xHatchLB->GetDrawingArea()->get_ref_device());
+Size aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xHatchLBWin->set_size_request(aSize.Width(), aSize.Height());
-
-aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
 
 // this page needs ExchangeSupport
diff --git a/cui/source/tabpages/tppattern.cxx 
b/cui/source/tabpages/tppattern.cxx
index aa3b561a2c7d..713a7c3a6628 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -87,10 +87,8 @@ SvxPatternTabPage::SvxPatternTabPage(weld::Container* pPage, 
weld::DialogControl
 , m_xPatternLBWin(new weld::CustomWeld(*m_xBuilder, "patternpresetlist", 
*m_xPatternLB))
 {
 // size of the bitmap display
-Size aSize = 
getPagePropertiesOptimalSize(m_xPatternLB->GetDrawingArea()->get_ref_device());
+Size aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xPatternLB->set_size_request(aSize.Width(), aSize.Height());
-
-aSize = 
getDrawPreviewOptimalSize(m_aCtlPreview.GetDrawingArea()->get_ref_device());
 m_xCtlPreview->set_size_request(aSize.Width(), aSize.Height());
 
 m_xBitmapCtl.reset(new SvxBitmapCtl);
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 52503da401fc..dae24f1ea007 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bit

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/gradientpage.ui   |2 --
 cui/uiconfig/ui/hatchpage.ui  |2 --
 cui/uiconfig/ui/patterntabpage.ui |2 --
 3 files changed, 6 deletions(-)

New commits:
commit d3756b274a23cb208ddd03de34a1312d4ada1a91
Author: Heiko Tietze 
AuthorDate: Thu Nov 14 15:53:10 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Nov 15 08:42:01 2019 +0100

Revert "ensure gtk creates a default label widget for the MenuButtons"

Discussion on BZ, have to revert this patch first.

This reverts commit 3937d3d035a03530b78acc648c07b6e099fb6770.

Change-Id: I8ab49e7296bc403f2706f986b2711025f468c4be
Reviewed-on: https://gerrit.libreoffice.org/82699
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index 06cd4adcacae..f07f89486549 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -625,7 +625,6 @@
 False
 0
 True
-
 
   
 
@@ -685,7 +684,6 @@
 False
 0
 True
-
 
   
 
diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui
index eee29f40309d..2111ac913ea4 100644
--- a/cui/uiconfig/ui/hatchpage.ui
+++ b/cui/uiconfig/ui/hatchpage.ui
@@ -293,7 +293,6 @@
 center
 0
 True
-
 
   
 
@@ -332,7 +331,6 @@
 center
 0
 True
-
 
   
 
diff --git a/cui/uiconfig/ui/patterntabpage.ui 
b/cui/uiconfig/ui/patterntabpage.ui
index e394e066a08e..8662d05c6356 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -305,7 +305,6 @@
 False
 0
 True
-
 
   
 
@@ -351,7 +350,6 @@
 False
 0
 True
-
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f85473e0fbfbca0329559b0c6258e5ae603bfb34
Author: Heiko Tietze 
AuthorDate: Wed Oct 16 13:50:20 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Nov 14 17:42:01 2019 +0100

Resolves tdf#127994 - Totd dialog get resized horizontally

Width request set to 350

Change-Id: Ib974417282c76b4cede1b4773159b1fa748ddbfb
Reviewed-on: https://gerrit.libreoffice.org/80887
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit dae96d4e629c5eccaacdc763cd390d341c16175d)
Reviewed-on: https://gerrit.libreoffice.org/82672
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index ee8ac6cbd17a..2e7a70672c7d 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -134,6 +134,7 @@
 
 
   
+350
 True
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers sw/inc sw/source sw/uiconfig

[Heiko Tietze (via logerrit)]

 solenv/sanitizers/ui/modules/swriter.suppr |1 
 sw/inc/strings.hrc |2 
 sw/source/ui/misc/bookmark.cxx |   20 -
 sw/source/uibase/inc/bookmark.hxx  |2 
 sw/uiconfig/swriter/ui/insertbookmark.ui   |  300 -
 5 files changed, 185 insertions(+), 140 deletions(-)

New commits:
commit 56b124c36cff09257d8373aaa6661a88cfb1926d
Author: Heiko Tietze 
AuthorDate: Thu Nov 7 16:19:36 2019 +0100
Commit: Heiko Tietze 
CommitDate: Mon Nov 11 09:47:34 2019 +0100

Resolves tdf#128521 - illegal char in a bookmark name

Message box removed and warning label introduced
Some alignment and accessibility issues solved too

Change-Id: Icc88d489268403fa3da525aadc1c007c589fa019
Reviewed-on: https://gerrit.libreoffice.org/82231
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index 97f6e239143f..43134e801be7 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -93,6 +93,7 @@ sw/uiconfig/swriter/ui/indexentry.ui://GtkButton[@id='next'] 
button-no-label
 sw/uiconfig/swriter/ui/indexentry.ui://GtkButton[@id='first'] button-no-label
 sw/uiconfig/swriter/ui/indexentry.ui://GtkButton[@id='last'] button-no-label
 sw/uiconfig/swriter/ui/insertbookmark.ui://GtkEntry[@id='name'] no-labelled-by
+sw/uiconfig/swriter/ui/insertbookmark.ui://GtkLabel[@id='lbForbiddenChars'] 
orphan-label
 sw/uiconfig/swriter/ui/insertbreak.ui://GtkSpinButton[@id='pagenumsb'] 
missing-label-for
 sw/uiconfig/swriter/ui/insertcaption.ui://GtkEntry[@id='caption_edit'] 
no-labelled-by
 sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui://GtkButton[@id='allright'] 
button-no-label
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 47368c1e9dc5..8b2bd0073093 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -237,7 +237,6 @@
 #define STR_LOAD_GLOBAL_DOC NC_("STR_LOAD_GLOBAL_DOC", 
"Name and Path of Master Document")
 #define STR_LOAD_HTML_DOC   NC_("STR_LOAD_HTML_DOC", "Name 
and Path of the HTML Document")
 #define STR_JAVA_EDIT   NC_("STR_JAVA_EDIT", "Edit 
Script")
-#define STR_REMOVE_WARNING  NC_("STR_REMOVE_WARNING", "The 
following characters are not valid and have been removed: ")
 #define STR_BOOKMARK_DEF_NAME   NC_("STR_BOOKMARK_DEF_NAME", 
"Bookmark")
 #define STR_BOOKMARK_NAME   NC_("STR_BOOKMARK_NAME", 
"Name")
 #define STR_BOOKMARK_TEXT   NC_("STR_BOOKMARK_TEXT", 
"Text")
@@ -245,6 +244,7 @@
 #define STR_BOOKMARK_CONDITION  NC_("STR_BOOKMARK_CONDITION", 
"Condition")
 #define STR_BOOKMARK_YESNC_("STR_BOOKMARK_YES", "Yes")
 #define STR_BOOKMARK_NO NC_("STR_BOOKMARK_NO", "No")
+#define STR_BOOKMARK_FORBIDDENCHARS 
NC_("STR_BOOKMARK_FORBIDDENCHARS", "Forbidden chars:")
 #define SW_STR_NONE NC_("SW_STR_NONE", "[None]")
 #define STR_CAPTION_BEGINNING   NC_("STR_CAPTION_BEGINNING", 
"Start")
 #define STR_CAPTION_END NC_("STR_CAPTION_END", "End")
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 5d6f08cf48fa..2fd11375504b 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -59,14 +59,12 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, 
weld::Entry&, void)
 if (sTmp.getLength() != nTmpLen)
sMsg += OUStringChar(BookmarkTable::aForbiddenChars[i]);
 }
-if (sTmp.getLength() != nLen)
-{
-m_xEditBox->set_text(sTmp);
-std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(m_xDialog.get(),
-  VclMessageType::Info, 
VclButtonsType::Ok,
-  sRemoveWarning + sMsg));
-xInfoBox->run();
-}
+const bool bHasForbiddenChars = sTmp.getLength() != nLen;
+m_xForbiddenChars->set_visible(bHasForbiddenChars);
+if (bHasForbiddenChars)
+m_xEditBox->set_message_type(weld::EntryMessageType::Error);
+else
+m_xEditBox->set_message_type(weld::EntryMessageType::Normal);
 
 sal_Int32 nSelectedEntries = 0;
 sal_Int32 nEntries = 0;
@@ -83,7 +81,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, ModifyHdl, weld::Entry&, 
void)
 }
 
 // allow to add new bookmark only if one name provided and it's not taken
-m_xInsertBtn->set_sensitive(nEntries == 1 && nSelectedEntries == 0);
+m_xInsertBtn->set_sensitive(nEntries == 1 && nSelectedEntries == 0 && 
!bHasForbiddenChars);
 
 // allow to delete only if all bookmarks are recognized
 m_xDeleteBtn->set_sensitive(nEntries > 0 && nSelectedEntries == nEntries);
@@ -313,6 +311,7 @@ SwInsertBookmarkDlg::SwInsertB

[Libreoffice-commits] core.git: sw/inc

[Heiko Tietze (via logerrit)]

 sw/inc/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1721836fb2e94b8478b80139976617f9e7311816
Author: Heiko Tietze 
AuthorDate: Thu Oct 24 11:04:51 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Oct 24 12:21:39 2019 +0200

Resolves tdf#128227 - Rename "Text Frame" to "Frame

Change-Id: I2158152acb64f458020e1375a8b93162117d11fb
Reviewed-on: https://gerrit.libreoffice.org/81434
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index b77225641089..47368c1e9dc5 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -351,7 +351,7 @@
 #define STR_EVENT_FRM_MOVE  NC_("STR_EVENT_FRM_MOVE", 
"Move frame")
 #define STR_CONTENT_TYPE_OUTLINE
NC_("STR_CONTENT_TYPE_OUTLINE", "Headings")
 #define STR_CONTENT_TYPE_TABLE  NC_("STR_CONTENT_TYPE_TABLE", 
"Tables")
-#define STR_CONTENT_TYPE_FRAME  NC_("STR_CONTENT_TYPE_FRAME", 
"Text frames")
+#define STR_CONTENT_TYPE_FRAME  NC_("STR_CONTENT_TYPE_FRAME", 
"Frames")
 #define STR_CONTENT_TYPE_GRAPHIC
NC_("STR_CONTENT_TYPE_GRAPHIC", "Images")
 #define STR_CONTENT_TYPE_OLENC_("STR_CONTENT_TYPE_OLE", 
"OLE objects")
 #define STR_CONTENT_TYPE_BOOKMARK   
NC_("STR_CONTENT_TYPE_BOOKMARK", "Bookmarks")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dae96d4e629c5eccaacdc763cd390d341c16175d
Author: Heiko Tietze 
AuthorDate: Wed Oct 16 13:50:20 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Oct 17 12:19:32 2019 +0200

Resolves tdf#127994 - Totd dialog get resized horizontally

Width request set to 350

Change-Id: Ib974417282c76b4cede1b4773159b1fa748ddbfb
Reviewed-on: https://gerrit.libreoffice.org/80887
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index a24a90107243..33515897ab94 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -136,6 +136,7 @@
 
 
   
+350
 True
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Heiko Tietze (via logerrit)]

 cui/source/customize/acccfg.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8519c6d98250a5f2b4c78e330fc79907c596a447
Author: Heiko Tietze 
AuthorDate: Tue Oct 8 11:30:19 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 8 16:39:28 2019 +0200

Resolves tdf#127903 - Allow customization with equal key

Change-Id: Ie5e1fc23412d13a868e021addb0de47d9e84f80b
Reviewed-on: https://gerrit.libreoffice.org/80436
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e4623e69300f..24a601d0af99 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -149,6 +149,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_BACKSPACE,
 KEY_SHIFT | KEY_INSERT,
 KEY_SHIFT | KEY_DELETE,
+KEY_SHIFT | KEY_EQUAL,
 
 KEY_MOD1 | KEY_0,
 KEY_MOD1 | KEY_1,
@@ -230,6 +231,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_MOD1 | KEY_SUBTRACT,
 KEY_MOD1 | KEY_MULTIPLY,
 KEY_MOD1 | KEY_DIVIDE,
+KEY_MOD1 | KEY_EQUAL,
 
 KEY_SHIFT | KEY_MOD1 | KEY_0,
 KEY_SHIFT | KEY_MOD1 | KEY_1,
@@ -307,6 +309,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD1 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD1 | KEY_INSERT,
 KEY_SHIFT | KEY_MOD1 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD1 | KEY_EQUAL,
 
 KEY_MOD2 | KEY_0,
 KEY_MOD2 | KEY_1,
@@ -382,6 +385,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_MOD2 | KEY_BACKSPACE,
 KEY_MOD2 | KEY_INSERT,
 KEY_MOD2 | KEY_DELETE,
+KEY_MOD2 | KEY_EQUAL,
 
 KEY_SHIFT | KEY_MOD2 | KEY_0,
 KEY_SHIFT | KEY_MOD2 | KEY_1,
@@ -458,6 +462,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD2 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD2 | KEY_INSERT,
 KEY_SHIFT | KEY_MOD2 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD2 | KEY_EQUAL,
 
 KEY_MOD1 | KEY_MOD2 | KEY_0,
 KEY_MOD1 | KEY_MOD2 | KEY_1,
@@ -607,7 +612,8 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_SPACE,
 KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_INSERT,
-KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_DELETE
+KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_EQUAL
 
 #ifdef __APPLE__
,KEY_MOD3 | KEY_0,
@@ -690,6 +696,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_MOD3 | KEY_SUBTRACT,
 KEY_MOD3 | KEY_MULTIPLY,
 KEY_MOD3 | KEY_DIVIDE,
+KEY_MOD3 | KEY_EQUAL,
 
 KEY_SHIFT | KEY_MOD3 | KEY_0,
 KEY_SHIFT | KEY_MOD3 | KEY_1,
@@ -766,7 +773,8 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 KEY_SHIFT | KEY_MOD3 | KEY_SPACE,
 KEY_SHIFT | KEY_MOD3 | KEY_BACKSPACE,
 KEY_SHIFT | KEY_MOD3 | KEY_INSERT,
-KEY_SHIFT | KEY_MOD3 | KEY_DELETE
+KEY_SHIFT | KEY_MOD3 | KEY_DELETE,
+KEY_SHIFT | KEY_MOD3 | KEY_EQUAL
 #endif
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc |  377 +++-
 1 file changed, 185 insertions(+), 192 deletions(-)

New commits:
commit 7fef6c0fed10a3457f520689fa129926636c3103
Author: Heiko Tietze 
AuthorDate: Mon Oct 7 13:06:09 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 8 10:57:59 2019 +0200

Tip of the day randomized

Necessary because of serial presentation after
I69b72b80d6d6afa25a1c4f01fa05bc60b5741db8

Change-Id: I26d2a08442b91c11ec7d9c4addaaad764e7f3ba9
Reviewed-on: https://gerrit.libreoffice.org/80371
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index b0e8b11f23a2..def9fa36100b 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -43,222 +43,215 @@
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can open and save files stored 
on remote servers per CMIS."), "fps/ui/remotefilesdialog/RemoteFilesDialog", 
""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/guide/cmis-remote-files.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Tools > AutoCorrect > AutoCorrect Options… 
> Replace provides a list of common substitutions. Take a look and complete 
with your own replacements."), "cui/ui/acoroptionspage/AutocorrectOptionsPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/06040100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/05130100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/0119.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile, or to restore a non-working %PRODUCTNAME instance, go to Help > 
Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01040300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/autotext.html
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/optionen/01041100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows 
alphabetically or numerically per Tools > Sort."), 
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/0610.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to 
protect part of a text, show/hide text, reuse parts from other documents, use 
different column layout."), "modules/swriter/ui/sectionpage/SectionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/01/04020100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formatting > 
Manage in Calc to find out which cells have been defined with conditional 
formatting."), 
"modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffic

[Libreoffice-commits] core.git: sc/source

[Heiko Tietze (via logerrit)]

 sc/source/ui/inc/hdrcont.hxx  |2 -
 sc/source/ui/view/hdrcont.cxx |   72 --
 2 files changed, 14 insertions(+), 60 deletions(-)

New commits:
commit 67fd62b3edc86c2891f279b25cf9919c4ca1
Author: Heiko Tietze 
AuthorDate: Thu Sep 26 08:17:23 2019 +0200
Commit: Heiko Tietze 
CommitDate: Wed Oct 2 07:35:44 2019 +0200

Resolves tdf#127508 - Flat table header in Calc

Shading removed to comply with the zeitgeisty flatness

Change-Id: I766d86dc8d26191fa87c94d3e8f64feda79c3030
Reviewed-on: https://gerrit.libreoffice.org/79584
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 2ffc9c9f3aa5..a1b4260ac3d3 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -69,8 +69,6 @@ private:
 
 voidDoPaint( SCCOLROW nStart, SCCOLROW nEnd );
 
-voidDrawShadedRect( long nStart, long nEnd, const Color& 
rBaseColor );
-
 protected:
 ScTabView*  pTabView;
 
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index c6c450f6aa88..7fd1a8dd8f26 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -200,43 +200,6 @@ long ScHeaderControl::GetScrPos( SCCOLROW nEntryNo ) const
 return nScrPos;
 }
 
-// draw a rectangle across the window's width/height, with the outer part in a 
lighter color
-
-void ScHeaderControl::DrawShadedRect( long nStart, long nEnd, const Color& 
rBaseColor )
-{
-Color aWhite( COL_WHITE );
-
-Color aInner( rBaseColor ); // highlight color, unchanged
-Color aCenter( rBaseColor );
-aCenter.Merge( aWhite, 0xd0 );  // lighten up a bit
-Color aOuter( rBaseColor );
-aOuter.Merge( aWhite, 0xa0 );   // lighten up more
-
-if ( IsMirrored() )
-std::swap( aInner, aOuter );// just swap colors instead of 
positions
-
-Size aWinSize = GetSizePixel();
-long nBarSize = bVertical ? aWinSize.Width() : aWinSize.Height();
-long nCenterPos = (nBarSize / 2) - 1;
-
-SetLineColor();
-SetFillColor( aOuter );
-if (bVertical)
-DrawRect( tools::Rectangle( 0, nStart, nCenterPos-1, nEnd ) );
-else
-DrawRect( tools::Rectangle( nStart, 0, nEnd, nCenterPos-1 ) );
-SetFillColor( aCenter );
-if (bVertical)
-DrawRect( tools::Rectangle( nCenterPos, nStart, nCenterPos, nEnd ) );
-else
-DrawRect( tools::Rectangle( nStart, nCenterPos, nEnd, nCenterPos ) );
-SetFillColor( aInner );
-if (bVertical)
-DrawRect( tools::Rectangle( nCenterPos+1, nStart, nBarSize-1, nEnd ) );
-else
-DrawRect( tools::Rectangle( nStart, nCenterPos+1, nEnd, nBarSize-1 ) );
-}
-
 void ScHeaderControl::Paint( vcl::RenderContext& /*rRenderContext*/, const 
tools::Rectangle& rRect )
 {
 // It is important for VCL to have few calls, that is why the outer lines 
are
@@ -338,21 +301,12 @@ void ScHeaderControl::Paint( vcl::RenderContext& 
/*rRenderContext*/, const tools
 
 if ( nLineEnd * nLayoutSign >= nInitScrPos * nLayoutSign )
 {
-if ( bHighContrast )
-{
-// high contrast: single-color background
-SetFillColor( rStyleSettings.GetFaceColor() );
-if ( bVertical )
-aFillRect = tools::Rectangle( 0, nInitScrPos, nBarSize-1, 
nLineEnd );
-else
-aFillRect = tools::Rectangle( nInitScrPos, 0, nLineEnd, 
nBarSize-1 );
-DrawRect( aFillRect );
-}
+SetFillColor( rStyleSettings.GetFaceColor() );
+if ( bVertical )
+aFillRect = tools::Rectangle( 0, nInitScrPos, nBarSize-1, nLineEnd 
);
 else
-{
-// normal: 3-part background
-DrawShadedRect( nInitScrPos, nLineEnd, 
rStyleSettings.GetFaceColor() );
-}
+aFillRect = tools::Rectangle( nInitScrPos, 0, nLineEnd, nBarSize-1 
);
+DrawRect( aFillRect );
 }
 
 if ( nLineEnd * nLayoutSign < nPEnd * nLayoutSign )
@@ -369,25 +323,27 @@ void ScHeaderControl::Paint( vcl::RenderContext& 
/*rRenderContext*/, const tools
 {
 if ( nTransEnd * nLayoutSign >= nTransStart * nLayoutSign )
 {
+if (bVertical)
+aFillRect = tools::Rectangle( 0, nTransStart, nBarSize-1, 
nTransEnd );
+else
+aFillRect = tools::Rectangle( nTransStart, 0, nTransEnd, 
nBarSize-1 );
+
 if ( bHighContrast )
 {
 if ( bDark )
 {
 //  solid grey background for dark face color is drawn 
before lines
-
 SetLineColor();
 SetFillColor( COL_LIGHTGRAY );
-if (bVertical)
-DrawRect( tools::Rectangle( 0, nTransStart, 
nBarSize-1, nTransEnd ) );
-else
-DrawRect( tool

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc   |   80 +-
 cui/source/dialogs/tipofthedaydlg.cxx |   16 +-
 2 files changed, 54 insertions(+), 42 deletions(-)

New commits:
commit 78c6b79f2a05eb92f41037fd20c6579a0a644c47
Author: Heiko Tietze 
AuthorDate: Wed Sep 25 17:31:00 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 1 10:56:36 2019 +0200

Resolves tdf#127756 - Tip of the day not localized

Introduced %LANGUAGENAME token being replaced with
BCP47 for pt, en, zh or ISO otherwise

Change-Id: Iaa7168731e0f6a8e0dd1e906ff0ef646534d9f4b
Reviewed-on: https://gerrit.libreoffice.org/79564
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 8977f718f945..b0e8b11f23a2 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -43,48 +43,48 @@
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can open and save files stored 
on remote servers per CMIS."), "fps/ui/remotefilesdialog/RemoteFilesDialog", 
""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/guide/cmis-remote-files.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Tools > AutoCorrect > AutoCorrect Options… 
> Replace provides a list of common substitutions. Take a look and complete 
with your own replacements."), "cui/ui/acoroptionspage/AutocorrectOptionsPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/06040100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/05130100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0119.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile, or to restore a non-working %PRODUCTNAME instance, go to Help > 
Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01040300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/guide/autotext.html
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01041100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows 
alphabetically or numerically per Tools > Sort."), 
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/0610.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to 
protect part of a text, show/hide text, reuse parts from other documents, use 
different column layout."), "modules/swriter/ui/sectionpage/SectionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/04020100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/scalc/01/02140700.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formatting > 
Manage in Calc to find out which cells have been defined with conditional 
formatting."), 
"modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSIO

[Libreoffice-commits] core.git: sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/appl/appserv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 787647b488d02be2acbbad4fa7873508dcb926c2
Author: Heiko Tietze 
AuthorDate: Mon Sep 30 10:54:04 2019 +0200
Commit: Heiko Tietze 
CommitDate: Mon Sep 30 15:46:58 2019 +0200

Resolves tdf#127401 - Release notes / What's new not localized

lang replaced by bcp47

Change-Id: I6f3f68bce7a4ead7bb325ce64e4ad0c0f2e7f188
Reviewed-on: https://gerrit.libreoffice.org/79835
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 3fb832faaa0f..a7ede6f37492 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -587,7 +587,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 // Open release notes depending on version and locale
 OUString 
sURL(officecfg::Office::Common::Menus::ReleaseNotesURL::get() + 
//https://hub.libreoffice.org/ReleaseNotes/
 "?LOvers=" + utl::ConfigManager::getProductVersion() +
-"&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getLanguage() );
+"&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() );
 sfx2::openUriExternally(sURL, false);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig cui/inc cui/source dbaccess/uiconfig extensions/uiconfig framework/uiconfig include/sfx2 officecfg/registry reportdesign/uiconfig sc/uic

[Heiko Tietze (via logerrit)]

 basctl/uiconfig/basicide/menubar/menubar.xml |1 
 chart2/uiconfig/menubar/menubar.xml  |1 
 cui/inc/tipoftheday.hrc  |1 
 cui/source/dialogs/tipofthedaydlg.cxx|   31 
+-
 cui/source/inc/tipofthedaydlg.hxx|6 -
 dbaccess/uiconfig/dbapp/menubar/menubar.xml  |1 
 dbaccess/uiconfig/dbquery/menubar/menubar.xml|1 
 dbaccess/uiconfig/dbrelation/menubar/menubar.xml |1 
 dbaccess/uiconfig/dbtable/menubar/menubar.xml|1 
 dbaccess/uiconfig/dbtdata/menubar/menubar.xml|1 
 extensions/uiconfig/sbibliography/menubar/menubar.xml|1 
 framework/uiconfig/startmodule/menubar/menubar.xml   |1 
 include/sfx2/sfxsids.hrc |2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   14 

 officecfg/registry/schema/org/openoffice/Office/Common.xcs   |6 +
 reportdesign/uiconfig/dbreport/menubar/menubar.xml   |1 
 sc/uiconfig/scalc/menubar/menubar.xml|1 
 sd/uiconfig/sdraw/menubar/menubar.xml|1 
 sd/uiconfig/simpress/menubar/menubar.xml |1 
 sfx2/sdi/appslots.sdi|4 +
 sfx2/sdi/sfx.sdi |   17 
+
 sfx2/source/appl/appserv.cxx |9 ++
 sfx2/source/view/viewfrm.cxx |   10 ---
 starmath/uiconfig/smath/menubar/menubar.xml  |1 
 sw/uiconfig/sglobal/menubar/menubar.xml  |1 
 sw/uiconfig/sweb/menubar/menubar.xml |1 
 sw/uiconfig/swform/menubar/menubar.xml   |1 
 sw/uiconfig/swreport/menubar/menubar.xml |1 
 sw/uiconfig/swriter/menubar/menubar.xml  |1 
 sw/uiconfig/swxform/menubar/menubar.xml  |1 
 30 files changed, 95 insertions(+), 25 deletions(-)

New commits:
commit 97bcd0e416b1fb725b5aaade811e80d46fdaf1e2
Author: Heiko Tietze 
AuthorDate: Fri Sep 6 10:34:54 2019 +0200
Commit: Heiko Tietze 
CommitDate: Mon Sep 23 07:51:01 2019 +0200

Resolves tdf#127400 - Allow to show tip of the day again

* UNO command TipOfTheDay and slot SID_TIPOFTHEDAY
  introduced and added to help menus
* Tip ID introduced to keep the current tip over the day
* Tip ID updates after 24h
* Randomization of tips replaced by sequential order
* Tip ID added to the dialog title

Change-Id: I69b72b80d6d6afa25a1c4f01fa05bc60b5741db8
Reviewed-on: https://gerrit.libreoffice.org/78693
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 290bb6a7de36..ac59065c9daf 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -159,6 +159,7 @@
 
 
 
+
 
 
 
diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index d3dbf57b54a5..354ebbc1903a 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -160,6 +160,7 @@
   
   
   
+  
   
   
   
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 16f79af26497..8977f718f945 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -263,6 +263,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
 
 #define STR_HELP_LINK   NC_("STR_HELP_LINK", "%PRODUCTNAME 
Help")
 #define STR_MORE_LINK   NC_("STR_MORE_LINK", "More info")
+#define STR_TITLE   NC_("STR_TITLE", "Tip of the Day")
 
 #endif //INCLUDED_CUI_INC_TIPOFTHEDAY_HRC
 
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 2ee5518c5274..55e9b51b9003 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 
 TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", 
"TipOfTheDayDialog")
@@ -38,11 +37,17 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 , m_pNext(m_xBuilder->weld_button("btnNext"))
 , m_pLink(m_xBuilder->weld_link_button("btnLink"))
 {
-m_pShowTip->connect_toggled(LINK(this, TipOfTheDayDialo

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 22f3cca81039ac97bee96ba47498fbea1ccc1557
Author: Heiko Tietze 
AuthorDate: Fri Sep 13 10:55:28 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Sep 13 14:25:24 2019 +0200

Revert "Resolves tdf#127317 - Make text of tips of the day selectable"

Selectable text makes the GtkLabel unwrap; revert is needed until the 
control works properly

This reverts commit 54a3044ebd7f946235ba1d0a8af11ad94872afb7.

Change-Id: I7b63e0e29a22f3feddac99ac42735a1880a9b1c2
Reviewed-on: https://gerrit.libreoffice.org/78864
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index 8807f7bb6dfe..a24a90107243 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -140,7 +140,6 @@
 False
 True
 True
-True
 50
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3d85f485dee1c4e0c3a30f2e088fe34be69e1b06
Author: Heiko Tietze 
AuthorDate: Sun Sep 8 11:29:29 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Sep 13 12:07:22 2019 +0200

Resolves tdf#127436 - Display issues of TotD on macOS

Dialog resizing blocked

Change-Id: Ie61880d2d08adabf64a60e97a9bf00c02247f1ce
Reviewed-on: https://gerrit.libreoffice.org/78761
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index ee8ac6cbd17a..8807f7bb6dfe 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -6,7 +6,9 @@
 False
 6
 Tip of the day
+False
 True
+center-on-parent
 dialog
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/dialog/dinfdlg.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0701a1838280d4fa9c54ca39f1a5297fe4857a16
Author: Heiko Tietze 
AuthorDate: Thu Sep 5 09:36:42 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Sep 12 23:30:01 2019 +0200

Resolves tdf#125531 - Empty CMIS properties dialog

CMIS tab hidden when not isCmisDocument(), ie. no elements

Change-Id: Ib682aa62ae5035a9ecb107fec709d243764346d9
Reviewed-on: https://gerrit.libreoffice.org/78625
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 86d39b6cf4cf..2b49b18bfc3b 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1128,6 +1128,8 @@ 
SfxDocumentInfoDialog::SfxDocumentInfoDialog(weld::Window* pParent, const SfxIte
 AddTabPage("description", SfxDocumentDescPage::Create, nullptr);
 AddTabPage("customprops", SfxCustomPropertiesPage::Create, nullptr);
 AddTabPage("cmisprops", SfxCmisPropertiesPage::Create, nullptr);
+if (!rInfoItem.isCmisDocument())
+m_xTabCtrl->get_page("cmisprops")->hide();
 AddTabPage("security", SfxSecurityPage::Create, nullptr);
 }
 
@@ -2248,6 +2250,7 @@ 
SfxCmisPropertiesPage::SfxCmisPropertiesPage(TabPageParent pParent, const SfxIte
 : SfxTabPage(pParent, "sfx/ui/cmisinfopage.ui", "CmisInfoPage", &rItemSet)
 , m_xPropertiesCtrl(new CmisPropertiesControl(*m_xBuilder))
 {
+
 }
 
 void SfxCmisPropertiesPage::dispose()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/uiconfig

[Heiko Tietze (via logerrit)]

 sfx2/uiconfig/ui/helpmanual.ui |   53 -
 1 file changed, 27 insertions(+), 26 deletions(-)

New commits:
commit 8a231fc4114d435f92cfda36aa2e5e38ecef0ada
Author: Heiko Tietze 
AuthorDate: Wed Sep 4 11:02:16 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Sep 12 23:17:16 2019 +0200

Resolves tdf#127195 - Placement of "Don't show again" box in No help

Placed in one row with action buttons

Change-Id: I0ac792afed10f0a4f78d7ce170db9db176c76974
Reviewed-on: https://gerrit.libreoffice.org/78585
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
index fd1ea563eb2c..dfa8d8990e7e 100644
--- a/sfx2/uiconfig/ui/helpmanual.ui
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -18,6 +18,24 @@
 
   
 False
+True
+end
+
+  
+>Do not show this dialog again
+True
+True
+False
+0
+True
+  
+  
+False
+False
+0
+True
+  
+
 
   
 Read Help Online
@@ -27,9 +45,9 @@
 True
   
   
-True
-True
-0
+False
+False
+1
   
 
 
@@ -43,34 +61,17 @@
 True
   
   
-True
-True
-1
+False
+False
+2
   
 
   
   
 False
-False
-0
-  
-
-
-  
-Do not show this dialog again
-True
-True
-False
-start
-100
-False
-0
-True
-  
-  
-False
 True
-2
+end
+0
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-2' - sc/source

[Heiko Tietze (via logerrit)]

 sc/source/ui/app/inputwin.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 856565e99d9f3245d1ccb0563eeed6cdfd557afc
Author: Heiko Tietze 
AuthorDate: Mon Sep 9 18:13:10 2019 +0200
Commit: Heiko Tietze 
CommitDate: Mon Sep 9 18:13:31 2019 +0200

Revert "tdf#127066 Font size of Calc input bar aligned to UI font size"

Mistakenly picked for 6.3.2, it should have been 6.3.

This reverts commit b613ca105b080bb275d6f687b6b443b10b27c284.

Change-Id: I17f061ed9871a264a1c6ed32178ab61d094876db
Reviewed-on: https://gerrit.libreoffice.org/78783
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 216a5bd6477e..e206a3506669 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -74,6 +74,7 @@ namespace com::sun::star::accessibility { class XAccessible; }
 
 const long THESIZE = 100;// Should be more than enough!
 const long INPUTLINE_INSET_MARGIN = 2;   // Space between border and interior 
widgets of input line
+const long MIN_FONT_SIZE = 16;   // Minimum font size of input line in 
pixels
 const long LEFT_OFFSET = 5;  // Left offset of input line
 const long BUTTON_OFFSET = 2;// Space between input line and 
button to expand/collapse
 const long MULTILINE_BUTTON_WIDTH = 20;  // Width of the button which opens 
multiline dropdown
@@ -1433,6 +1434,8 @@ ScTextWnd::ScTextWnd(ScTextWndGroup* pParent, 
ScTabViewShell* pViewSh)
 vcl::Font aAppFont = GetFont();
 aTextFont = aAppFont;
 Size aFontSize = aAppFont.GetFontSize();
+if (aFontSize.Height() < MIN_FONT_SIZE)
+aFontSize.setHeight(MIN_FONT_SIZE);
 aTextFont.SetFontSize(PixelToLogic(aFontSize, MapMode(MapUnit::MapTwip)));
 
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 729ba6b6f79884cdd4a24bc9326a06a2c319fc04
Author: Heiko Tietze 
AuthorDate: Fri Sep 6 09:06:57 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Sep 6 14:01:00 2019 +0200

Resolves tdf#127317 - Make text of tips of the day selectable

Change-Id: If0e0b04be8f7086d18fe3481c3bd8f65b48a0676
Reviewed-on: https://gerrit.libreoffice.org/78683
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 54a3044ebd7f946235ba1d0a8af11ad94872afb7)
Reviewed-on: https://gerrit.libreoffice.org/78698
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index 49748809c52c..ee8ac6cbd17a 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -138,6 +138,7 @@
 False
 True
 True
+True
 50
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/uiconfig

[Heiko Tietze (via logerrit)]

 vcl/inc/printdlg.hxx   |5 +++
 vcl/source/window/printdlg.cxx |   31 +
 vcl/uiconfig/ui/printdialog.ui |   60 ++---
 3 files changed, 86 insertions(+), 10 deletions(-)

New commits:
commit 9b021e87e04f4ab294d8cefb5d54bfe29e1e85dd
Author: Heiko Tietze 
AuthorDate: Thu Sep 5 11:01:52 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Sep 6 13:59:18 2019 +0200

Resolves tdf#125130 - UI: Show 'Go to first/last page' in new print dialog

Buttons added
gtk-media* replaced by gtk-go*

Change-Id: I274bccb747d6f5e899e826ee8bebf3c1127e6374
Reviewed-on: https://gerrit.libreoffice.org/78635
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 137f6a47a40c..4aad50314fc4 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -122,6 +122,8 @@ namespace vcl
 void setPaperSizes();
 void previewForward();
 void previewBackward();
+void previewFirst();
+void previewLast();
 
 private:
 
@@ -153,6 +155,9 @@ namespace vcl
 
 VclPtr  mpBackwardBtn;
 VclPtr  mpForwardBtn;
+VclPtr  mpFirstBtn;
+VclPtr  mpLastBtn;
+
 VclPtrmpPreviewBox;
 VclPtr   mpNumPagesText;
 VclPtr  mpPreviewWindow;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 0fa17941e317..3289e2e02620 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -533,6 +533,8 @@ PrintDialog::PrintDialog(vcl::Window* i_pWindow, const 
std::shared_ptrSetStyle( mpForwardBtn->GetStyle() | WB_BEVELBUTTON );
 mpBackwardBtn->SetStyle( mpBackwardBtn->GetStyle() | WB_BEVELBUTTON );
+mpFirstBtn->SetStyle( mpFirstBtn->GetStyle() | WB_BEVELBUTTON );
+mpLastBtn->SetStyle( mpLastBtn->GetStyle() | WB_BEVELBUTTON );
 
 maPageStr = mpNumPagesText->GetText();
 
@@ -661,6 +665,8 @@ PrintDialog::PrintDialog(vcl::Window* i_pWindow, const 
std::shared_ptrSetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
 mpBackwardBtn->SetClickHdl(LINK(this, PrintDialog, ClickHdl));
 mpForwardBtn->SetClickHdl(LINK(this, PrintDialog, ClickHdl));
+mpFirstBtn->SetClickHdl(LINK(this, PrintDialog, ClickHdl));
+mpLastBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
 mpPreviewBox->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
 mpBorderCB->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
 
@@ -704,6 +710,8 @@ void PrintDialog::dispose()
 mpNumPagesText.clear();
 mpBackwardBtn.clear();
 mpForwardBtn.clear();
+mpFirstBtn.clear();
+mpLastBtn.clear();
 mpPreviewBox.clear();
 mpOKButton.clear();
 mpCancelButton.clear();
@@ -954,6 +962,9 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
 
 mpForwardBtn->Enable( false );
 mpBackwardBtn->Enable( false );
+mpFirstBtn->Enable( false );
+mpLastBtn->Enable( false );
+
 mpPageEdit->Enable( false );
 
 return;
@@ -986,6 +997,8 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
 
 mpForwardBtn->Enable( mnCurPage < nPages-1 );
 mpBackwardBtn->Enable( mnCurPage != 0 );
+mpFirstBtn->Enable( mnCurPage != 0 );
+mpLastBtn->Enable( mnCurPage < nPages-1 );
 mpPageEdit->Enable( nPages > 1 );
 }
 
@@ -1825,6 +1838,14 @@ IMPL_LINK ( PrintDialog, ClickHdl, Button*, pButton, 
void )
 {
 previewBackward();
 }
+else if( pButton == mpFirstBtn )
+{
+previewFirst();
+}
+else if( pButton == mpLastBtn )
+{
+previewLast();
+}
 else if( pButton == mpBrochureBtn )
 {
 PropertyValue* pVal = getValueForWindow( pButton );
@@ -2126,6 +2147,16 @@ void PrintDialog::previewBackward()
 mpPageEdit->Down();
 }
 
+void PrintDialog::previewFirst()
+{
+mpPageEdit->First();
+}
+
+void PrintDialog::previewLast()
+{
+mpPageEdit->Last();
+}
+
 // PrintProgressDialog
 PrintProgressDialog::PrintProgressDialog(weld::Window* i_pParent, int i_nMax)
 : GenericDialogController(i_pParent, "vcl/ui/printprogressdialog.ui", 
"PrintProgressDialog")
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index bdcf861f83bd..a1ddf06e5c5d 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -17,18 +17,28 @@
 1
 10
   
-  
+  
 True
 False
-gtk-media-previous
+gtk-go-back
 1
   
-  
+  
 True
 False
-gtk-media-next
+gtk-goto-first
+  
+  
+True
+False
+gtk-go-forward
 1
   
+  
+True
+False
+gtk-goto-last
+  
   
 
   
@@ -255,18 +265,33 @@
 10
 6
 
+  
+   

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54a3044ebd7f946235ba1d0a8af11ad94872afb7
Author: Heiko Tietze 
AuthorDate: Fri Sep 6 09:06:57 2019 +0200
Commit: Heiko Tietze 
CommitDate: Fri Sep 6 10:43:55 2019 +0200

Resolves tdf#127317 - Make text of tips of the day selectable

Change-Id: If0e0b04be8f7086d18fe3481c3bd8f65b48a0676
Reviewed-on: https://gerrit.libreoffice.org/78683
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index 49748809c52c..ee8ac6cbd17a 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -138,6 +138,7 @@
 False
 True
 True
+True
 50
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/uiconfig

[Heiko Tietze (via logerrit)]

 sfx2/uiconfig/ui/autoredactdialog.ui |  120 ++-
 1 file changed, 49 insertions(+), 71 deletions(-)

New commits:
commit 9d52758d7db507948e1f70f8c6d47b05a1fdefb3
Author: Heiko Tietze 
AuthorDate: Wed Sep 4 11:19:22 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Sep 5 11:05:13 2019 +0200

Resolves tdf#126431 - Placement of buttons in AutoRedact dialog

Buttons moved to the side
Sizegroups deleted, some some between buttons added

Change-Id: Ie0809c7a26792d2aef9a8ad60c5ad909558d00af
Reviewed-on: https://gerrit.libreoffice.org/78586
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/uiconfig/ui/autoredactdialog.ui 
b/sfx2/uiconfig/ui/autoredactdialog.ui
index ce64d392fb9d..e6602d51c40f 100644
--- a/sfx2/uiconfig/ui/autoredactdialog.ui
+++ b/sfx2/uiconfig/ui/autoredactdialog.ui
@@ -84,6 +84,7 @@
   
 False
 False
+end
 5
   
 
@@ -91,6 +92,7 @@
   
 True
 False
+True
 
   
 True
@@ -212,7 +214,10 @@
   
 True
 False
+6
+6
 vertical
+True
 start
 
   
@@ -220,7 +225,7 @@
 True
 True
 True
-3
+1
   
   
 True
@@ -235,7 +240,6 @@
 True
 True
 True
-3
   
   
 True
@@ -244,6 +248,48 @@
 1
   
 
+
+  
+Add Target
+True
+True
+True
+6
+1
+  
+  
+False
+False
+2
+  
+
+
+  
+Edit Target
+True
+True
+True
+1
+  
+  
+False
+False
+3
+  
+
+
+  
+Delete Target
+True
+True
+True
+  
+  
+False
+False
+4
+  
+
   
   
 1
@@ -255,62 +301,11 @@
 
   
   
-True
+False
 True
 3
   
 
-
-  
-True
-False
-6
-
-  
-Add
-True
-True
-True
-  
-  
-False
-False
-0
-  
-
-
-  
-Edit
-True
-True
-True
-  
-  
-False
-False
-1
-  
-
-
-  
-Delete
-True
-True
-True
-  
-  
-False
-False
-2
-  
-
-  
-  
-False
-False
-4
-  
-
   
 
 
@@ -319,21 +314,4 @@
   cancel
 
   
-  
-both
-
-  
-  
-
-  
-  
-
-  
-  
-  
-  
-  
-  
-
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/source

[Heiko Tietze (via logerrit)]

 vcl/inc/bitmaps.hlst  |2 +
 vcl/source/window/toolbox.cxx |   74 +-
 2 files changed, 11 insertions(+), 65 deletions(-)

New commits:
commit e8acfdb4428523e10fe63728f36bc0d8ddd9a9d8
Author: Heiko Tietze 
AuthorDate: Wed Sep 4 16:07:42 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Sep 5 11:05:39 2019 +0200

Resolves tdf#125296 - Replace hard-coded chevron by themable icon

Chevron now taken from sfx2/res/chevron.png
Vertical toolbars don't have a rotated icon anymore

Change-Id: Idf6c11ba818b8ca1860da61cb51d3003aff01e56
Reviewed-on: https://gerrit.libreoffice.org/78604
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-by: Heiko Tietze 

diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 1aa8d16a28cb..667bf76b3ade 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -216,6 +216,8 @@
 #define RID_CURSOR_HIDE_WHITESPACE   "vcl/res/hide_whitespace.png"
 #define RID_CURSOR_SHOW_WHITESPACE   "vcl/res/show_whitespace.png"
 
+#define CHEVRON  "sfx2/res/chevron.png"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index dc95384128cf..fbc18c08e7cd 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2356,72 +2357,15 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl, Timer *, void)
 ImplFormat();
 }
 
-static void ImplDrawMoreIndicator(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect, bool bRotate )
+static void ImplDrawMoreIndicator(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect)
 {
-rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
-rRenderContext.SetLineColor();
-
-if 
(rRenderContext.GetSettings().GetStyleSettings().GetFaceColor().IsDark())
-rRenderContext.SetFillColor(COL_WHITE);
-else
-rRenderContext.SetFillColor(COL_BLACK);
-float fScaleFactor = rRenderContext.GetDPIScaleFactor();
-
-int linewidth = 1 * fScaleFactor;
-int space = 4 * fScaleFactor;
-
-if( !bRotate )
-{
-long width = 8 * fScaleFactor;
-long height = 5 * fScaleFactor;
-
-//Keep odd b/c drawing code works better
-if ( height % 2 == 0 )
-height--;
-
-long heightOrig = height;
-
-long x = rRect.Left() + (rRect.getWidth() - width)/2 + 1;
-long y = rRect.Top() + (rRect.getHeight() - height)/2 + 1;
-while( height >= 1)
-{
-rRenderContext.DrawRect( tools::Rectangle( x, y, x + linewidth, y 
) );
-x += space;
-rRenderContext.DrawRect( tools::Rectangle( x, y, x + linewidth, y 
) );
-x -= space;
-y++;
-if( height <= heightOrig / 2 + 1) x--;
-elsex++;
-height--;
-}
-}
-else
-{
-long width = 5 * fScaleFactor;
-long height = 8 * fScaleFactor;
-
-//Keep odd b/c drawing code works better
-if (width % 2 == 0)
-width--;
-
-long widthOrig = width;
+const Image pImage = Image(StockImage::Yes, CHEVRON);
+Size aImageSize = pImage.GetSizePixel();
+long x = rRect.Left() + (rRect.getWidth() - aImageSize.Width())/2;
+long y = rRect.Top() + (rRect.getHeight() - aImageSize.Height())/2;
+DrawImageFlags nImageStyle = DrawImageFlags::NONE;
 
-long x = rRect.Left() + (rRect.getWidth() - width)/2 + 1;
-long y = rRect.Top() + (rRect.getHeight() - height)/2 + 1;
-while( width >= 1)
-{
-rRenderContext.DrawRect( tools::Rectangle( x, y, x, y + linewidth 
) );
-y += space;
-rRenderContext.DrawRect( tools::Rectangle( x, y, x, y + linewidth 
) );
-y -= space;
-x++;
-if( width <= widthOrig / 2 + 1) y--;
-else   y++;
-width--;
-}
-}
-
-rRenderContext.Pop();
+rRenderContext.DrawImage(Point(x,y), pImage, nImageStyle);
 }
 
 static void ImplDrawDropdownArrow(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rDropDownRect, bool bSetColor, bool bRotate )
@@ -2496,7 +2440,7 @@ void ToolBox::ImplDrawMenuButton(vcl::RenderContext& 
rRenderContext, bool bHighl
 ImplDrawButton(rRenderContext, mpData->maMenubuttonItem.maRect, 2, 
false, true, false );
 
 if (ImplHasClippedItems())
-ImplDrawMoreIndicator(rRenderContext, 
mpData->maMenubuttonItem.maRect, !mbHorz);
+ImplDrawMoreIndicator(rRenderContext, 
mpData->maMenubuttonItem.maRect);
 
 // store highlight state
 mpData->mbMenubuttonSelected = bHighlight;
___
Libreoffice-commits mailing list
libreoffice-comm...@

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-1' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/optgeneralpage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 90d1f7aed2729ed39d2bd88e4b719735146632d8
Author: Heiko Tietze 
AuthorDate: Mon Aug 19 10:35:41 2019 +0200
Commit: Heiko Tietze 
CommitDate: Wed Aug 28 08:03:37 2019 +0200

Resolves tdf#126805 - Alignment of Tip-of-the-day label

Change-Id: Ic4845dd87325ec952b8b987b69eedd8530b1cf02
Reviewed-on: https://gerrit.libreoffice.org/77703
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 96b5152e0009ff0ea26200d9b6e4bd3e0e8073ed)
Reviewed-on: https://gerrit.libreoffice.org/77876
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 
(cherry picked from commit 9074c9217a5301e192f77b174d8b1f68937f89ec)
Reviewed-on: https://gerrit.libreoffice.org/77877
Reviewed-by: Caolán McNamara 
Tested-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 9a87396b2679..56c3a5a88fd1 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -66,6 +66,7 @@
 True
 True
 False
+0
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc |   64 
 1 file changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 5c50f1a2d4487b9303974c7cf39d6208192a0c96
Author: Heiko Tietze 
AuthorDate: Tue Aug 27 08:40:56 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Aug 27 08:41:44 2019 +0200

Proof-read and fixes of Tip of the day strings

Change-Id: Ib33ab6c7b72164b61b21255f240b26ae5fb75a9e
Author: Mike Saunders
Reviewed-on: https://gerrit.libreoffice.org/78164
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 0045e5e1a60c..16f79af26497 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -48,7 +48,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/05130100.html
  { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0119.html
  { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile or to restore a non-working %PRODUCTNAME instance start Help > Restart 
in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html
+ { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile, or to restore a non-working %PRODUCTNAME instance, go to Help > 
Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01040300.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/guide/autotext.html
  { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01041100.html
@@ -87,24 +87,24 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Frames can be linked so that the text can 
flow from one to the other as in desktop publishing."), 
"https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/guide/text_frame.html";,
 "tipoftheday_w.png"}, //local help missing
 
  { NC_("RID_CUI_TIPOFTHEDAY", "Get help from the community via the Ask 
portal."), "https://ask.libreoffice.org";, ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has great extensions to 
increase your productivity, check them out."), 
"https://extensions.libreoffice.org";, ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a template center to 
create good looking documents, check it out."), 
"http://templates.libreoffice.org/template-center";, ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Embedded help is available by clicking on 
F1, if you've installed it. Otherwise check online at:"), 
"https://help.libreoffice.org";, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has great extensions to 
increase your productivity - check them out."), 
"https://extensions.libreoffice.org";, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a template center to 
create good looking documents - check it out."), 
"http://templates.libreoffice.org/template-center";, ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Embedded help is available by pressing F1, 
if you've installed it. Otherwise check online at:"), 
"https://help.libreoffice.org";, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Get %PRODUCTNAME documentation and free 
user guide books at:"), "http://www.libreoffice.org/get-help/documenta

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/optgeneralpage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9074c9217a5301e192f77b174d8b1f68937f89ec
Author: Heiko Tietze 
AuthorDate: Mon Aug 19 10:35:41 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Aug 21 12:50:40 2019 +0200

Resolves tdf#126805 - Alignment of Tip-of-the-day label

Change-Id: Ic4845dd87325ec952b8b987b69eedd8530b1cf02
Reviewed-on: https://gerrit.libreoffice.org/77703
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 96b5152e0009ff0ea26200d9b6e4bd3e0e8073ed)
Reviewed-on: https://gerrit.libreoffice.org/77876
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 9a87396b2679..56c3a5a88fd1 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -66,6 +66,7 @@
 True
 True
 False
+0
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/optgeneralpage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 96b5152e0009ff0ea26200d9b6e4bd3e0e8073ed
Author: Heiko Tietze 
AuthorDate: Mon Aug 19 10:35:41 2019 +0200
Commit: Heiko Tietze 
CommitDate: Wed Aug 21 10:44:13 2019 +0200

Resolves tdf#126805 - Alignment of Tip-of-the-day label


Change-Id: Ic4845dd87325ec952b8b987b69eedd8530b1cf02
Reviewed-on: https://gerrit.libreoffice.org/77703
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 2e8d70a8e590..dc1fa2231ecf 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -65,6 +65,7 @@
 True
 True
 False
+0
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/uiconfig

[Heiko Tietze (via logerrit)]

 sw/uiconfig/swriter/toolbar/textstylebar.xml |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 55291868dd1b73d2ba4ec2aa75889e10377d5bef
Author: Heiko Tietze 
AuthorDate: Thu Aug 15 11:22:15 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Aug 15 15:45:01 2019 +0200

tdf#53847 - Styles focused toolbar

Improved the focus on style by hiding a few direct formatting functions

Change-Id: Icd98472d5ecaf79c9612cbd9be654abd935077d5
Reviewed-on: https://gerrit.libreoffice.org/77496
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml 
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 5183383c00d5..70a6e12ee629 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -60,23 +60,23 @@
  
  
  
- 
+ 
  
  
  
  
- 
- 
+ 
+ 
  
  
  
  
  
  
- 
- 
- 
- 
+ 
+ 
+ 
+ 
  
  
  
@@ -89,8 +89,8 @@
  
  
  
- 
+ 
  
- 
- 
+ 
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Heiko Tietze (via logerrit)]

 sw/source/core/doc/poolfmt.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 744f70386727c78a19bd7c1de7425392b98783c7
Author: Heiko Tietze 
AuthorDate: Tue Aug 13 11:48:22 2019 +0200
Commit: Heiko Tietze 
CommitDate: Wed Aug 14 09:59:14 2019 +0200

Resolves tdf#126257 - Writer styles hierarchical organization

Index styles moved below Index Heading

Change-Id: I178dcb668abe225a25ce35108b1bba4a73ffa960
Reviewed-on: https://gerrit.libreoffice.org/77394
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 811099a7cc99..25e14f832019 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -282,14 +282,16 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
 case RES_POOLCOLL_REGISTER_BASE:
 nRet = RES_POOLCOLL_STANDARD;   break;
 
+case RES_POOLCOLL_TOX_IDXH:
+nRet = RES_POOLCOLL_HEADLINE_BASE;  break;
+
 case RES_POOLCOLL_TOX_USERH:
 case RES_POOLCOLL_TOX_CNTNTH:
-case RES_POOLCOLL_TOX_IDXH:
 case RES_POOLCOLL_TOX_ILLUSH:
 case RES_POOLCOLL_TOX_OBJECTH:
 case RES_POOLCOLL_TOX_TABLESH:
 case RES_POOLCOLL_TOX_AUTHORITIESH:
-nRet = RES_POOLCOLL_HEADLINE_BASE;  break;
+nRet = RES_POOLCOLL_TOX_IDXH;   break;
 
 default:
 nRet = RES_POOLCOLL_REGISTER_BASE;  break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig

[Heiko Tietze (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |5 
+
 sw/uiconfig/sglobal/menubar/menubar.xml |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml|2 +-
 sw/uiconfig/swform/menubar/menubar.xml  |2 +-
 sw/uiconfig/swreport/menubar/menubar.xml|2 +-
 sw/uiconfig/swriter/menubar/menubar.xml |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml |2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 21a792f1756a1370476e66538e821e402df83799
Author: Heiko Tietze 
AuthorDate: Thu Aug 8 13:09:17 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Aug 8 16:47:10 2019 +0200

Resolves tdf#126608 - Unclear page formatting

Page entry moved into the next section and
renamed to Page Style to make the difference
to direct formatting more clear

Change-Id: I1e75f9c82d459e35329231b06fa695651564f0c2
Reviewed-on: https://gerrit.libreoffice.org/77148
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8d070ffcb6af..2251c361e5a3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1175,11 +1175,8 @@
 
   
   
-
-  Page Settings
-
 
-  ~Page...
+  ~Page Style...
 
 
   1
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 75c79dd05940..948c4ca43d3a 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -441,8 +441,8 @@
   
   
   
-  
   
+  
   
   
   
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index f94e3e9d34ba..b7e77d4413ef 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -314,8 +314,8 @@
   
   
   
-  
   
+  
   
   
   
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index bb1d9c0dae6e..af9c0cc25cae 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -393,8 +393,8 @@
   
   
   
-  
   
+  
   
   
   
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index dfad1b71be72..e186e9086933 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -379,8 +379,8 @@
   
   
   
-  
   
+  
   
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 90fce81ab199..2ad9f9b0186e 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -444,8 +444,8 @@
   
   
   
-  
   
+  
   
   
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 443c70d29e61..36505b49 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -440,8 +440,8 @@
   
   
   
-  
   
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Heiko Tietze (via logerrit)]

 sw/source/ui/table/instable.cxx|2 +-
 sw/source/uibase/shells/basesh.cxx |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 52e574ffd2450956645939abc50c83637c89df01
Author: Heiko Tietze 
AuthorDate: Tue Jul 30 14:28:11 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Aug 8 09:22:09 2019 +0200

Resolves tdf#124206 - Default style not applied

TableStyle name set correctly
Preselected table style None to satisfy ui tests

Change-Id: I00be482a24aaf9efa480226d6d6df56a7366f94f
Reviewed-on: https://gerrit.libreoffice.org/76599
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index f2d7f6f3c305..4d1225af9a27 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -147,7 +147,7 @@ void SwInsTableDlg::InitAutoTableFormat()
 // Change this min variable if you add autotable manually.
 minTableIndexInLb = 1;
 maxTableIndexInLb = minTableIndexInLb + 
static_cast(pTableTable->size());
-lbIndex = 1;
+lbIndex = 0;
 m_xLbFormat->select( lbIndex );
 tbIndex = lbIndexToTableIndex(lbIndex);
 
diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 287006ee13e9..8b1e5e39fe4c 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2742,7 +2742,6 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 rSh.GetTableFormat()->SetName( aTableName );
 
 if( pTAFormat != nullptr && !aAutoName.isEmpty()
-&& aAutoName != SwStyleNameMapper::GetUIName( 
RES_POOLTABSTYLE_DEFAULT, OUString() )
 && aAutoName != SwViewShell::GetShellRes()->aStrNone )
 {
 SwTableNode* pTableNode = const_cast( 
rSh.IsCursorInTable() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Heiko Tietze (via logerrit)]

 sfx2/source/control/recentdocsview.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit d43c6fa220524a09c0b24cbb5bc03c4456cd2515
Author: Heiko Tietze 
AuthorDate: Mon Jul 29 12:03:19 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Aug 6 09:26:08 2019 +0200

Resolves: tdf#125756 - MIME type icons on start center's thumbnails

Change-Id: If3cee18e7b143c641a884dc81059816b42b6f975
Reviewed-on: https://gerrit.libreoffice.org/76537
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 46314a428ab2..96dbd90b1fb3 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -239,6 +240,7 @@ void RecentDocsView::Reload()
 OUString aURL;
 OUString aTitle;
 BitmapEx aThumbnail;
+BitmapEx aModule;
 
 for ( const auto& rProp : rRecentEntry )
 {
@@ -263,6 +265,17 @@ void RecentDocsView::Reload()
 }
 }
 
+aModule = getDefaultThumbnail(aURL);
+if (!aModule.IsEmpty() && !aThumbnail.IsEmpty()) {
+ScopedVclPtr 
m_pVirDev(VclPtr::Create());
+Size aSize(aThumbnail.GetSizePixel());
+m_pVirDev->SetOutputSizePixel(aSize);
+m_pVirDev->DrawBitmapEx(Point(), aThumbnail);
+m_pVirDev->DrawBitmapEx(Point(aSize.Width()-50,aSize.Height()-50), 
Size(40,40), aModule);
+aThumbnail = m_pVirDev->GetBitmapEx(Point(), aSize);
+m_pVirDev.disposeAndClear();
+}
+
 if(!aURL.isEmpty())
 {
 INetURLObject  aURLObj( aURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/uiconfig

[Heiko Tietze (via logerrit)]

 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f38717a8025a37d1d7bf0c040df4fe9aca88b6f3
Author: Heiko Tietze 
AuthorDate: Thu Aug 1 10:46:47 2019 +0200
Commit: Heiko Tietze 
CommitDate: Thu Aug 1 16:26:23 2019 +0200

Resolves: tdf#126496 - "Page Fields" in pivot table unclear

Renamed to Filters

Change-Id: I512a06830635a8b6c62ca8a0ad64683f9824b9e0
Reviewed-on: https://gerrit.libreoffice.org/76777
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 1380840620bc..70f6fa11aeef 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -380,7 +380,7 @@
 True
 False
 4
-Page Fields:
+Filters:
 True
 listbox-page
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig sd/source

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/bulletandposition.ui  |  452 +++---
 sd/source/ui/dlg/BulletAndPositionDlg.cxx |2 
 sd/source/ui/inc/BulletAndPositionDlg.hxx |2 
 3 files changed, 243 insertions(+), 213 deletions(-)

New commits:
commit a34c898844abe9ad139d3ee22474726eed84351a
Author: Heiko Tietze 
AuthorDate: Wed Jul 24 10:45:14 2019 +0200
Commit: Heiko Tietze 
CommitDate: Mon Jul 29 12:11:09 2019 +0200

Resolves: tdf#126510 - Expander sections are bad UX

GtkExpander replaced by GtkFrames

Change-Id: I07130f7f070e45bf60ffb4fc26605b79556534b3
Reviewed-on: https://gerrit.libreoffice.org/76219
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/bulletandposition.ui 
b/cui/uiconfig/ui/bulletandposition.ui
index 44b850369869..c27d72e5dd4e 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -397,6 +397,100 @@
   
 
 
+  
+True
+False
+0
+none
+
+  
+True
+False
+12
+
+  
+350
+True
+False
+start
+6
+17
+
+  
+True
+False
+Before:
+True
+prefix
+0
+  
+  
+False
+True
+0
+  
+
+
+  
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+False
+After:
+True
+suffix
+0
+  
+  
+False
+True
+2
+  
+
+
+  
+True
+True
+True
+  
+  
+False
+True
+3
+  
+
+  
+
+  
+
+
+  
+True
+False
+Separator
+
+  
+
+  
+
+  
+  
+False
+True
+