[Libreoffice-commits] .: vcl/inc vcl/source

Caolán McNamara caolan at kemper.freedesktop.org
Sun Oct 24 07:32:23 PDT 2010


 vcl/inc/vcl/graphite_features.hxx       |    1 -
 vcl/source/glyphs/graphite_features.cxx |    3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 49c2936e7a1b6e90d1c8c62f0ca9227d06ecca78
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Oct 24 15:32:12 2010 +0100

    micro optimization, remove startup global

diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx
index ed96e91..1cb109e 100644
--- a/vcl/inc/vcl/graphite_features.hxx
+++ b/vcl/inc/vcl/graphite_features.hxx
@@ -46,7 +46,6 @@ namespace grutils
         static const char FEAT_PREFIX;
         static const char FEAT_SEPARATOR;
         static const char FEAT_ID_VALUE_SEPARATOR;
-        static const std::string ISO_LANG;
         GrFeatureParser(gr::Font & font, const std::string features, const std::string lang);
         GrFeatureParser(gr::Font & font, const std::string lang);
         GrFeatureParser(const GrFeatureParser & copy);
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index 3b2563f..7b0ba0a 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -48,7 +48,6 @@ using namespace grutils;
 const char GrFeatureParser::FEAT_PREFIX = ':';
 const char GrFeatureParser::FEAT_SEPARATOR = '&';
 const char GrFeatureParser::FEAT_ID_VALUE_SEPARATOR = '=';
-const std::string GrFeatureParser::ISO_LANG("lang");
 
 GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string lang)
     : mnNumSettings(0), mbErrors(false)
@@ -74,7 +73,7 @@ GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string features, co
             break;
         }
         // check for a lang=xxx specification
-        if (features.compare(pos, nEquals - pos, ISO_LANG) == 0)
+        if (features.compare(pos, nEquals - pos, "lang") == 0)
         {
             pos = nEquals + 1;
             nFeatEnd = features.find(FEAT_SEPARATOR, pos);


More information about the Libreoffice-commits mailing list