[Libreoffice-commits] core.git: vcl/generic

[Caolán McNamara]

 vcl/generic/glyphs/gcach_layout.cxx |    2 +-
 vcl/generic/glyphs/scrptrun.cxx     |    3 +++
 vcl/generic/glyphs/scrptrun.h       |    4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 227ca23324fabd77abae1b7eb6186ba11d519fae
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 9 14:21:30 2014 +0100

    move copy of icu's ScriptRun into vcl namespace
    
    Change-Id: Idbd3f3e903d6e411d565d29884e52862c3e1cc58

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 3f065bb..abd04ba 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -372,7 +372,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
 
     rLayout.Reserve(nGlyphCapacity);
 
-    ScriptRun aScriptRun(reinterpret_cast<const UChar *>(rArgs.mpStr), rArgs.mnLength);
+    vcl::ScriptRun aScriptRun(reinterpret_cast<const UChar *>(rArgs.mpStr), rArgs.mnLength);
 
     Point aCurrPos(0, 0);
     while (true)
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index f72d296..965fbf1 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -41,6 +41,8 @@
 
 #define ARRAY_SIZE(array) (sizeof array  / sizeof array[0])
 
+namespace vcl {
+
 const char ScriptRun::fgClassID=0;
 
 UChar32 ScriptRun::pairedChars[] = {
@@ -230,3 +232,4 @@ UBool ScriptRun::next()
     return true;
 }
 
+}
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 6e9bbd6..56ea88c 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -44,6 +44,8 @@
 #include "unicode/uobject.h"
 #include "unicode/uscript.h"
 
+namespace vcl {
+
 struct ScriptRecord
 {
     UChar32 startChar;
@@ -181,4 +183,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t start, int32_t length)
     reset(start, length);
 }
 
+}
+
 #endif