[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/inc

[Eike Rathke]

 vcl/inc/scrptrun.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d06789a836f1a271399cd9955b2cb96030f393a
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Dec 19 15:22:09 2017 +0100

    vcl: explicitly qualify ICU types with icu:: namespace
    
    It will be required by ICU 61 anyway, see
    https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
    
    Change-Id: Iecb30b903e9a67252147a8cc78c641621d763755
    (cherry picked from commit f240332f8e965ea17b70b0ccaa9990ce0a53cfc6)
    Reviewed-on: https://gerrit.libreoffice.org/56735
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
index cbe151df491d..46a5c08f3ab5 100644
--- a/vcl/inc/scrptrun.h
+++ b/vcl/inc/scrptrun.h
@@ -58,7 +58,7 @@ struct ParenStackEntry
     }
 };
 
-class ScriptRun : public UObject {
+class ScriptRun : public icu::UObject {
 public:
 
     ScriptRun(const UChar chars[], int32_t length);