From 0b9b5f833cd8bb85437f2f89dcd3190eee1c161a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 18 Aug 2015 15:11:16 +0200
Subject: Simplify ZipPackage::isLocalFile check

(vnd.sun.star.wfs is long gone)

Change-Id: I3e25f1728504cbad07bb97187a7bac23b33695dc
---
 package/source/zippackage/ZipPackage.cxx | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'package/source')

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 1304e0ba4f3a..95a638a22b74 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -50,7 +50,6 @@
 #include <com/sun/star/ucb/OpenMode.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <com/sun/star/io/XActiveDataStreamer.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/embed/UseBackupException.hpp>
@@ -72,7 +71,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <vector>
 
-#include <ucbhelper/fileidentifierconverter.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/seekableinput.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -175,18 +173,7 @@ ZipPackage::~ZipPackage()
 
 bool ZipPackage::isLocalFile() const
 {
-    OUString aSystemPath;
-    uno::Reference< XUniversalContentBroker > xUcb(
-        UniversalContentBroker::create(
-            m_xContext ) );
-    try
-    {
-        aSystemPath = getSystemPathFromFileURL( xUcb, m_aURL );
-    }
-    catch ( Exception& )
-    {
-    }
-    return !aSystemPath.isEmpty();
+    return m_aURL.startsWithIgnoreAsciiCase("file:");
 }
 
 void ZipPackage::parseManifest()
-- 
cgit