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

[Heiko Tietze (via logerrit)]

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

New commits:
commit ea75767f538150c7ae4a97629b10624af55f7dde
Author:     Heiko Tietze <heiko.tietze at documentfoundation.org>
AuthorDate: Tue Jul 21 08:30:35 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jul 21 16:56:33 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 <heiko.tietze at documentfoundation.org>
    (cherry picked from commit 534c59c8bc951b610adb2882afb78a64e8914f73)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99147
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

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);