[Libreoffice-commits] core.git: qadevOOo/qa solenv/gbuild

[Michael Stahl]

 qadevOOo/qa/registrymodifications.xcu |    9 +++++++++
 solenv/gbuild/JunitTest.mk            |    3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 32b6002d46682819d440243aff4dd53556e89754
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 19 12:32:26 2015 +0200

    qadevOOo: fix _XDataPilotTables failure in non-english locales
    
    Set the UILocale to en but do that with a registrymodifications.xcu as
    setting it via configmgr requires a restart.
    
    Change-Id: I26d9f6aa07852a7f18e2b3b7baccdb2e85524ea4

diff --git a/qadevOOo/qa/registrymodifications.xcu b/qadevOOo/qa/registrymodifications.xcu
new file mode 100644
index 0000000..9d9c2a8a
--- /dev/null
+++ b/qadevOOo/qa/registrymodifications.xcu
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Force EN Calc function names and UI so "Filter" match also
+     when building with non-en system locales -->
+<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<item oor:path="/org.openoffice.Office.Calc/Formula/Syntax"><prop oor:name="EnglishFunctionName" oor:op="fuse"><value>true</value></prop></item>
+<item oor:path="/org.openoffice.Setup/L10N"><prop oor:name="ooSetupSystemLocale" oor:op="fuse"><value>en-US</value></prop></item>
+<item oor:path="/org.openoffice.Setup/L10N"><prop oor:name="ooLocale" oor:op="fuse"><value>en</value></prop></item>
+<item oor:path="/org.openoffice.Office.Linguistic/General"><prop oor:name="UILocale" oor:op="fuse"><value>en-US</value></prop></item>
+</oor:items>
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 4078421..30e226d 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -35,7 +35,8 @@ $(call gb_JunitTest_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),JUT,2)
 	$(call gb_Helper_abbreviate_dirs,\
         rm -rf $(call gb_JunitTest_get_userdir,$*) && \
-		mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
+		mkdir -p $(call gb_JunitTest_get_userdir,$*)/user && \
+		cp $(SRCDIR)/qadevOOo/qa/registrymodifications.xcu $(call gb_JunitTest_get_userdir,$*)/user/ && \
         ($(gb_JunitTest_JAVACOMMAND) \
             -classpath "$(T_CP)" \
             $(DEFS) \