[Libreoffice-commits] core.git: 2 commits - icu/DefaultCharMapper.patch.0 icu/UnpackedTarball_icu.mk vcl/inc vcl/source

[Rene Engelhard]

 icu/DefaultCharMapper.patch.0         |   22 ----------------------
 icu/UnpackedTarball_icu.mk            |    1 -
 vcl/inc/graphite_layout.hxx           |    1 -
 vcl/source/glyphs/graphite_layout.cxx |   23 ++---------------------
 4 files changed, 2 insertions(+), 45 deletions(-)

New commits:
commit 2750142021c6f6b4b0e5e82a71a9f3f9cddbc400
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 8 19:21:19 2013 +0200

    Revert "Make icu's DefaultCharMapper usable on Windows"
    
    Obsolete with 08ba028992a77dee32dd76030bc409c6d3b39e36
    
    This reverts commit 21fea27309a75b86add08918d2a2a2234ae1f1fb.

diff --git a/icu/DefaultCharMapper.patch.0 b/icu/DefaultCharMapper.patch.0
deleted file mode 100644
index f56d2d7..0000000
--- a/icu/DefaultCharMapper.patch.0
+++ /dev/null
@@ -1,22 +0,0 @@
---- source/layout/DefaultCharMapper.h	2013-03-15 23:16:44.000000000 +0100
-+++ source/layout/DefaultCharMapper.h	2013-04-08 17:18:39.710138077 +0200
-@@ -23,7 +23,7 @@
-  *
-  * @see LECharMapper
-  */
--class DefaultCharMapper : public UMemory, public LECharMapper
-+class U_LAYOUT_API DefaultCharMapper : public UMemory, public LECharMapper
- {
- private:
-     le_bool fFilterControls;
---- source/layout/LEFontInstance.h	2013-03-15 23:16:42.000000000 +0100
-+++ source/layout/LEFontInstance.h	2013-04-08 17:18:40.826139346 +0200
-@@ -25,7 +25,7 @@
-  *
-  * @stable ICU 3.2
-  */
--class LECharMapper /* not : public UObject because this is an interface/mixin class */
-+class U_LAYOUT_API LECharMapper /* not : public UObject because this is an interface/mixin class */
- {
- public:
-     /**
diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index 965c324..35c95c4 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	icu/icu4c-mkdir.patch \
 	icu/icu4c-buffer-overflow.patch \
 	icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
-    icu/DefaultCharMapper.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
commit 08ba028992a77dee32dd76030bc409c6d3b39e36
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 8 19:15:25 2013 +0200

    Revert "fix fdo#60534 : use DefaultCharMapper::mapChar() to map RTL string unicodes."
    
    We must not rely on *internal* ICU headers as it breaks system-icu.
    
    This reverts commit 83d9c5562c27b5f766157eba70bebd320463a0af.

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index fa6d25c..bbf6f15 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 3e3c329..8b19c31 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)