summaryrefslogtreecommitdiff
path: root/offapi
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-01-27 09:51:58 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-02-06 12:03:25 +0100
commit094f92bb789ecd24793c5843bfae13e79122fc5a (patch)
treee0bcb505f942a7f323cdbc9419eede5723165f5c /offapi
parenta315454f349469923490e4116806ee19263849b8 (diff)
Introduce com.sun.star.util.thePathSettings singleton.
To replace single-instance com.sun.star.util.PathSettings service, incorrectly converted in 89b0017b22889af6a8afe28b94c06e7095dc8c6f Keeping util::PathSettings::create in sc/source/ui/vba/vbaapplication.cxx because for some reason util::thePathSettings::get does not work in sc_macros_test while testing sc/qa/extras/testdocuments/Ranges.xls. Change-Id: I75b68ae56ac5b58f72416070dba100ab3ab70fe8
Diffstat (limited to 'offapi')
-rwxr-xr-xoffapi/UnoApi_offapi.mk1
-rw-r--r--offapi/com/sun/star/util/PathSettings.idl14
-rw-r--r--offapi/com/sun/star/util/thePathSettings.idl52
3 files changed, 57 insertions, 10 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 936073c9068c..9aaf26b3810d 100755
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -446,6 +446,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/util,\
theOfficeInstallationDirectories \
UriAbbreviation \
URLTransformer \
+ thePathSettings \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xforms,\
Model \
diff --git a/offapi/com/sun/star/util/PathSettings.idl b/offapi/com/sun/star/util/PathSettings.idl
index 14b0d3fba30a..00ab23d559f4 100644
--- a/offapi/com/sun/star/util/PathSettings.idl
+++ b/offapi/com/sun/star/util/PathSettings.idl
@@ -26,16 +26,10 @@
module com { module sun { module star { module util {
-/** Supports read/write access and listener for the paths properties that
- the Office uses.
- <p>
- The property names of the Office paths/directories are an exactly match
- to the configuration entries found in the file
- (org/openoffice/Office/Common.xml).<br>
- This service supports the usage of path variables to define
- paths that a relative to other office or system directories.
- See PathSubstitution
- </p>
+/**
+ A legacy (single-instance) service-variant of thePathSettings singleton.
+
+ @deprecated Use thePathSettings singleton instead.
@since OOo 1.1.2
*/
diff --git a/offapi/com/sun/star/util/thePathSettings.idl b/offapi/com/sun/star/util/thePathSettings.idl
new file mode 100644
index 000000000000..ea3adb69105b
--- /dev/null
+++ b/offapi/com/sun/star/util/thePathSettings.idl
@@ -0,0 +1,52 @@
+/* -*- 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_thePathSettings_idl__
+#define __com_sun_star_util_thePathSettings_idl__
+
+#include <com/sun/star/util/XPathSettings.idl>
+
+
+module com { module sun { module star { module util {
+
+
+/** Supports read/write access and listener for the paths properties that
+ the Office uses.
+ <p>
+ The property names of the Office paths/directories are an exactly match
+ to the configuration entries found in the file
+ (org/openoffice/Office/Common.xml).<br>
+ This service supports the usage of path variables to define
+ paths that a relative to other office or system directories.
+ See PathSubstitution
+ </p>
+
+ Prior to LibreOffice 4.3, this singleton was only available as a
+ (single-instance) PathSettings service.
+
+ @since LibreOffice 4.3
+ */
+published singleton thePathSettings : XPathSettings;
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */