[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |   16 ++++++++++
 1 file changed, 16 insertions(+)

New commits:
commit 4915b5b7e448ec85549e0fa175402580437d4bcd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 1 19:07:57 2009 +0200

    Further hack to make post-processing when saving work
    
    Ignore an exception in one more place. Seems to help...

diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
index 9d66983..531bb82 100644
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
@@ -324,3 +324,19 @@
          for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ )
          {
              if ( aSubElements[nInd].equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Configurations" ) ) ) )
+--- package/source/xstor/xstorage.cxx
++++ package/source/xstor/xstorage.cxx
+@@ -4460,12 +4460,6 @@
+     catch ( uno::Exception& aException )
+     {
+            m_pImpl->AddLog( aException.Message );
+-           m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) );
+-
+-           uno::Any aCaught( ::cppu::getCaughtException() );
+-        throw lang::WrappedTargetRuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can not open storage!\n" ) ),
+-                                            uno::Reference< uno::XInterface >(  static_cast< OWeakObject* >( this ),
+-                                                                                uno::UNO_QUERY ),
+-                                            aCaught );
++           m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Ignored...ok!?" ) ) );
+     }
+     return ( pElement != NULL );