[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source

[Szymon KÅ‚os (via logerrit)]

 sw/source/ui/dialog/swdlgfact.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ffb5593e6ea7fcdf13208e24b2a3bc5f28e8834a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Jul 20 13:21:41 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Jul 20 13:39:14 2020 +0200

    Fix warning while building on windows
    
    cannot convert int to optional
    
    Change-Id: Ibe4c4d440a835c3d85835bc7952340db5e26841f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99045
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 63f262a28ac9..be05d3ba8f0f 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -383,7 +383,7 @@ sal_uInt16 AbstractSwBreakDlg_Impl:: GetKind()
     if (pDlg)
         return pDlg->GetPageNumber();
 
-    return 0;
+    return ::boost::optional<sal_uInt16>(0);
 }
 
 void AbstractSwConvertTableDlg_Impl::GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTableFlags,