diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2013-04-08 16:59:48 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-04-12 12:15:22 +0200 |
| commit | 46e91abb95a7eeb4136912419d42a69e5acdf0dd (patch) | |
| tree | 752df945b848847e82a2c3c862c15ff0dd4fb973 | |
| parent | add lots of un-tested code to the GroupSlidesDialog. (diff) | |
| download | core-46e91abb95a7eeb4136912419d42a69e5acdf0dd.tar.gz core-46e91abb95a7eeb4136912419d42a69e5acdf0dd.zip | |
Revert "fix fdo#60534 : use DefaultCharMapper::mapChar() to map RTL string unicodes."
This reverts commit 83d9c5562c27b5f766157eba70bebd320463a0af.
| -rw-r--r-- | vcl/inc/graphite_layout.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/glyphs/graphite_layout.cxx | 23 |
2 files changed, 2 insertions, 22 deletions
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index fa6d25c340a5..bbf6f15b2fe5 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -97,7 +97,6 @@ public: private: const gr_face * mpFace; // not owned by layout gr_font * mpFont; // not owned by layout - sal_Unicode * mpStr; int mnSegCharOffset; // relative to ImplLayoutArgs::mpStr long mnWidth; std::vector<int> mvChar2BaseGlyph; diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 3e3c3291fb30..8b19c31eeec7 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -48,7 +48,6 @@ #include <unicode/ubidi.h> #include <unicode/uscript.h> -#include <layout/DefaultCharMapper.h> // Graphite Libraries (must be after vcl headers on windows) #include <graphite2/Segment.h> @@ -491,7 +490,6 @@ GraphiteLayout::GraphiteLayout(const gr_face * face, gr_font * font, const grutils::GrFeatureParser * pFeatures) throw() : mpFace(face), mpFont(font), - mpStr(NULL), mnWidth(0), mfScaling(1.0), mpFeatures(pFeatures) @@ -503,7 +501,6 @@ GraphiteLayout::~GraphiteLayout() throw() { clear(); // the features and font are owned by the platform layers - delete[] mpStr; mpFeatures = NULL; mpFont = NULL; } @@ -594,28 +591,12 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) } size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset, rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL); - - mpStr = new sal_Unicode[rArgs.mnLength+1]; - if(mpStr) - memcpy(mpStr, rArgs.mpStr, (rArgs.mnLength+1)*2); - - if (bRtl && mpStr) - { - DefaultCharMapper cmap(true, bRtl); - int i=0; - while(rArgs.mpStr[i]) - { - mpStr[i]=(sal_Unicode) cmap.mapChar((sal_uInt32)rArgs.mpStr[i]); - i++; - } - } - if (mpFeatures) pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16, - mpStr + mnSegCharOffset, numchars, bRtl); + rArgs.mpStr + mnSegCharOffset, numchars, bRtl); else pSegment = gr_make_seg(mpFont, mpFace, 0, NULL, gr_utf16, - mpStr + mnSegCharOffset, numchars, bRtl); + rArgs.mpStr + mnSegCharOffset, numchars, bRtl); //pSegment = new gr::RangeSegment((gr::Font *)&mrFont, mpTextSrc, &maLayout, mnMinCharPos, limit); if (pSegment != NULL) |