[Libreoffice-commits] core.git: cui/source

Caolán McNamara caolanm at redhat.com
Thu Apr 19 19:18:56 UTC 2018


 cui/source/dialogs/hangulhanjadlg.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 32778ad663f9f96816366aaaea2131273ce01d18
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 19 11:02:56 2018 +0100

    turn #error into static_assert
    
    Change-Id: Iddd4b344d77e43866975ce28797ff643055bfd04
    Reviewed-on: https://gerrit.libreoffice.org/53160
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 1564a6fb33bb..64be36bab3da 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1750,9 +1750,7 @@ namespace svx
         m_aDeletePB->SetClickHdl( LINK( this, HangulHanjaEditDictDialog, DeletePBPushHdl ) );
         m_aDeletePB->Enable( false );
 
-    #if( MAXNUM_SUGGESTIONS <= 4 )
-        #error number of suggestions should not under-run the value of 5
-    #endif
+        static_assert(MAXNUM_SUGGESTIONS > 5, "number of suggestions should not under-run the value of 5");
 
         Link<ScrollBar*,void>  aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
         m_aScrollSB->SetScrollHdl( aScrLk );


More information about the Libreoffice-commits mailing list