From 5da0dce19caaf87a6fe53750a7e9ea5d564d6a12 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 19 Aug 2015 12:24:37 +0200
Subject: Consolidate isFileUrl checks

Change-Id: I1b74fdfaa09c4d0d6c296253958e83e78b546a9a
---
 comphelper/source/misc/fileurl.cxx                 | 29 ++++++++++++++++++++++
 .../officeinstallationdirectories.cxx              |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 comphelper/source/misc/fileurl.cxx

(limited to 'comphelper/source')

diff --git a/comphelper/source/misc/fileurl.cxx b/comphelper/source/misc/fileurl.cxx
new file mode 100644
index 000000000000..9abf1a97f62d
--- /dev/null
+++ b/comphelper/source/misc/fileurl.cxx
@@ -0,0 +1,29 @@
+/* -*- 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 .
+ */
+
+#include <sal/config.h>
+
+#include <comphelper/fileurl.hxx>
+#include <rtl/ustring.hxx>
+
+bool comphelper::isFileUrl(OUString const & url) {
+    return url.startsWithIgnoreAsciiCase("file:");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 044eeaa59287..7ba751c0951b 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -32,6 +32,7 @@
 #include <osl/file.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
+#include <comphelper/fileurl.hxx>
 
 #include "officeinstallationdirectories.hxx"
 
@@ -46,7 +47,7 @@ using namespace comphelper;
 
 static bool makeCanonicalFileURL( OUString & rURL )
 {
-    OSL_ENSURE(rURL.startsWithIgnoreAsciiCase("file:"), "File URL expected!");
+    OSL_ENSURE(comphelper::isFileUrl(rURL), "File URL expected!");
 
     OUString aNormalizedURL;
     if ( osl::FileBase::getAbsoluteFileURL( OUString(),
-- 
cgit