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

Change-Id: I58436d9eea0c38d14cde2dc01aa463d5d71912e9

3 files changed, 11 insertions, 15 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 487a94c43eb8..5692dc9e8c51 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -311,6 +311,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 \
+	NumberFormatsSupplier \
 	PathSubstitution \
 	TextSearch \
 	UriAbbreviation \
@@ -1457,7 +1458,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
 	NumberFormatProperties \
 	NumberFormatSettings \
 	NumberFormats \
-	NumberFormatsSupplier \
 	OfficeInstallationDirectories \
 	PathSettings \
 	ReplaceDescriptor \
diff --git a/offapi/com/sun/star/util/NumberFormatsSupplier.idl b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
index 9640cd2d2817..683d2a3a6746 100644
--- a/offapi/com/sun/star/util/NumberFormatsSupplier.idl
+++ b/offapi/com/sun/star/util/NumberFormatsSupplier.idl
@@ -21,10 +21,10 @@
 #define __com_sun_star_util_NumberFormatsSupplier_idl__
 
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
-#include <com/sun/star/lang/XInitialization.idl>
+#include <com/sun/star/lang/Locale.idl>
 
 
- module com {  module sun {  module star {  module util {
+module com {  module sun {  module star {  module util {
 
 
 /** provides an supplier of number formats
@@ -34,24 +34,20 @@
 
     @since OOo 1.1.2
 */
-published service NumberFormatsSupplier
+published service NumberFormatsSupplier : XNumberFormatsSupplier
 {
-    /** used to initialize the component when instantiating.
 
-        <p>In the <member scope="com::sun::star::lang">XInitialization::initialize</member> method, you can
-        pass a <type scope="com::sun::star::lang">Locale</type> to specify the default locale of the
-        number formats supplier.</p>
+    /**
+        Create using specific locale.
 
-        <p>The component should be initialized only once, after it has been instantiated, and before it
-        has been used.<br/>
-        If you initialize it a second time (or after you used it), it is up to implementation
-        how this is handled.</p>
+        @param aLocale the locale of the number formats supplier
     */
-    interface com::sun::star::lang::XInitialization;
+    createWithLocale([in] com::sun::star::lang::Locale locale);
 
-    /** allows access to the number formats supplied by the component.
+    /**
+        Create using default locale.
     */
-    interface XNumberFormatsSupplier;
+    createWithDefaultLocale();
 };
 
 
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index dee384c556f7..c178bb1f0daf 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb