fdo#46808, convert singleton util::theOfficeInstallationDirectories

.. to new-style UNO.

And deprecate old service in favour of singleton.

Change-Id: I67244097c22af02530214d7c529dd0d32f5964c1

4 files changed, 52 insertions, 17 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 21e050fbe16d..6877658c4f5c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -362,6 +362,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
 	NumberFormatsSupplier \
 	PathSubstitution \
 	TextSearch \
+	theOfficeInstallationDirectories \
 	UriAbbreviation \
 	URLTransformer \
 ))
diff --git a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
index a4c8f13d2865..94f7164f14bd 100644
--- a/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
+++ b/offapi/com/sun/star/util/OfficeInstallationDirectories.idl
@@ -39,24 +39,10 @@ module com {  module sun {  module star {  module  util {
     installations.
 
     @since OOo 2.0
+    @deprecated rather use the singleton theOfficeInstallationDirectories
  */
-published service OfficeInstallationDirectories
-{
-  /** provides access to the current office installation directories (office
-      base installation and user data).
-    */
-  interface com::sun::star::util::XOfficeInstallationDirectories;
-};
-
-
-/** A singleton that provides access to the current office installation
-    directories.
-
-    @see OfficeInstallationDirectories
-*/
-published singleton theOfficeInstallationDirectories
-{
-    service com::sun::star::util::OfficeInstallationDirectories;
+published service OfficeInstallationDirectories {
+    interface XOfficeInstallationDirectories;
 };
 
 
diff --git a/offapi/com/sun/star/util/theOfficeInstallationDirectories.idl b/offapi/com/sun/star/util/theOfficeInstallationDirectories.idl
new file mode 100644
index 000000000000..275c069ddde0
--- /dev/null
+++ b/offapi/com/sun/star/util/theOfficeInstallationDirectories.idl
@@ -0,0 +1,48 @@
+/* -*- 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_theOfficeInstallationDirectories_idl__
+#define __com_sun_star_util_theOfficeInstallationDirectories_idl__
+
+#include <com/sun/star/util/XOfficeInstallationDirectories.idl>
+
+
+module com {  module sun {  module star {  module  util {
+
+
+/** encapsulates access to the current office installation directory and
+    office user data directory, provides functionality to create URLs
+    containing relocatable (not absolute) references to the current office
+    installation directory and user data directory and vice versa.
+
+    <p>This functionality is useful when data containing references to the
+    current office installation directory or user data directory must be made
+    persistent and re-read later. In many cases, storing the reference
+    directly would destroy the relocatability of an office installation and the
+    possibility to share one office user data directory among parallel office
+    installations.
+ */
+published singleton theOfficeInstallationDirectories : XOfficeInstallationDirectories;
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 720c3ecd6e50..ff334d8332de 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb