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

Tomáš Chvátal (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 25 15:32:58 UTC 2019


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

New commits:
commit 358637547c5bb7ae6ca637640c4279455414dbfa
Author:     Tomáš Chvátal <tchvatal at suse.com>
AuthorDate: Fri Mar 15 16:16:31 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Mar 25 16:32:39 2019 +0100

    Fix build with boost 1.69
    
    This is also fixed with master with boost bump which we do not need
    here.
    
    Change-Id: I61caec10c0c6d442cef3d51c31eaff01f18b89e3
    Reviewed-on: https://gerrit.libreoffice.org/69310
    Reviewed-by: Tomáš Chvátal <tchvatal at suse.cz>
    Tested-by: Tomáš Chvátal <tchvatal at suse.cz>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index e917c3a91a0c..8a51e5c88122 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -143,7 +143,7 @@ bool LoadModule()
 #endif // ENABLE_QUICKSTART_APPLET
     }
     assert(!boost::logic::indeterminate(loaded));
-    return loaded;
+    return bool(loaded);
 }
 
 }


More information about the Libreoffice-commits mailing list