[Libreoffice-commits] .: vcl/generic

[Caolán McNamara]

 vcl/generic/glyphs/gcach_layout.cxx |   33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

New commits:
commit 146b507f9f52daa7378aaeddf6725b9ab129af61
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jul 14 20:40:10 2012 +0100

    ENABLE_ICU_LAYOUT is always enabled
    
    Change-Id: Ie29dd409b95e477a10536468ec320a59cc96a1a9

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index db04bdb..0e8cd64 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-
-#define ENABLE_ICU_LAYOUT
 #include <gcach_ftyp.hxx>
 #include <sallayout.hxx>
 #include <salgdi.hxx>
@@ -37,6 +35,13 @@
 #include <sal/alloca.h>
 #include <rtl/instance.hxx>
 
+#include <layout/LayoutEngine.h>
+#include <layout/LEFontInstance.h>
+#include <layout/LEScripts.h>
+
+#include <unicode/uscript.h>
+#include <unicode/ubidi.h>
+
 namespace { struct SimpleLayoutEngine : public rtl::Static< ServerFontLayoutEngine, SimpleLayoutEngine > {}; }
 
 // =======================================================================
@@ -157,25 +162,6 @@ bool ServerFontLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutAr
 // bridge to ICU LayoutEngine
 // =======================================================================
 
-#ifdef ENABLE_ICU_LAYOUT
-
-// disable warnings in icu layout headers
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-#include <layout/LayoutEngine.h>
-#include <layout/LEFontInstance.h>
-#include <layout/LEScripts.h>
-
-// enable warnings again
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-#include <unicode/uscript.h>
-#include <unicode/ubidi.h>
-
 using namespace U_ICU_NAMESPACE;
 
 static const LEGlyphID ICU_DELETED_GLYPH = 0xFFFF;
@@ -641,18 +627,13 @@ bool IcuLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutArgs& rAr
     return true;
 }
 
-#endif // ENABLE_ICU_LAYOUT
-
 // =======================================================================
 
 ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
 {
     // find best layout engine for font, platform, script and language
-#ifdef ENABLE_ICU_LAYOUT
     if( !mpLayoutEngine && FT_IS_SFNT( maFaceFT ) )
         mpLayoutEngine = new IcuLayoutEngine( *this );
-#endif // ENABLE_ICU_LAYOUT
-
     return mpLayoutEngine;
 }