From 5f78685ebf4be192cbf5168424e5ca98bbe48d6f Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 9 Nov 2012 00:20:11 +0100
Subject: oox: make things easier to debug by tracing exceptions

Change-Id: I05df8435874eb65f3acedaaea50b4910e9fc9111
---
 oox/source/ole/axcontrol.cxx  | 21 ++++++++++++++-------
 oox/source/vml/vmldrawing.cxx |  3 ++-
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'oox')

diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 28b49bef5c07..f2b2bc849a78 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -194,8 +194,9 @@ bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XM
         orRangeAddr = xAddressable->getRangeAddress();
         return true;
     }
-    catch(const Exception& )
+    catch (const Exception& e)
     {
+        SAL_WARN("oox", "exception: " << e.Message);
     }
     return false;
 }
@@ -226,8 +227,9 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx
             CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" );
         rConverter.set( xModelFactory->createInstance( aServiceName ) );
     }
-    catch(const Exception& )
+    catch (const Exception& e)
     {
+        SAL_WARN("oox", "exception: " << e.Message);
     }
     rConverter.setProperty( PROP_XLA1Representation, rAddressString );
     rConverter.setProperty( PROP_ReferenceSheet, nRefSheet );
@@ -372,8 +374,9 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
             CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW );
         xBindable->setValueBinding( xBinding );
     }
-    catch(const Exception& )
+    catch (const Exception& e)
     {
+        SAL_WARN("oox", "exception: " << e.Message);
     }
 
     // list entry source
@@ -404,8 +407,9 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo
             CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource"  ), aArgs ), UNO_QUERY_THROW );
         xEntrySink->setListEntrySource( xEntrySource );
     }
-    catch(const Exception& )
+    catch (const Exception& e)
     {
+        SAL_WARN("oox", "exception: " << e.Message);
     }
 }
 
@@ -2554,8 +2558,9 @@ bool EmbeddedControl::convertProperties( const Reference< XControlModel >& rxCtr
         {
             aPropMap.setProperty( PROP_GenerateVbaEvents, true);
         }
-        catch(const Exception& )
+        catch (const Exception& e)
         {
+            SAL_WARN("oox", "exception: " << e.Message);
         }
         mxModel->convertProperties( aPropMap, rConv );
         PropertySet aPropSet( rxCtrlModel );
@@ -2606,8 +2611,9 @@ Reference< XControlModel > EmbeddedForm::convertAndInsert( const EmbeddedControl
         if( rControl.convertProperties( xCtrlModel, maControlConv ) )
             return xCtrlModel;
     }
-    catch(const Exception& )
+    catch (const Exception& e)
     {
+        SAL_WARN("oox", "exception creating Control: " << e.Message);
     }
     return Reference< XControlModel >();
 }
@@ -2631,8 +2637,9 @@ Reference< XIndexContainer > EmbeddedForm::createXForm()
                 mxFormIC.set( xForm, UNO_QUERY_THROW );
             }
         }
-        catch(const Exception& )
+        catch (const Exception& e)
         {
+            SAL_WARN("oox", "exception creating Form: " << e.Message);
         }
         // always clear the forms supplier to not try to create the form again
         mxFormsSupp.clear();
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 58eb29b15138..1406ebea48d5 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -253,8 +253,9 @@ Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::Emb
         // set the control model at the shape
         Reference< XControlShape >( xShape, UNO_QUERY_THROW )->setControl( xCtrlModel );
     }
-    catch( Exception& )
+    catch (Exception const& e)
     {
+        SAL_WARN("oox", "exception inserting Shape: " << e.Message);
     }
     return xShape;
 }
-- 
cgit