From ill-named comphelper::getExpandedFilePath to comphelper::getExpanedUri

Change-Id: I749d78d115f641b2ac18cd6eb483c69a22ee210c

2 files changed, 41 insertions, 36 deletions

diff --git a/include/comphelper/expandmacro.hxx b/include/comphelper/expandmacro.hxx
deleted file mode 100644
index e85c55b42046..000000000000
--- a/include/comphelper/expandmacro.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- 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/.
- */
-
-#ifndef INCLUDED_COMPHELPER_EXPANDMACRO_HXX
-#define INCLUDED_COMPHELPER_EXPANDMACRO_HXX
-
-#include <rtl/ustring.hxx>
-#include <comphelper/comphelperdllapi.h>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-namespace comphelper
-{
-    /**
-     A helper function to get expanded version of macro for filepaths.
-
-     If the given path is prefixed by "vnd.sun.star.expand:", this
-     function substitutes contained macro references. It then always
-     returns a system file path, if necessary converting file
-     URIs. Example:
-     vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR gets
-     converted to e.g. /usr/lib64/libreoffice/share.
-
-     @param path to operate on. Both system file path and file URIs are accepted.
-
-     @return macro-expanded file URI.
-    */
-    COMPHELPER_DLLPUBLIC rtl::OUString getExpandedFilePath(const rtl::OUString& filepath);
-}
-#endif
diff --git a/include/comphelper/getexpandeduri.hxx b/include/comphelper/getexpandeduri.hxx
new file mode 100644
index 000000000000..9da095821e66
--- /dev/null
+++ b/include/comphelper/getexpandeduri.hxx
@@ -0,0 +1,41 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_COMPHELPER_GETEXPANDEDURI_HXX
+#define INCLUDED_COMPHELPER_GETEXPANDEDURI_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <comphelper/comphelperdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
+} } } }
+
+namespace comphelper {
+
+/**
+   A helper function to expand vnd.sun.star.expand URLs.
+
+   If the given URI is a vnd.sun.star.expand URL, it is expanded (using the
+   given component context's com.sun.star.util.theMacroExpander); otherwise it
+   is returned unchanged.
+*/
+COMPHELPER_DLLPUBLIC OUString getExpandedUri(
+    css::uno::Reference<css::uno::XComponentContext> const & context,
+    OUString const & uri);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */