More details in debug output

In particular, give type and message of exception
when unexpectedly caught.

Also miscellaneous other details.

Change-Id: I87d71028dbc902e1770fee4c3643c85e75b7646d

9 files changed, 60 insertions, 16 deletions

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index d3d670aab8ad..4db154965a10 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2003,6 +2003,7 @@ namespace pcr
         catch( const Exception& )
         {
             OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -2074,6 +2075,7 @@ namespace pcr
         catch( const Exception& )
         {
             OSL_FAIL( "FormComponentPropertyHandler::impl_initComponentMetaData_throw: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -2328,6 +2330,7 @@ namespace pcr
         catch( const Exception& )
         {
             OSL_FAIL( "FormComponentPropertyHandler::impl_getRowSet_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
         return xReturn;
     }
@@ -2367,6 +2370,7 @@ namespace pcr
         catch (const Exception&)
         {
             OSL_FAIL( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -2423,6 +2427,7 @@ namespace pcr
             catch( const Exception& )
             {
                 OSL_FAIL( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
+                DBG_UNHANDLED_EXCEPTION();
             }
             // additional info about what happended
             INetURLObject aParser( sDataSourceName );
@@ -2481,6 +2486,7 @@ namespace pcr
         catch (const Exception&)
         {
             OSL_FAIL("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -2658,6 +2664,7 @@ namespace pcr
         catch( const Exception& )
         {
             OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         if ( aErrorInfo.isValid() )
@@ -2752,6 +2759,7 @@ namespace pcr
         catch( const Exception& )
         {
             OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: : caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
         return bChanged;
     }
@@ -3282,6 +3290,7 @@ namespace pcr
             catch( const Exception& )
             {
                 OSL_FAIL( "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" );
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
         return bHas;
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 79e92da13d8f..1bd3acd35db6 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -551,6 +551,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb
     catch(const Exception&)
     {
         SAL_WARN("forms.component", "OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -566,6 +567,7 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO
     catch(const Exception&)
     {
         SAL_WARN("forms.component", "OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
+        DBG_UNHANDLED_EXCEPTION();
     }
     ::comphelper::operator<<( _rxOutStream, sHelpText);
 }
@@ -608,7 +610,8 @@ OControlModel::OControlModel(
                 }
                 catch( const Exception& )
                 {
-                    SAL_WARN("forms.component",  "OControlModel::OControlModel: caught an exception!" );
+                    SAL_WARN("forms.component",  "OControlModel::OControlModel: caught an exception!");
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
         }
@@ -996,7 +999,7 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
             if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
                 m_aPropertyBagHelper.getDynamicPropertyDefaultByHandle( _nHandle, aReturn );
             else
-                SAL_WARN("forms.component",  "OControlModel::convertFastPropertyValue: unknown handle!" );
+                SAL_WARN("forms.component",  "OControlModel::convertFastPropertyValue: unknown handle " << _nHandle);
     }
     return aReturn;
 }
@@ -1073,7 +1076,7 @@ sal_Bool OControlModel::convertFastPropertyValue(
             if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
                 bModified = m_aPropertyBagHelper.convertDynamicFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue );
             else
-                SAL_WARN("forms.component",  "OControlModel::convertFastPropertyValue: unknown handle!" );
+                SAL_WARN("forms.component",  "OControlModel::convertFastPropertyValue: unknown handle " << _nHandle);
             break;
     }
     return bModified;
@@ -1117,7 +1120,7 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
             if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
                 m_aPropertyBagHelper.setDynamicFastPropertyValue( _nHandle, _rValue );
             else
-                SAL_WARN("forms.component",  "OControlModel::setFastPropertyValue_NoBroadcast: unknown handle!" );
+                SAL_WARN("forms.component",  "OControlModel::setFastPropertyValue_NoBroadcast: unknown handle " << _nHandle );
             break;
     }
 }
@@ -2002,7 +2005,8 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
         }
         catch( const Exception& )
         {
-            SAL_WARN("forms.component",  "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!" );
+            SAL_WARN("forms.component",  "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
@@ -2168,7 +2172,7 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
                 }
                 else
                 {
-                    SAL_WARN("forms.component", "OBoundControlModel::connectToField: property NAME not supported!");
+                    SAL_WARN("forms.component", "OBoundControlModel::connectToField: property " << PROPERTY_VALUE << " not supported!");
                     impl_setField_noNotify( NULL );
                 }
             }
@@ -2377,7 +2381,8 @@ void OBoundControlModel::doSetControlValue( const Any& _rValue )
     }
     catch( const Exception& )
     {
-        SAL_WARN("forms.component",  "OBoundControlModel::doSetControlValue: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::doSetControlValue: caught an exception!");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -2397,7 +2402,8 @@ void OBoundControlModel::onConnectedValidator( )
     }
     catch( const Exception& )
     {
-        SAL_WARN("forms.component",  "OBoundControlModel::onConnectedValidator: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::onConnectedValidator: caught an exception!");
+        DBG_UNHANDLED_EXCEPTION();
     }
     recheckValidity( false );
 }
@@ -2415,7 +2421,8 @@ void OBoundControlModel::onDisconnectedValidator( )
     }
     catch( const Exception& )
     {
-        SAL_WARN("forms.component",  "OBoundControlModel::onDisconnectedValidator: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::onDisconnectedValidator: caught an exception!");
+        DBG_UNHANDLED_EXCEPTION();
     }
     recheckValidity( false );
 }
@@ -2504,6 +2511,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
     catch( const SQLException& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::reset: caught an SQL exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
     // #i24495# - don't count the insert row as "invalid"
 
@@ -2550,6 +2558,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
         catch(const Exception&)
         {
             SAL_WARN("forms.component", "OBoundControlModel::reset: this should have succeeded in all cases!");
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         sal_Bool bNeedValueTransfer = sal_True;
@@ -2712,7 +2721,8 @@ void OBoundControlModel::disconnectExternalValueBinding( )
     }
     catch( const Exception& )
     {
-        SAL_WARN("forms.component",  "OBoundControlModel::disconnectExternalValueBinding: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::disconnectExternalValueBinding: caught an exception!");
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     // if the binding also acts as our validator, disconnect the validator, too
@@ -3081,7 +3091,8 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
     }
     catch( const Exception& )
     {
-        SAL_WARN("forms.component",  "OBoundControlModel::recheckValidity: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::recheckValidity: caught an exception!");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 91aebe7d1031..c81d1e02bf01 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -121,6 +121,7 @@ namespace
         catch( const Exception& )
         {
             OSL_FAIL( "getModelLineEndSetting: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
         return eFormat;
     }
@@ -587,6 +588,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
         catch( const Exception& )
         {
             OSL_FAIL( "DbCellControl::doPropertyListening: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
@@ -611,6 +613,7 @@ void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_
     catch( const Exception& )
     {
         OSL_FAIL( "DbCellControl::doPropertyListening: caught an exception!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
@@ -1121,6 +1124,7 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
     catch( const Exception& )
     {
         OSL_FAIL( "DbTextField::Init: caught an exception while determining the multi-line capabilities!" );
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     m_bIsSimpleEdit = !bIsMultiLine;
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 39be34a73722..1f9a1088bea8 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <tools/diagnose_ex.h>
 #include <comphelper/stl_types.hxx>
 #include <svx/svdobj.hxx>
 #include "svx/fmtools.hxx"
@@ -119,6 +120,7 @@ namespace
         catch( const Exception& )
         {
             OSL_FAIL( "lcl_initProperty: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index f5ec93aaecb6..4b3a8f52ee04 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -627,6 +627,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
     catch( const ::com::sun::star::uno::Exception& )
     {
         OSL_FAIL( "GraphicControlModel::setFastPropertyValue_NoBroadcast: caught an exception while aligning the ImagePosition/ImageAlign properties!" );
+        DBG_UNHANDLED_EXCEPTION();
         mbAdjustingImagePosition = sal_False;
     }
 }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 1efc6294df1d..a6b87821fa06 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -19,6 +19,7 @@
 
 #include "sal/config.h"
 
+#include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <tools/rc.h>
@@ -165,6 +166,7 @@ static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
     catch (const ::com::sun::star::uno::Exception&)
     {
         SAL_WARN( "vcl.control", "ImplIsPatternChar: Exception caught!" );
+        DBG_UNHANDLED_EXCEPTION();
         return sal_False;
     }
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 121b4d458ef1..bde6ccaca1c4 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -19,6 +19,7 @@
 
 #include <string.h>
 
+#include <tools/diagnose_ex.h>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
@@ -172,7 +173,8 @@ getBuildIdsProperty(uno::Reference<beans::XPropertySet> const& xImportInfo)
         }
         catch (Exception const& e)
         {
-            SAL_WARN("xmloff.core", "exception getting BuildId" << e.Message);
+            SAL_WARN("xmloff.core", "exception getting BuildId");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     return OUString();
@@ -849,7 +851,8 @@ void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
     }
     catch (uno::Exception const& e)
     {
-        SAL_WARN("xmloff.core", "exception caught: " << e.Message);
+        SAL_WARN("xmloff.core", "exception caught");
+        DBG_UNHANDLED_EXCEPTION();
     }
     if (!mxEventListener.is())
     {
@@ -1456,10 +1459,12 @@ void SvXMLImport::AddNumberStyle(sal_Int32 nKey, const OUString& rName)
         catch ( uno::Exception& )
         {
             SAL_WARN( "xmloff.core", "Numberformat could not be inserted");
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
     else {
         SAL_WARN( "xmloff.core", "not possible to create NameContainer");
+        DBG_UNHANDLED_EXCEPTION();
     }
 }
 
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index d4eeda78af6f..dbcb9c0e8e22 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1862,6 +1862,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OControlExport::exportCellBindingAttributes: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -1907,6 +1908,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OControlExport::exportCellListSourceRange: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -1981,6 +1983,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OColumnExport::controlHasActiveDataBinding: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         return false;
@@ -2012,6 +2015,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OControlExport::controlHasUserSuppliedListEntries: caught an exception!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         OSL_FAIL( "OControlExport::controlHasUserSuppliedListEntries: unreachable code!" );
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 443209f25891..a75a8a0435f9 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -306,9 +306,10 @@ namespace xmloff
                 xMultiProps->setPropertyValues(aNames, aValues);
                 bSuccess = sal_True;
             }
-            catch(Exception&)
+            catch(const Exception&)
             {
                 OSL_FAIL("OElementImport::implApplySpecificProperties: could not set the properties (using the XMultiPropertySet)!");
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
 
@@ -326,11 +327,12 @@ namespace xmloff
                 {
                     m_xElement->setPropertyValue(aPropValues->Name, aPropValues->Value);
                 }
-                catch(Exception&)
+                catch(const Exception&)
                 {
                     OSL_FAIL(OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \"").
                         append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)).
                         append("\"!").getStr());
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
         }
@@ -468,11 +470,12 @@ namespace xmloff
 
                 m_xElement->setPropertyValue( aPropValues->Name, aPropValues->Value );
             }
-            catch(Exception&)
+            catch(const Exception&)
             {
                 OSL_FAIL(OStringBuffer("OElementImport::EndElement: could not set the property \"").
                     append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)).
                     append("\"!").getStr());
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
     }
@@ -1031,6 +1034,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the class id!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
 
         const sal_Char* pValueProperty = NULL;
@@ -1068,6 +1072,7 @@ namespace xmloff
                 catch( const Exception& )
                 {
                     OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the current value property!" );
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
         }
@@ -1085,6 +1090,7 @@ namespace xmloff
             catch( const Exception& )
             {
                 OSL_FAIL( "OControlImport::EndElement: caught an exception while restoring the value property!" );
+                DBG_UNHANDLED_EXCEPTION();
             }
         }