Rebased ref, commits from common ancestor:
commit 15411734fb5201c821167bc19984e3ff06467983
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Wed Aug 14 17:20:44 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Aug 14 22:16:10 2019 +0200
Bump version to 6.1.7.3
Change-Id: Ia9ea416138cad0244b672dee43b8b3e8261d990b
diff --git a/configure.ac b/configure.ac
index 118c15c8c22b..93e280a19074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice powered by
CIB],[6.1.7.2],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by
CIB],[6.1.7.3],[],[],[https://libreoffice.cib.eu/])
AC_PREREQ([2.59])
commit dc6e0f36962d8902a68a4b480f8698a0ae65f5a9
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Jul 30 11:18:45 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Aug 14 22:16:10 2019 +0200
tdf#126508 Fix crash when changing icon style
Regression from b58aa94f1f365c746135470bceb97cc182c289bc
Change-Id: I253447c197d8b333e26f243e26794e775f3edcee
Reviewed-on: https://gerrit.libreoffice.org/76603
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 5ed199f58f69..301bcf43bb3c 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -653,6 +653,8 @@ void SidebarController::SwitchToDeck (
const DeckDescriptor& rDeckDescriptor,
const Context& rContext)
{
+ maFocusManager.Clear();
+
const bool bForceNewDeck
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
const bool bForceNewPanels
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
mnRequestedForceFlags = SwitchFlag_NoForce;
commit 9286c2cf1fe5c91e8d7136308114fc9ab4b3e9eb
Author: Jan-Marek Glogowski <jan-marek.glogow...@extern.cib.de>
AuthorDate: Tue Jul 23 13:48:47 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Aug 14 22:16:09 2019 +0200
tdf#126597 don't use modeless dialog for senddoc.exe
There is already a large comment in initAttachmentList about
problems with MAPI_DIALOG_MODELESS. Using MAPI_DIALOG_MODELESS with
Outlook 2016 and multiple attachments sometimes produces a
MAPI_E_FAILURE, but most times it crashes for me. And it's not a
problem with the removed temporary files, as uncommenting that
shows the same problem. And there seems to be many more problems:
https://social.msdn.microsoft.com/Forums/en-US/5d8fece6-9d93-490c-9331-625c17e3291d/mapisendmailhelper-and-mapidialogmodeless
But actually I don't see any blocking of LO, if I switch to
using MAPI_DIALOG, as senddoc.exe already runs in the background.
So this switches MAPI_DIALOG_MODELESS to MAPI_DIALOG.
This reverts commit 5874c76371562c3e2d8564b1fb04df1997091d27
("tdf#116074: Use modeless dialogs with supporting mailers").
Change-Id: Ie0f8f22196d1a174dfeada2bc4aabb1717ee16a7
Reviewed-on: https://gerrit.libreoffice.org/76155
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
(cherry picked from commit e79f61340405dcc75f3fe41f727dea4ba4202c2e)
Reviewed-on: https://gerrit.libreoffice.org/76615
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/shell/source/win32/simplemail/senddoc.cxx
b/shell/source/win32/simplemail/senddoc.cxx
index 636a0d862f4e..4b8e09f48ccf 100644
--- a/shell/source/win32/simplemail/senddoc.cxx
+++ b/shell/source/win32/simplemail/senddoc.cxx
@@ -207,8 +207,9 @@ void initParameter(int argc, wchar_t* argv[])
if (_wcsicmp(argv[i], L"--mapi-dialog") == 0)
{
- // Outlook 2013+; for earlier versions this equals to MAPI_DIALOG
- gMapiFlags |= MAPI_DIALOG_MODELESS;
+ // MAPI_DIALOG_MODELESS has many problems and crashes Outlook 2016.
+ // see the commit message for a lengthy description.
+ gMapiFlags |= MAPI_DIALOG;
}
else if (_wcsicmp(argv[i], L"--mapi-logon-ui") == 0)
{
commit f93b4e06e8d06037f8f463534e0735b5e45afe7a
Author: Marina Latini (CIB) <marina.lat...@cib.de>
AuthorDate: Thu Jul 25 09:16:58 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Aug 14 22:16:08 2019 +0200
Branded logo for the startcenter
All the icon-themes are now using the CIB logo
in the start center.
The CIB icon set is including only the logo
and the start center banner.
That theme can be used also for custom builds
where are required different logos.
Change-Id: If5bbf5899088af0e1f37c0a56b74ab399b10b5e0
diff --git a/icon-themes/breeze/sfx2/res/logo.png
b/icon-themes/breeze/sfx2/res/logo.png
new file mode 100755
index 000000000000..ace737a89fd9
Binary files /dev/null and b/icon-themes/breeze/sfx2/res/logo.png differ
diff --git a/icon-themes/breeze/sfx2/res/startcenter-logo.png
b/icon-themes/breeze/sfx2/res/startcenter-logo.png
new file mode 100755
index 000000000000..17ae1e937963
Binary files /dev/null and b/icon-themes/breeze/sfx2/res/startcenter-logo.png
differ
diff --git a/icon-themes/colibre/sfx2/res/logo.png
b/icon-themes/colibre/sfx2/res/logo.png
index 3ae20b710bba..ace737a89fd9 100644
Binary files a/icon-themes/colibre/sfx2/res/logo.png and
b/icon-themes/colibre/sfx2/res/logo.png differ
diff --git a/icon-themes/colibre/sfx2/res/startcenter-logo.png
b/icon-themes/colibre/sfx2/res/startcenter-logo.png
index 78bc4ebd9e20..17ae1e937963 100644
Binary files a/icon-themes/colibre/sfx2/res/startcenter-logo.png and
b/icon-themes/colibre/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/elementary/sfx2/res/logo.png
b/icon-themes/elementary/sfx2/res/logo.png
new file mode 100755
index 000000000000..ace737a89fd9
Binary files /dev/null and b/icon-themes/elementary/sfx2/res/logo.png differ
diff --git a/icon-themes/elementary/sfx2/res/startcenter-logo.png
b/icon-themes/elementary/sfx2/res/startcenter-logo.png
index de93baa47a99..17ae1e937963 100644
Binary files a/icon-themes/elementary/sfx2/res/startcenter-logo.png and
b/icon-themes/elementary/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/karasa_jaga/sfx2/res/logo.png
b/icon-themes/karasa_jaga/sfx2/res/logo.png
index 9ba6acaaaa0d..ace737a89fd9 100644
Binary files a/icon-themes/karasa_jaga/sfx2/res/logo.png and
b/icon-themes/karasa_jaga/sfx2/res/logo.png differ
diff --git a/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png
b/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png
index 7d86c09d18fd..17ae1e937963 100755
Binary files a/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png and
b/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/sifr/sfx2/res/logo.png
b/icon-themes/sifr/sfx2/res/logo.png
new file mode 100755
index 000000000000..ace737a89fd9
Binary files /dev/null and b/icon-themes/sifr/sfx2/res/logo.png differ
diff --git a/icon-themes/sifr/sfx2/res/startcenter-logo.png
b/icon-themes/sifr/sfx2/res/startcenter-logo.png
new file mode 100755
index 000000000000..17ae1e937963
Binary files /dev/null and b/icon-themes/sifr/sfx2/res/startcenter-logo.png
differ
diff --git a/icon-themes/tango/sfx2/res/logo.png
b/icon-themes/tango/sfx2/res/logo.png
index 9ba6acaaaa0d..ace737a89fd9 100644
Binary files a/icon-themes/tango/sfx2/res/logo.png and
b/icon-themes/tango/sfx2/res/logo.png differ
diff --git a/icon-themes/tango/sfx2/res/startcenter-logo.png
b/icon-themes/tango/sfx2/res/startcenter-logo.png
index 78bc4ebd9e20..17ae1e937963 100644
Binary files a/icon-themes/tango/sfx2/res/startcenter-logo.png and
b/icon-themes/tango/sfx2/res/startcenter-logo.png differ
commit 4eb63e1841b59a7e523e59aa0c88207339dae230
Author: Marina Latini (CIB) <marina.lat...@cib.de>
AuthorDate: Tue Jul 23 17:49:13 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Aug 14 22:16:07 2019 +0200
Make splash screen info more visible
Splashcreen text and frame color are now white
for a better contrast on the CIB dark red.
Change-Id: I1991c0326c5257e664c18c09e3799865ce6cdc8a
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 6feb827aed65..569c6ed8f9c3 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -15,14 +15,14 @@ Globals
BASISPACKAGEPREFIX libreofficepoweredbycibbasis
UREPACKAGEPREFIX libreofficepoweredbycib
SOLSUREPACKAGEPREFIX libreoffice
- PROGRESSBARCOLOR 85,90,95
+ PROGRESSBARCOLOR 255,255,255
PROGRESSSIZE 460,6
PROGRESSSIZEHIGH 617,12
PROGRESSPOSITION 26,235
PROGRESSPOSITIONHIGH 46,212
- PROGRESSFRAMECOLOR 85,90,95
+ PROGRESSFRAMECOLOR 255,255,255
PROGRESSTEXTBASELINE 230
- PROGRESSTEXTCOLOR 85,90,95
+ PROGRESSTEXTCOLOR 255,255,255
NATIVEPROGRESS false
REGISTRYLAYERNAME Layers
SERVICEPACK 1
commit 1ae949c1bbee3d432a4aea61ad3c17d1764890d5
Author: Marina Latini (CIB) <marina.lat...@cib.de>
AuthorDate: Tue Jul 23 17:04:03 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Aug 14 22:16:07 2019 +0200
Add CIB branded folder to default list
Added the branding CIB folder to the default themes list.
The folder can be used also for providing custom branding.
On Windows the configuration can be also enforced via GPO.
Change-Id: Id606f463d043334d43fc20f320d00195524da991
diff --git a/configure.ac b/configure.ac
index 7ebdc176ed9c..118c15c8c22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1552,7 +1552,7 @@ AC_ARG_WITH(galleries,
AC_ARG_WITH(theme,
AS_HELP_STRING([--with-theme="theme1 theme2..."],
[Choose which themes to include. By default those themes with an '*'
are included.
- Possible choices: *breeze, *breeze_dark, *colibre, *elementary,
*karasa_jaga, *sifr, *sifr_dark, *tango.]),
+ Possible choices: *breeze, *breeze_dark, *cib, *colibre, *elementary,
*karasa_jaga, *sifr, *sifr_dark, *tango.]),
,)
libo_FUZZ_ARG_WITH(helppack-integration,
@@ -11276,14 +11276,14 @@ dnl
===================================================================
AC_MSG_CHECKING([which themes to include])
# if none given use default subset of available themes
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
- with_theme="breeze breeze_dark colibre elementary karasa_jaga sifr
sifr_dark tango"
+ with_theme="breeze breeze_dark cib colibre elementary karasa_jaga sifr
sifr_dark tango"
fi
WITH_THEMES=""
if test "x$with_theme" != "xno"; then
for theme in $with_theme; do
case $theme in
-
breeze|breeze_dark|colibre|elementary|karasa_jaga|sifr|sifr_dark|tango|CIB)
real_theme="$theme" ;;
+
breeze|breeze_dark|colibre|elementary|karasa_jaga|sifr|sifr_dark|tango|cib)
real_theme="$theme" ;;
default) real_theme=colibre ;;
*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
esac
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
