summaryrefslogtreecommitdiff
path: root/vcl/source/glyphs/graphite_features.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2009-12-17 13:56:08 +0000
committerCaolán McNamara <cmc@openoffice.org>2009-12-17 13:56:08 +0000
commit723b53e66635c03bc4dc4bb0d945867c91672e12 (patch)
tree0e0889681066b4dc52b5933c858532bf936bfb81 /vcl/source/glyphs/graphite_features.cxx
parentf8ada8f2a93659e27928f3b5244c813de2c3847b (diff)
cmcfixes69: #i106157#: workaround graphite stl/stlport issues
Diffstat (limited to 'vcl/source/glyphs/graphite_features.cxx')
-rw-r--r--vcl/source/glyphs/graphite_features.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index dae1bfc2866e..b26397aa43e5 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -91,7 +91,7 @@ GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string features, co
gr::isocode aLang = maLang;
for (size_t i = pos; i < nFeatEnd; i++)
aLang.rgch[i-pos] = features[i];
- std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
+ sil_std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
= font.getSupportedLanguages();
gr::LanguageIterator iL = aSupported.first;
while (iL != aSupported.second)
@@ -142,7 +142,7 @@ void GrFeatureParser::setLang(gr::Font & font, const std::string & lang)
if (lang[i] == '-') break;
aLang.rgch[i] = lang[i];
}
- std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
+ sil_std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
= font.getSupportedLanguages();
gr::LanguageIterator iL = aSupported.first;
while (iL != aSupported.second)
@@ -189,7 +189,7 @@ bool GrFeatureParser::isValid(gr::Font & font, gr::FeatureSetting & setting)
{
return false;
}
- std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator >
+ sil_std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator >
validValues = font.getFeatureSettings(i);
gr::FeatureSettingIterator j = validValues.first;
while (j != validValues.second)