Consolidate isFileUrl checks

Change-Id: I1b74fdfaa09c4d0d6c296253958e83e78b546a9a

3 files changed, 7 insertions, 4 deletions

diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index 863e7a3dcf8a..a11f1a635227 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
+#include <comphelper/fileurl.hxx>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 
@@ -139,7 +140,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu
         plugin->provideNewStream( OUString(),
                                   Reference< XActiveDataSource >(),
                                   aUrl,
-                                  0, 0, aUrl.startsWith("file:") );
+                                  0, 0, comphelper::isFileUrl(aUrl) );
         return;
     }
 
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index c78cb0f928b0..688a0b2eacff 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -40,6 +40,7 @@
 
 #include <cstdarg>
 
+#include <comphelper/fileurl.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -220,7 +221,7 @@ Reference< ::com::sun::star::plugin::XPlugin >  XPluginManager_Impl::createPlugi
     pImpl->provideNewStream( pImpl->getDescription().Mimetype,
                              Reference< com::sun::star::io::XActiveDataSource >(),
                              url,
-                             0, 0, url.startsWith("file:") );
+                             0, 0, comphelper::isFileUrl(url) );
 
     if( ! pImpl->getPluginComm() )
     {
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index db644ec087f7..eab48cd11979 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/plugin/PluginManager.hpp>
 
 #include <cppuhelper/queryinterface.hxx>
+#include <comphelper/fileurl.hxx>
 #include <comphelper/processfactory.hxx>
 #include <plugin/impl.hxx>
 #include <sal/log.hxx>
@@ -451,7 +452,7 @@ void XPlugin_Impl::modelChanged()
     provideNewStream( m_aDescription.Mimetype,
                       uno::Reference< XActiveDataSource >(),
                       aURL,
-                      0, 0, aURL.startsWith("file:") );
+                      0, 0, comphelper::isFileUrl(aURL) );
     m_nProvidingState = PROVIDING_NONE;
 }
 
@@ -787,7 +788,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype,
         if( isfile && stype == NP_ASFILEONLY )
         {
             OString aFileName;
-            if( url.startsWith("file:") )
+            if( comphelper::isFileUrl(url) )
             {
                 OUString aSysName;
                 osl_getSystemPathFromFileURL( url.pData, &aSysName.pData );