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

[Eike Rathke]

 i18nutil/source/utility/paper.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d65567230f283a6ed228755a3be85e95cde2d677
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 12 12:56:51 2017 +0200

    Turn OSL_ENSURE() into static_assert() for NUM_PAPER_ENTRIES enum match
    
    And remove now obsolete include of osl/diagnose.h
    
    Change-Id: Ie75a4da463a5c51c6bd763d4a6ecf37be94ff6b2

diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index 7ab91d089b3c..b2779f8b6ae9 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/diagnose.h>
 #include <officecfg/Setup.hxx>
 #include <officecfg/System.hxx>
 #include <sal/config.h>
@@ -348,7 +347,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper()
 
 PaperInfo::PaperInfo(Paper eType) : m_eType(eType)
 {
-    OSL_ENSURE( SAL_N_ELEMENTS(aDinTab) == NUM_PAPER_ENTRIES,
+    static_assert( SAL_N_ELEMENTS(aDinTab) == NUM_PAPER_ENTRIES,
             "mismatch between array entries and enum values" );
 
     m_nPaperWidth = aDinTab[m_eType].m_nWidth;