[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac instsetoo_native/CustomTarget_setup.mk instsetoo_native/util

[Libreoffice Gerrit user]

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

New commits:
commit 77536b29b9241930256917fde7e5fc9513be9a7c
Author:     heiko tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Oct 18 12:12:26 2018 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Oct 22 13:38:18 2018 +0200

    tdf#120176 - Text appears as white on first launch
    
    Splash screen text should be black now
    
    Change-Id: I963ffc89c48fdc1de148586cd6f0fb4bf35d44bd
    Reviewed-on: https://gerrit.libreoffice.org/61924
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    (cherry picked from commit 920bf3979cd7421110b65621635aefc072e8a779)
    Reviewed-on: https://gerrit.libreoffice.org/62176
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/configure.ac b/configure.ac
index 38a39a35ebbb..df9441656bfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2119,7 +2119,7 @@ AC_ARG_WITH(branding,
                           bar from left,top. Comma separated decimal values.
                           PROGRESSFRAMECOLOR="20,136,3" Set color of progress
                           bar frame. Comma separated RGB decimal values.
-                          PROGRESSTEXTCOLOR="255,255,255" Set color of progress
+                          PROGRESSTEXTCOLOR="0,0,0" Set color of progress
                           bar text. Comma separated RGB decimal values.
                           PROGRESSTEXTBASELINE="287" Set vertical position of
                           progress bar text from top. Decimal value.
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index ebeb00dcd019..ec31d718a6a0 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -129,7 +129,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 		&& echo 'ProgressPositionHigh=46,212' \
 		&& echo 'ProgressSizeHigh=617,12' \
 		&& echo 'ProgressTextBaseline=145' \
-		&& echo 'ProgressTextColor=255,255,255' \
+		&& echo 'ProgressTextColor=0,0,0' \
 		&& echo 'SecureUserConfig=true' \
 		&& echo 'SecureUserConfigCompress=true' \
 		&& echo 'SecureUserConfigExtensions=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index afc8631cfd3a..8394418d5fe6 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -22,7 +22,7 @@ Globals
             PROGRESSPOSITIONHIGH 46,212
             PROGRESSFRAMECOLOR 102,102,102
             PROGRESSTEXTBASELINE 145
-            PROGRESSTEXTCOLOR 255,255,255
+            PROGRESSTEXTCOLOR 0,0,0
             NATIVEPROGRESS false
             REGISTRYLAYERNAME Layers
             SERVICEPACK 1