[ooo-build-commit] 3 commits - configure.in patches/dev300

[Tor Lillqvist]

 configure.in                                                  |    2 
 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |   66 ++++++++--
 2 files changed, 54 insertions(+), 14 deletions(-)

New commits:
commit 12c6c15e33e129a75b72ed991dd297de3e407b70
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Nov 26 11:14:34 2009 +0200

    Ignore one more exception

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 c9d04fd..9d66983 100644
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
@@ -308,3 +308,19 @@
  
              // if the target medium is an alien format and the "old" medium was an own format and the "old" medium
              // has a name, the object storage must be exchanged, because now we need a new temporary storage
+@@ -3800,7 +3800,14 @@
+ 
+     try
+     {
+-        uno::Sequence< ::rtl::OUString > aSubElements = xSource->getElementNames();
++        uno::Sequence< ::rtl::OUString > aSubElements;
++        try {
++            aSubElements = xSource->getElementNames();
++        }
++        catch( uno::Exception& )
++        {
++            // Just ignore it, ok?
++        }
+         for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ )
+         {
+             if ( aSubElements[nInd].equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Configurations" ) ) ) )
commit 78a449eebeb5530958842ed191727aa5f0c21c0c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 25 15:23:29 2009 +0200

    Fix trivial typo in help message

diff --git a/configure.in b/configure.in
index 14a3643..0feccec 100644
--- a/configure.in
+++ b/configure.in
@@ -118,7 +118,7 @@ AC_ARG_ENABLE(binfilter,
 
 AC_ARG_ENABLE(odk,
 [  --disable-odk           OO.o includes an ODK, office development kit
-                          which some packagers may with to build without
+                          which some packagers may wish to build without
 ],,)
 
 AC_ARG_WITH(mingwin,
commit e3e18bb5be6eb33c37411e09e597e599180bd06b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Nov 23 15:10:12 2009 +0200

    Hack to make preprocessing when loading (odf-converter) work in 3.2
    
    Guard agaist exceptions (with empty catch blocks) in two places. Very
    ugly.

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 cd1ec5b..c9d04fd 100644
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
@@ -1,16 +1,3 @@
-Florian's sfx2-pre-and-postprocess-during-save-load patch
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- sfx2/source/doc/objstor.cxx |  225 +++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 223 insertions(+), 2 deletions(-)
-
-
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index d6ce464..509f208 100644
 --- sfx2/source/doc/objstor.cxx
 +++ sfx2/source/doc/objstor.cxx
 @@ -110,6 +110,9 @@
@@ -150,6 +137,43 @@ index d6ce464..509f208 100644
  //=========================================================================
  void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel)
  {
+@@ -600,8 +600,14 @@
+ 
+                 // treat the package as broken if the mediatype was retrieved as a fallback
+                 uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
+-                xStorProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaTypeFallbackUsed" ) ) )
+-                                                                    >>= bWarnMediaTypeFallback;
++                try {
++                    xStorProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaTypeFallbackUsed" ) ) )
++                                                                        >>= bWarnMediaTypeFallback;
++                }
++                catch( uno::Exception& )
++                {
++                    // Just ignore it if we can't get any MediaTypeFallbackUsed property,
++                }
+ 
+                 if ( pRepairPackageItem && pRepairPackageItem->GetValue() )
+                 {
+@@ -640,8 +640,17 @@
+                     bWarnMediaTypeFallback = sal_False;
+                 }
+ 
+-                if ( bWarnMediaTypeFallback || !xStorage->getElementNames().getLength() )
+-                    SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
++                try {
++                    if ( bWarnMediaTypeFallback || !xStorage->getElementNames().getLength() )
++                        SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
++                }
++                catch( uno::Exception& )
++                {
++                    // Just ignore it if we can't get element names here.
++                    // Is this the right thing to do, no clue. But it helps
++                    // loading OOXML documents using the external odf-converter
++                    // pre- and postprocessor (see below).
++                }
+             }
+             catch( uno::Exception& )
+             {
 @@ -693,7 +816,51 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
              {
                  pImp->nLoadedFlags = 0;