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

Tomáš Chvátal (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 21 09:58:42 UTC 2019


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

New commits:
commit 6c387cad214a56bb002fd28004705a64c3bf8bcc
Author:     Tomáš Chvátal <tchvatal at suse.com>
AuthorDate: Mon Aug 19 15:35:35 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 21 11:57:53 2019 +0200

    Use get_value_or instead of value_or
    
    The old boost does not understand the value_or function
    
    Change-Id: I575d04eaab62294e1b402cd8c991c0daa1854271
    Reviewed-on: https://gerrit.libreoffice.org/77729
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.com>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5620f4396e8f..f879bc1df21f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1234,7 +1234,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
                     OUString sSetupVersion = utl::ConfigManager::getProductVersion();
                     sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32();
                     OUString sLastVersion
-                        = officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0");
+                        = officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0");
                     sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32();
                     if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest)
                     {


More information about the Libreoffice-commits mailing list