diff options
author | Caolán McNamara <cmc@openoffice.org> | 2010-03-12 09:15:29 +0000 |
---|---|---|
committer | Caolán McNamara <cmc@openoffice.org> | 2010-03-12 09:15:29 +0000 |
commit | 03abcba9c53630795987c7a1545de6376c36849d (patch) | |
tree | e4f078420d85f3882e270fa9a2818cff977a9fb6 /vcl/source/glyphs/graphite_textsrc.cxx | |
parent | dc354f51b456f9415765d4c40338cd96697a2709 (diff) |
cmcfixes73: #i110068# unify headers in one place
Diffstat (limited to 'vcl/source/glyphs/graphite_textsrc.cxx')
-rw-r--r-- | vcl/source/glyphs/graphite_textsrc.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx index d7547662e065..5764ba9454c9 100644 --- a/vcl/source/glyphs/graphite_textsrc.cxx +++ b/vcl/source/glyphs/graphite_textsrc.cxx @@ -135,16 +135,16 @@ gr::isocode TextSourceAdaptor::getLanguage(gr::toffset) return unknown; } -sil_std::pair<gr::toffset, gr::toffset> TextSourceAdaptor::propertyRange(gr::toffset nCharIdx) +ext_std::pair<gr::toffset, gr::toffset> TextSourceAdaptor::propertyRange(gr::toffset nCharIdx) { if (nCharIdx < unsigned(maLayoutArgs.mnMinCharPos)) - return sil_std::make_pair(0, maLayoutArgs.mnMinCharPos); + return ext_std::make_pair(0, maLayoutArgs.mnMinCharPos); if (nCharIdx < mnEnd) - return sil_std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd); + return ext_std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd); - return sil_std::make_pair(mnEnd, maLayoutArgs.mnLength); + return ext_std::make_pair(mnEnd, maLayoutArgs.mnLength); } size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * settings) @@ -156,7 +156,7 @@ size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * sett bool TextSourceAdaptor::sameSegment(gr::toffset char_idx1, gr::toffset char_idx2) { - const sil_std::pair<gr::toffset, gr::toffset> + const ext_std::pair<gr::toffset, gr::toffset> range1 = propertyRange(char_idx1), range2 = propertyRange(char_idx2); |