fdo#46808, Convert util::PathSettings service to new style

Change-Id: I302be46b46518e1e872771e1c8a0647f7c330b30

4 files changed, 142 insertions, 110 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8022e5ebf522..56c4f4add6b6 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -405,6 +405,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
 	NumberFormatter \
 	NumberFormatsSupplier \
 	PathSubstitution \
+	PathSettings \
 	TextSearch \
 	theOfficeInstallationDirectories \
 	UriAbbreviation \
@@ -1528,7 +1529,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\
 	NumberFormatSettings \
 	NumberFormats \
 	OfficeInstallationDirectories \
-	PathSettings \
 	ReplaceDescriptor \
 	SearchDescriptor \
 	SortDescriptor \
@@ -4061,6 +4061,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\
 	XNumberFormatter \
 	XNumberFormatter2 \
 	XOfficeInstallationDirectories \
+	XPathSettings \
 	XPropertyReplace \
 	XProtectable \
 	XRefreshListener \
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index 4523f1628ed0..b43bba6eebb1 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -20,9 +20,7 @@
 #ifndef __com_sun_star_util_PathSettings_idl__
 #define __com_sun_star_util_PathSettings_idl__
 
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/beans/XFastPropertySet.idl>
-#include <com/sun/star/beans/XMultiPropertySet.idl>
+#include <com/sun/star/util/XPathSettings.idl>
 
 
 module com {  module sun {  module star {  module  util {
@@ -41,112 +39,7 @@ module com {  module sun {  module star {  module  util {
 
     @since OOo 1.1.2
  */
-published service PathSettings
-{
-  /** Main interface to have access to the path properties. */
-  interface com::sun::star::beans::XPropertySet;
-
-  /** An extension to the <type scope="com::sun::star::beans">XPropertySet</type> interface.
-      The get and set methods use handles to access the property values
-      instead of character strings. */
-  interface com::sun::star::beans::XFastPropertySet;
-
-  /** Provides access to multiple properties of this service with a
-      single call. */
-  interface com::sun::star::beans::XMultiPropertySet;
-
-  /** Specifies the directory that contains spreadsheet add-ins which use
-      the old add-in API */
-  [property] string Addin;
-
-  /** The settings of the AutoCorrect dialog. The value can be more than
-      one path separated by a semicolon.
-  */
-  [property] string AutoCorrect;
-
-  /**The directory which contains the AutoText modules. The value can be more than
-      one path separated by a semicolon.*/
-  [property] string AutoText;
-
-  /** Automatic backup copies of documents are stored here. */
-  [property] string Backup;
-
-  /** The Basic files, used by the AutoPilots, can be found here. The value can be more than
-      one path separated by a semicolon.*/
-  [property] string Basic;
-
-  /** This directory contains the icons for the toolbars. */
-  [property] string Bitmap;
-
-  /** The configuration files are located here. This entry cannot be changed
-      by the user in Office user interface. */
-  [property] string Config;
-
-  /** The provided dictionaries are stored here. */
-  [property] string Dictionary;
-
-  /** Path to save folder bookmarks */
-  [property] string Favorite;
-
-  /** Specifies the directory where all the filters are stored. */
-  [property] string Filter;
-
-  /** Specifies the directories which contains the Gallery
-      database and multimedia files. The value can be more than
-      one path separated by a semicolon.*/
-  [property] string Gallery;
-
-  /** This directory is displayed when the dialog for opening a graphic
-      or for saving a new graphic is called. */
-  [property] string Graphic;
-
-  /** The path to the Office help files. */
-  [property] string Help;
-
-  /** The files that are necessary for the spell check are saved here. */
-  [property] string Linguistic;
-
-  /** This is the path for the modules. */
-  [property] string Module;
-
-  /** This is the path to the palette files *.SOB to *.SOF containing
-      user-defined colors and patterns. */
-  [property] string Palette;
-
-  /** Plugins are saved in these directories. The value can be more than
-      one path separated by a semicolon.*/
-  [property] string Plugin;
-
-  /** Mail, News files and other information (for example, about FTP Server)
-      are stored here.*/
-  [property] string Storage;
-
-  /** The base url to the office temp-files */
-  [property] string Temp;
-
-  /** The templates originate from these folders and sub-folders. The value
-      can be more than one path separated by a semicolon.*/
-  [property] string Template;
-
-  /** Global directories to look for user interface configuration files. The
-      user interface configuration will be merged with user settings stored
-      in the directory specified by <var>UserConfig</var>. The value can be more
-      than one path separated by a semicolon.*/
-  [property] string UIConfig;
-
-  /** Specifies the folder with the user settings. */
-  [property] string UserConfig;
-
-  /** The custom dictionaries are contained here.
-   * @deprecated
-   * */
-  [property] string UserDictionary;
-
-  /** The path of the work folder can be modified according to the
-      user's needs. The path specified here can be seen in the Open
-      or Save dialog. */
-  [property] string Work;
-};
+published service PathSettings : XPathSettings;
 
 
 }; }; }; };
diff --git a/offapi/com/sun/star/util/XPathSettings.idl b/offapi/com/sun/star/util/XPathSettings.idl
new file mode 100644
index 000000000000..5f202a369dd6
--- /dev/null
+++ b/offapi/com/sun/star/util/XPathSettings.idl
@@ -0,0 +1,138 @@
+/* -*- 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_XPathSettings_idl__
+#define __com_sun_star_util_XPathSettings_idl__
+
+#include <com/sun/star/beans/XPropertySet.idl>
+
+
+module com {  module sun {  module star {  module  util {
+
+
+/**
+    @since LibreOffice 4.1
+ */
+published interface XPathSettings
+{
+  /** Main interface to have access to the path properties. */
+  interface com::sun::star::beans::XPropertySet;
+
+  /** Specifies the directory that contains spreadsheet add-ins which use
+      the old add-in API */
+  [attribute] string Addin;
+
+  /** The settings of the AutoCorrect dialog. The value can be more than
+      one path separated by a semicolon.
+  */
+  [attribute] string AutoCorrect;
+
+  /**The directory which contains the AutoText modules. The value can be more than
+      one path separated by a semicolon.*/
+  [attribute] string AutoText;
+
+  /** Automatic backup copies of documents are stored here. */
+  [attribute] string Backup;
+
+  /** The Basic files, used by the AutoPilots, can be found here. The value can be more than
+      one path separated by a semicolon.*/
+  [attribute] string Basic;
+
+  /** This directory contains the icons for the toolbars. */
+  [attribute] string Bitmap;
+
+  /** The configuration files are located here. This entry cannot be changed
+      by the user in Office user interface. */
+  [attribute] string Config;
+
+  /** The provided dictionaries are stored here. */
+  [attribute] string Dictionary;
+
+  /** Path to save folder bookmarks */
+  [attribute] string Favorite;
+
+  /** Specifies the directory where all the filters are stored. */
+  [attribute] string Filter;
+
+  /** Specifies the directories which contains the Gallery
+      database and multimedia files. The value can be more than
+      one path separated by a semicolon.*/
+  [attribute] string Gallery;
+
+  /** This directory is displayed when the dialog for opening a graphic
+      or for saving a new graphic is called. */
+  [attribute] string Graphic;
+
+  /** The path to the Office help files. */
+  [attribute] string Help;
+
+  /** The files that are necessary for the spell check are saved here. */
+  [attribute] string Linguistic;
+
+  /** This is the path for the modules. */
+  [attribute] string Module;
+
+  /** This is the path to the palette files *.SOB to *.SOF containing
+      user-defined colors and patterns. */
+  [attribute] string Palette;
+
+  /** Plugins are saved in these directories. The value can be more than
+      one path separated by a semicolon.*/
+  [attribute] string Plugin;
+
+  /** Mail, News files and other information (for example, about FTP Server)
+      are stored here.*/
+  [attribute] string Storage;
+
+  /** The base url to the office temp-files */
+  [attribute] string Temp;
+
+  /** The templates originate from these folders and sub-folders. The value
+      can be more than one path separated by a semicolon.*/
+  [attribute] string Template;
+
+  /** Global directories to look for user interface configuration files. The
+      user interface configuration will be merged with user settings stored
+      in the directory specified by <var>UserConfig</var>. The value can be more
+      than one path separated by a semicolon.*/
+  [attribute] string UIConfig;
+
+  /** Specifies the folder with the user settings. */
+  [attribute] string UserConfig;
+
+  /** The custom dictionaries are contained here.
+   * @deprecated
+   * */
+  [attribute] string UserDictionary;
+
+  /** The path of the work folder can be modified according to the
+      user's needs. The path specified here can be seen in the Open
+      or Save dialog. */
+  [attribute] string Work;
+
+  [attribute] string BasePathShareLayer;
+  [attribute] string BasePathUserLayer;
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb
index d72a454c845d..2aa5361ff528 100644
--- a/offapi/type_reference/offapi.rdb
+++ b/offapi/type_reference/offapi.rdb