i18nlangtag/source/isolang/isolang.cxx | 1
i18npool/Library_localedata_en.mk | 1
i18npool/source/localedata/data/en_DK.xml | 238 ++++++++++++++++++++++++++++++
i18npool/source/localedata/localedata.cxx | 1
include/i18nlangtag/lang.h | 1
oox/source/export/drawingml.cxx | 4
svtools/inc/langtab.hrc | 3
7 files changed, 247 insertions(+), 2 deletions(-)
New commits:
commit 473c68d0f8014c1f594e6f4c683594024a307007
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu May 6 15:22:43 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 6 17:46:59 2021 +0200
crashtesting: failure on export of ooo26119-1.sxc to xlsx
since...
commit 3a24211a1d49f33ca52e4fb2c927d50304f005df
Date: Thu Apr 29 17:26:59 2021 +0200
tdf#54037 PPTX export: fix internal hyperlinks
calc XDrawPage doesn't support XNamed apparently
Change-Id: I796b65682f099deebee0da2e84bfbe391108c4cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115181
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5d292c82d4ee..99030277b387 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1859,7 +1859,9 @@ static OUString lcl_GetTarget(const
css::uno::Reference<css::frame::XModel>& xMo
{
Reference<XDrawPage> xDrawPage;
xDrawPages->getByIndex(i) >>= xDrawPage;
- Reference<container::XNamed> xNamed(xDrawPage, UNO_QUERY_THROW);
+ Reference<container::XNamed> xNamed(xDrawPage, UNO_QUERY);
+ if (!xNamed)
+ continue;
OUString sSlideName = "#" + xNamed->getName();
if (rURL == sSlideName)
{
commit cb9aa621a683a254e5df6e8016fcf2755c2def5b
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu May 6 13:38:56 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu May 6 17:46:52 2021 +0200
Add English (Denmark) {en-DK} locale data
Using ',' comma decimal separator and '.' dot group separator.
ISO 8601 date(+time) formats.
Inheriting calendar from {en-GB} (week-1stweek=4 first_weekday=2).
Currency DKK 'kr.' symbol.
Secondary currency EUR '€' symbol.
See also https://lh.2xlibre.net/locale/en_DK/
Change-Id: Idcf1e52af0ac20412efa42d3873ab1e34a2f1eaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115177
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 29b957a63976..04ff6c1a52ea 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -692,6 +692,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_ENGLISH_KENYA, "en", "KE", k0 },
{ LANGUAGE_USER_CABECAR, "cjp", "CR", k0 },
{ LANGUAGE_USER_BRIBRI, "bzd", "CR", k0 },
+ { LANGUAGE_USER_ENGLISH_DENMARK, "en", "DK", k0 },
{ LANGUAGE_MULTIPLE, "mul", "" , k0 }, //
multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, "und", "" , k0 }, //
undetermined language, language cannot be identified
{ LANGUAGE_NONE, "zxx", "" , k0 }, // added
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic
information
diff --git a/i18npool/Library_localedata_en.mk
b/i18npool/Library_localedata_en.mk
index 94f65b6805c3..c7d9ec0b0fe8 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,localedata_en,\
CustomTarget/i18npool/localedata/localedata_en_BW \
CustomTarget/i18npool/localedata/localedata_en_BZ \
CustomTarget/i18npool/localedata/localedata_en_CA \
+ CustomTarget/i18npool/localedata/localedata_en_DK \
CustomTarget/i18npool/localedata/localedata_en_GB \
CustomTarget/i18npool/localedata/localedata_en_GH \
CustomTarget/i18npool/localedata/localedata_en_GM \
diff --git a/i18npool/source/localedata/data/en_DK.xml
b/i18npool/source/localedata/data/en_DK.xml
new file mode 100644
index 000000000000..f8ac52e25f06
--- /dev/null
+++ b/i18npool/source/localedata/data/en_DK.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
+ <LC_INFO>
+ <Language>
+ <LangID>en</LangID>
+ <DefaultName>English</DefaultName>
+ </Language>
+ <Country>
+ <CountryID>DK</CountryID>
+ <DefaultName>Denmark</DefaultName>
+ </Country>
+ </LC_INFO>
+ <LC_CTYPE unoid="generic">
+ <Separators>
+ <DateSeparator>-</DateSeparator>
+ <ThousandSeparator>.</ThousandSeparator>
+ <DecimalSeparator>,</DecimalSeparator>
+ <TimeSeparator>:</TimeSeparator>
+ <Time100SecSeparator>,</Time100SecSeparator>
+ <ListSeparator>;</ListSeparator>
+ <LongDateDayOfWeekSeparator> </LongDateDayOfWeekSeparator>
+ <LongDateDaySeparator>. </LongDateDaySeparator>
+ <LongDateMonthSeparator> </LongDateMonthSeparator>
+ <LongDateYearSeparator> </LongDateYearSeparator>
+ </Separators>
+ <Markers>
+ <QuotationStart>‘</QuotationStart>
+ <QuotationEnd>’</QuotationEnd>
+ <DoubleQuotationStart>“</DoubleQuotationStart>
+ <DoubleQuotationEnd>”</DoubleQuotationEnd>
+ </Markers>
+ <TimeAM>AM</TimeAM>
+ <TimePM>PM</TimePM>
+ <MeasurementSystem>Metric</MeasurementSystem>
+ </LC_CTYPE>
+ <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$kr.-B009]">
+ <DateAcceptancePattern>M-D</DateAcceptancePattern>
+ <FormatElement msgid="FixedFormatskey1" default="true" type="medium"
usage="FIXED_NUMBER" formatindex="0">
+ <FormatCode>General</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey2" default="true" type="short"
usage="FIXED_NUMBER" formatindex="1">
+ <FormatCode>0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey3" default="false" type="medium"
usage="FIXED_NUMBER" formatindex="2">
+ <FormatCode>0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey4" default="false" type="short"
usage="FIXED_NUMBER" formatindex="3">
+ <FormatCode>#.##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey5" default="false" type="medium"
usage="FIXED_NUMBER" formatindex="4">
+ <FormatCode>#.##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey6" default="false" type="medium"
usage="FIXED_NUMBER" formatindex="5">
+ <FormatCode>#.###,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey7" default="false" type="short"
usage="FIXED_NUMBER" formatindex="70">
+ <FormatCode>#.##0_);(#.##0)</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="FixedFormatskey8" default="false" type="medium"
usage="FIXED_NUMBER" formatindex="71">
+ <FormatCode>#.##0,00_);(#.##0,00)</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey1" default="false" type="medium"
usage="SCIENTIFIC_NUMBER" formatindex="6">
+ <FormatCode>0,00E+000</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey2" default="true" type="medium"
usage="SCIENTIFIC_NUMBER" formatindex="7">
+ <FormatCode>0,00E+00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="ScientificFormatskey3" default="false" type="medium"
usage="SCIENTIFIC_NUMBER" formatindex="78">
+ <FormatCode>##0,00E+00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey1" default="true" type="short"
usage="PERCENT_NUMBER" formatindex="8">
+ <FormatCode>0%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="PercentFormatskey2" default="true" type="long"
usage="PERCENT_NUMBER" formatindex="9">
+ <FormatCode>0,00%</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey1" default="true" type="short"
usage="CURRENCY" formatindex="12">
+ <FormatCode>[CURRENCY]#.##0;-[CURRENCY]#.##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium"
usage="CURRENCY" formatindex="13">
+ <FormatCode>[CURRENCY]#.##0,00;-[CURRENCY]#.##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium"
usage="CURRENCY" formatindex="14">
+ <FormatCode>[CURRENCY]#.##0;[RED]-[CURRENCY]#.##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium"
usage="CURRENCY" formatindex="15">
+ <FormatCode>[CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium"
usage="CURRENCY" formatindex="16">
+ <FormatCode>#.##0,00 CCC</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium"
usage="CURRENCY" formatindex="17">
+ <FormatCode>[CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey7" default="false" type="short"
usage="CURRENCY" formatindex="72">
+ <FormatCode>[CURRENCY]* #.##0;-[CURRENCY]* #.##0</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="CurrencyFormatskey8" default="false" type="medium"
usage="CURRENCY" formatindex="73">
+ <FormatCode>[CURRENCY]* #.##0,00;-[CURRENCY]* #.##0,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey1" default="true" type="short"
usage="DATE" formatindex="18">
+ <FormatCode>YY-MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey9" default="true" type="long"
usage="DATE" formatindex="19">
+ <FormatCode>DD MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey8" default="false" type="medium"
usage="DATE" formatindex="20">
+ <FormatCode>YY-MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey7" default="true" type="medium"
usage="DATE" formatindex="21">
+ <FormatCode>YYYY-MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey10" default="false" type="long"
usage="DATE" formatindex="22">
+ <FormatCode>D. MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey11" default="false" type="long"
usage="DATE" formatindex="23">
+ <FormatCode>D. MMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey16" default="false" type="long"
usage="DATE" formatindex="24">
+ <FormatCode>D. MMM. YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey12" default="false" type="long"
usage="DATE" formatindex="25">
+ <FormatCode>D. MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey17" default="false" type="long"
usage="DATE" formatindex="26">
+ <FormatCode>D. MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey13" default="false" type="long"
usage="DATE" formatindex="27">
+ <FormatCode>NN D. MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey2" default="false" type="medium"
usage="DATE" formatindex="28">
+ <FormatCode>NN DD-MMM YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey14" default="false" type="long"
usage="DATE" formatindex="29">
+ <FormatCode>NN D. MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey15" default="false" type="long"
usage="DATE" formatindex="30">
+ <FormatCode>NNNND. MMMM YYYY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey18" default="false" type="short"
usage="DATE" formatindex="31">
+ <FormatCode>MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey19" default="false" type="medium"
usage="DATE" formatindex="32">
+ <FormatCode>YY-MM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey20" default="false" type="medium"
usage="DATE" formatindex="33">
+ <FormatCode>YYYY-MM-DD</FormatCode>
+ <DefaultName>ISO 8601 (EN 28601)</DefaultName>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey3" default="false" type="medium"
usage="DATE" formatindex="34">
+ <FormatCode>YY-MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey4" default="false" type="medium"
usage="DATE" formatindex="35">
+ <FormatCode>MMM-DD</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey5" default="false" type="medium"
usage="DATE" formatindex="36">
+ <FormatCode>MMMM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey6" default="false" type="medium"
usage="DATE" formatindex="37">
+ <FormatCode>QQ YY</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateFormatskey21" default="false" type="medium"
usage="DATE" formatindex="38">
+ <FormatCode>WW</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey1" default="true" type="short"
usage="TIME" formatindex="39">
+ <FormatCode>HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey2" default="true" type="medium"
usage="TIME" formatindex="40">
+ <FormatCode>HH:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey3" default="false" type="short"
usage="TIME" formatindex="41">
+ <FormatCode>HH:MM AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey4" default="false" type="medium"
usage="TIME" formatindex="42">
+ <FormatCode>HH:MM:SS AM/PM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey5" default="false" type="medium"
usage="TIME" formatindex="43">
+ <FormatCode>[HH]:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey6" default="false" type="short"
usage="TIME" formatindex="44">
+ <FormatCode>MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="TimeFormatskey7" default="false" type="medium"
usage="TIME" formatindex="45">
+ <FormatCode>[HH]:MM:SS,00</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey1" default="false" type="medium"
usage="DATE_TIME" formatindex="46">
+ <FormatCode>YY-MM-DD"T"HH:MM</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium"
usage="DATE_TIME" formatindex="47">
+ <FormatCode>YYYY-MM-DD"T"HH:MM:SS</FormatCode>
+ </FormatElement>
+ <FormatElement msgid="DateTimeFormatskey3" default="true" type="medium"
usage="DATE_TIME" formatindex="50">
+ <FormatCode>YYYY-MM-DD"T"HH:MM</FormatCode>
+ </FormatElement>
+ </LC_FORMAT>
+ <LC_COLLATION ref="en_GB"/>
+ <LC_SEARCH ref="en_GB"/>
+ <LC_INDEX ref="en_GB"/>
+ <LC_CALENDAR ref="en_GB"/>
+ <LC_CURRENCY>
+ <Currency default="true" usedInCompatibleFormatCodes="true">
+ <CurrencyID>DKK</CurrencyID>
+ <CurrencySymbol>kr.</CurrencySymbol>
+ <BankSymbol>DKK</BankSymbol>
+ <CurrencyName>Dansk krone</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="false">
+ <CurrencyID>EUR</CurrencyID>
+ <CurrencySymbol>€</CurrencySymbol>
+ <BankSymbol>EUR</BankSymbol>
+ <CurrencyName>Euro</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ </LC_CURRENCY>
+ <LC_TRANSLITERATION ref="en_GB"/>
+ <LC_MISC ref="en_GB"/>
+ <LC_NumberingLevel ref="en_GB"/>
+ <LC_OutLineNumberingLevel ref="en_GB"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx
b/i18npool/source/localedata/localedata.cxx
index 8f159a40d53b..40dd0a300cc5 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -81,6 +81,7 @@ const struct {
{ "en_LK", lcl_DATA_EN },
{ "en_NG", lcl_DATA_EN },
{ "en_KE", lcl_DATA_EN },
+ { "en_DK", lcl_DATA_EN },
{ "es_ES", lcl_DATA_ES },
{ "es_AR", lcl_DATA_ES },
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index eceeee264556..ee404aefd6c0 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -765,6 +765,7 @@ namespace o3tl
#define LANGUAGE_USER_PALI_THAI LanguageType(0x0A67) /*
makeLangID( 0x02, getPrimaryLanguage( LANGUAGE_USER_PALI_LATIN)) */
#define LANGUAGE_USER_CABECAR LanguageType(0x06AA)
#define LANGUAGE_USER_BRIBRI LanguageType(0x06AB)
+#define LANGUAGE_USER_ENGLISH_DENMARK LanguageType(0xB009) /*
makeLangID( 0x2C, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
/* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 280219f8e960..628393d59982 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -430,7 +430,8 @@ const std::pair<const char*, LanguageType>
STR_ARR_SVT_LANGUAGE_TABLE[] =
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Kenya)") ,
LANGUAGE_USER_ENGLISH_KENYA },
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Pali Thai") , LANGUAGE_USER_PALI_THAI
},
{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Cabécar") , LANGUAGE_USER_CABECAR },
- { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bribri") , LANGUAGE_USER_BRIBRI }
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Bribri") , LANGUAGE_USER_BRIBRI },
+ { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Denmark)") ,
LANGUAGE_USER_ENGLISH_DENMARK }
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
