From 0b536d542fe937d221aa465775ece41104b1f0bb Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 30 Sep 2020 09:55:33 +0200
Subject: Fix CppunitTest_connectivity_mork
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

...after  9141c300771825db5136cb6591e83dc4b541be08 "More “e-mail” → “email”"
broke it:

> Test name: connectivity::mork::MorkDriverTest::test_select_default_all
> An uncaught exception of type com.sun.star.sdbc.SQLException
> - The column name 'E-mail' is not valid. ~/lo/core/connectivity/source/commontools/dbexception.cxx:442
>
> DriverTest.cxx:183:Assertion
> Test name: connectivity::mork::MorkDriverTest::test_select_list_table_joe_doe_5
> assertion failed
> - Expression: result
> - fetch first row failed!

Change-Id: I3825fbf0ff35da794c9ce038407178456552f7ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103668
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index f29aba2a8ed1..edba2a2020be 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -465,10 +465,10 @@
           <value xml:lang="en-US">Nickname</value>
         </prop>
         <prop oor:name="PrimaryEmail">
-          <value xml:lang="en-US">Email</value>
+          <value xml:lang="en-US">E-mail</value>
         </prop>
         <prop oor:name="SecondEmail">
-          <value xml:lang="en-US">Email (2)</value>
+          <value xml:lang="en-US">E-mail (2)</value>
         </prop>
         <prop oor:name="PreferMailFormat">
           <value xml:lang="en-US">Mail Format</value>
-- 
cgit