[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk

[Eike Rathke]

 offapi/UnoApi_offapi.mk                      |    3 +
 offapi/com/sun/star/i18n/LocaleData2.idl     |   29 +++++++++++++++++++
 offapi/com/sun/star/i18n/LocaleDataItem2.idl |   40 ++++++++++++++++++++++++++
 offapi/com/sun/star/i18n/XLocaleData5.idl    |   41 +++++++++++++++++++++++++++
 4 files changed, 113 insertions(+)

New commits:
commit 4ef04974882ba53daef3977e84c1844077b77e9b
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Oct 26 21:03:26 2017 +0200

    New decimalSeparatorAlternative, LocaleDataItem2, XLocaleData5, tdf#81671
    
    ... and LocaleData2 service, which is necessary with new-style
    services because optional interface at published service is not
    possible.
    
    Change-Id: I77703243a961b5385eaea146e4c9c42d5f30e1ad

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index f6f95a50f6fa..c32c3265d091 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/i18n,\
 	LocaleCalendar \
 	LocaleCalendar2 \
 	LocaleData \
+	LocaleData2 \
 	NativeNumberSupplier \
 	NumberFormatMapper \
 	OrdinalSuffix \
@@ -2738,6 +2739,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/i18n,\
 	LineBreakResults \
 	LineBreakUserOptions \
 	LocaleDataItem \
+	LocaleDataItem2 \
 	LocaleItem \
 	Months \
 	MultipleCharsOutputException \
@@ -2777,6 +2779,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/i18n,\
 	XLocaleData2 \
 	XLocaleData3 \
 	XLocaleData4 \
+	XLocaleData5 \
 	XNativeNumberSupplier \
 	XNumberFormatCode \
 	XOrdinalSuffix \
diff --git a/offapi/com/sun/star/i18n/LocaleData2.idl b/offapi/com/sun/star/i18n/LocaleData2.idl
new file mode 100644
index 000000000000..7fe53bb096fe
--- /dev/null
+++ b/offapi/com/sun/star/i18n/LocaleData2.idl
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef __com_sun_star_i18n_LocaleData2_idl__
+#define __com_sun_star_i18n_LocaleData2_idl__
+
+#include <com/sun/star/i18n/XLocaleData5.idl>
+
+module com { module sun { module star { module i18n {
+
+/** Access locale specific data.
+
+    Supersedes service com::sun::star::i18n::LocaleData
+
+    @since LibreOffice 6.0
+ */
+service LocaleData2 : XLocaleData5;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/offapi/com/sun/star/i18n/LocaleDataItem2.idl b/offapi/com/sun/star/i18n/LocaleDataItem2.idl
new file mode 100644
index 000000000000..f2565213facf
--- /dev/null
+++ b/offapi/com/sun/star/i18n/LocaleDataItem2.idl
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef __com_sun_star_i18n_LocaleDataItem2_idl__
+#define __com_sun_star_i18n_LocaleDataItem2_idl__
+
+#include <com/sun/star/i18n/LocaleDataItem.idl>
+
+module com { module sun { module star { module i18n {
+
+/**
+    Locale specific data, derived from LocaleDataItem adding an
+    alternative input decimal separator.
+
+    @since LibreOffice 6.0
+ */
+
+struct LocaleDataItem2 : LocaleDataItem
+{
+    /** Alternative input decimal separator, for example, <b>"."</b> if
+        the regular locale dependent separator usually is not present on
+        keyboards used with that locale.
+
+        <p> This separator is optional, an empty string denotes no
+        alternative decimal separator shall be used.
+     */
+    string decimalSeparatorAlternative;
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/offapi/com/sun/star/i18n/XLocaleData5.idl b/offapi/com/sun/star/i18n/XLocaleData5.idl
new file mode 100644
index 000000000000..5a1eeb9bc22e
--- /dev/null
+++ b/offapi/com/sun/star/i18n/XLocaleData5.idl
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef __com_sun_star_i18n_XLocaleData5_idl__
+#define __com_sun_star_i18n_XLocaleData5_idl__
+
+#include <com/sun/star/i18n/XLocaleData4.idl>
+
+
+module com { module sun { module star { module i18n {
+
+
+/**
+    Access locale specific data.
+
+    <p> Derived from ::com::sun::star::i18n::XLocaleData4
+    this provides an additional method to return an instance of
+    com::sun::star::i18n::LocaleDataItem2
+
+    @since LibreOffice 6.0
+ */
+
+interface XLocaleData5 : com::sun::star::i18n::XLocaleData4
+{
+    /** returns an instance of com::sun::star::i18n::LocaleDataItem2 for
+        a Locale.
+     */
+    com::sun::star::i18n::LocaleDataItem2   getLocaleItem2( [in] com::sun::star::lang::Locale Locale );
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */