diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 10:51:01 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 19:57:52 +0100 |
| commit | e5e3ba75ecf716ad6760d8b74d095729306e1219 (patch) | |
| tree | a95a276e86ae62b23bfed3f34f9208d39dad3052 /vcl/source/glyphs/graphite_layout.cxx | |
| parent | 56d803ee5c060e761dbe5a6cc1c1443c932e2a31 (diff) | |
Removing the ext_std masterpiece
Diffstat (limited to 'vcl/source/glyphs/graphite_layout.cxx')
| -rw-r--r-- | vcl/source/glyphs/graphite_layout.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 2e4812ba5940..01c671ef17ec 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -68,13 +68,11 @@ #include <unicode/uscript.h> // Graphite Libraries (must be after vcl headers on windows) -#include <preextstl.h> #include <graphite/GrClient.h> #include <graphite/Font.h> #include <graphite/ITextSource.h> #include <graphite/Segment.h> #include <graphite/SegmentPainter.h> -#include <postextstl.h> #include <vcl/graphite_layout.hxx> #include <vcl/graphite_features.hxx> @@ -109,8 +107,8 @@ FILE * grLog() namespace { - typedef ext_std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t; - typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t; + typedef std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t; + typedef std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t; inline long round(const float n) { return long(n + (n < 0 ? -0.5 : 0.5)); @@ -175,7 +173,7 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, bool bRtl, long &rWidth, float fScaling, std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs) { // Create a glyph item for each of the glyph and append it to the base class glyph list. - typedef ext_std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet; + typedef std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet; int nChar = rArgs.mnEndCharPos - rArgs.mnMinCharPos; glyph_range_t iGlyphs = rSegment.glyphs(); int nGlyphs = iGlyphs.second - iGlyphs.first; @@ -652,7 +650,7 @@ public: sal_Int32 hashCode(const grutils::GrFeatureParser * mpFeatures) { // is this sufficient? - ext_std::wstring aFace; + std::wstring aFace; bool bBold; bool bItalic; UniqueCacheInfo(aFace, bBold, bItalic); @@ -677,7 +675,7 @@ public: return hash; }; protected: - virtual void UniqueCacheInfo( ext_std::wstring& stuFace, bool& fBold, bool& fItalic ) + virtual void UniqueCacheInfo( std::wstring& stuFace, bool& fBold, bool& fItalic ) { #ifdef WIN32 dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic); |