fdo#46808, Adapt util::NumberFormatter UNO service to new style

Create a merged XNumberFormatter2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: I57f35cde0a9dbbe91c1d2c3d068cb3a97c7245e3

4 files changed, 54 insertions, 19 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index db5c89d24304..64d1a4de6739 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -295,6 +295,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
 	JobManager \
+	NumberFormatter \
 	PathSubstitution \
 	TextSearch \
 	UriAbbreviation \
@@ -1482,7 +1483,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
 	NumberFormatSettings \
 	NumberFormats \
 	NumberFormatsSupplier \
-	NumberFormatter \
 	OfficeInstallationDirectories \
 	PathSettings \
 	ReplaceDescriptor \
@@ -4061,6 +4061,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
 	XNumberFormats \
 	XNumberFormatsSupplier \
 	XNumberFormatter \
+	XNumberFormatter2 \
 	XOfficeInstallationDirectories \
 	XPropertyReplace \
 	XProtectable \
diff --git a/offapi/com/sun/star/util/NumberFormatter.idl b/offapi/com/sun/star/util/NumberFormatter.idl
index b3cd82c835cf..54c65c3c89d3 100644
--- a/offapi/com/sun/star/util/NumberFormatter.idl
+++ b/offapi/com/sun/star/util/NumberFormatter.idl
@@ -19,13 +19,10 @@
 #ifndef __com_sun_star_util_NumberFormatter_idl__
 #define __com_sun_star_util_NumberFormatter_idl__
 
-#include <com/sun/star/util/XNumberFormatter.idl>
+#include <com/sun/star/util/XNumberFormatter2.idl>
 
-#include <com/sun/star/util/XNumberFormatPreviewer.idl>
 
-
-
- module com {  module sun {  module star {  module util {
+module com {  module sun {  module star {  module util {
 
 
 /** represents an object which can format numbers and strings.
@@ -33,19 +30,7 @@
     <p>A NumberFormatter, if available, can be created by the global
     service manager.</p>
  */
-published service NumberFormatter
-{
-    /** is used to format or parse numbers using formats from a
-        <type>NumberFormats</type> object.
-     */
-    interface com::sun::star::util::XNumberFormatter;
-
-    /** is used to format numbers using a number format string
-        that is not inserted into a <type>NumberFormats</type> object.
-     */
-    interface com::sun::star::util::XNumberFormatPreviewer;
-
-};
+published service NumberFormatter : XNumberFormatter2;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/util/XNumberFormatter2.idl b/offapi/com/sun/star/util/XNumberFormatter2.idl
new file mode 100644
index 000000000000..a17382177664
--- /dev/null
+++ b/offapi/com/sun/star/util/XNumberFormatter2.idl
@@ -0,0 +1,49 @@
+/* -*- 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/.
+ *
+ * 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 .
+ */
+#ifndef __com_sun_star_util_XNumberFormatter2_idl__
+#define __com_sun_star_util_XNumberFormatter2_idl__
+
+#include <com/sun/star/util/XNumberFormatter.idl>
+#include <com/sun/star/util/XNumberFormatPreviewer.idl>
+
+module com {  module sun {  module star {  module util {
+
+/** Provides a unified interface for the NumberFormatter service to implement.
+*/
+published interface XNumberFormatter2
+{
+
+    /** is used to format or parse numbers using formats from a
+        <type>NumberFormats</type> object.
+     */
+    interface com::sun::star::util::XNumberFormatter;
+
+    /** is used to format numbers using a number format string
+        that is not inserted into a <type>NumberFormats</type> object.
+     */
+    interface com::sun::star::util::XNumberFormatPreviewer;
+
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 1969d252fda5..d36fc05331eb 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb