[Libreoffice-commits] core.git: vcl/source

Michael Meeks michael.meeks at suse.com
Tue Jun 11 04:09:44 PDT 2013


 vcl/source/gdi/impimagetree.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit c0b78901dba033ed112a023a787575ae54ef877d
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jun 11 12:05:46 2013 +0100

    Missing zip files now result in a DeploymentException so ignore that.
    
    DeploymentException seems to be a hard RuntimeException, so this is a
    new behaviour. We need to think if zip::ZipFileAccess::createWithURL
    should return that; see 28e3aff576f06b0b02c7232da5d723e865b3c7ed
    
    Change-Id: Ie99ea4c7519cbc1aa7790768d7e9e0c2edef68e0

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 6f7c566..fbeccef 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -301,8 +301,6 @@ bool ImplImageTree::find(
     if (!m_path.second.is()) {
         try {
             m_path.second = css::packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(), m_path.first + ".zip");
-        } catch (css::uno::RuntimeException &) {
-            throw;
         } catch (const css::uno::Exception & e) {
             SAL_INFO("vcl", "ImplImageTree::find exception "
                 << e.Message << " for " << m_path.first);
@@ -344,10 +342,6 @@ void ImplImageTree::loadImageLinks()
         {
             m_path.second = css::packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(), m_path.first + ".zip");
         }
-        catch (css::uno::RuntimeException &)
-        {
-            throw;
-        }
         catch (const css::uno::Exception & e)
         {
             SAL_INFO("vcl", "ImplImageTree::find exception "


More information about the Libreoffice-commits mailing list