[Libreoffice-commits] .: vcl/inc

[Kohei Yoshida]

 vcl/inc/vcl/fontcapabilities.hxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit f66ecc7846ccda840b9ec0e6027bc2e5180e4a8b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 1 22:19:08 2011 -0500

    Many of us still use compilers that don't support C++0x properly.
    
    This fixes a build breakage in svtools, in ctrlbox.cxx.

diff --git a/vcl/inc/vcl/fontcapabilities.hxx b/vcl/inc/vcl/fontcapabilities.hxx
index 37a5054..cabe239 100644
--- a/vcl/inc/vcl/fontcapabilities.hxx
+++ b/vcl/inc/vcl/fontcapabilities.hxx
@@ -33,7 +33,11 @@
 
 namespace vcl
 {
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
     enum UnicodeCoverage
+#else
+    struct UnicodeCoverage { enum
+#endif
     {
         BASIC_LATIN                                 = 0,
         LATIN_1_SUPPLEMENT                          = 1,
@@ -165,8 +169,15 @@ namespace vcl
         RESERVED5                                   = 127,
         MAX_UC_ENUM                                 = 128
     };
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+    };
+#endif
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
     enum CodePageCoverage
+#else
+    struct CodePageCoverage { enum
+#endif
     {
         CP1252       = 0,
         CP1250       = 1,
@@ -201,6 +212,9 @@ namespace vcl
         CP437        = 63,
         MAX_CP_ENUM  = 64
     };
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+    };
+#endif
 
     struct FontCapabilities
     {