pass area param to DBG_UNHANDLED_EXCEPTION

and update sallogareas plugin to enforce this

Change-Id: Id0782c8a1f619372e10d931aec3c6a4743a4c86a
Reviewed-on: https://gerrit.libreoffice.org/52249
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 29 insertions, 34 deletions

diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index 8e9bfa2b637b..51bc30d68ab1 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -507,7 +507,7 @@ void XMLSettingsExportHelper::ManipulateSetting( uno::Any& rAny, const OUString&
             }
             catch( uno::Exception& )
             {
-                DBG_UNHANDLED_EXCEPTION();
+                DBG_UNHANDLED_EXCEPTION("xmloff.core");
             }
         }
 
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index f474cb7959cb..a2baf499cabd 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -132,8 +132,7 @@ getBuildIdsProperty(uno::Reference<beans::XPropertySet> const& xImportInfo)
         }
         catch (Exception const&)
         {
-            SAL_WARN("xmloff.core", "exception getting BuildId");
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.core", "exception getting BuildId");
         }
     }
     return OUString();
@@ -999,8 +998,7 @@ void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XCompo
     }
     catch (uno::Exception const&)
     {
-        SAL_WARN("xmloff.core", "exception caught");
-        DBG_UNHANDLED_EXCEPTION();
+        DBG_UNHANDLED_EXCEPTION("xmloff.core");
     }
     if (!mxEventListener.is())
     {
@@ -1591,13 +1589,11 @@ void SvXMLImport::AddNumberStyle(sal_Int32 nKey, const OUString& rName)
         }
         catch ( uno::Exception& )
         {
-            SAL_WARN( "xmloff.core", "Numberformat could not be inserted");
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION( "xmloff.core", "Numberformat could not be inserted");
         }
     }
     else {
-        SAL_WARN( "xmloff.core", "not possible to create NameContainer");
-        DBG_UNHANDLED_EXCEPTION();
+        DBG_UNHANDLED_EXCEPTION( "xmloff.core", "not possible to create NameContainer");
     }
 }
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index fd2ad7ca647c..313461bccc3d 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -780,7 +780,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
         }
         catch(const uno::Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.draw");
         }
     }
 
@@ -4880,7 +4880,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
                             }
                             catch( uno::Exception& )
                             {
-                                DBG_UNHANDLED_EXCEPTION();
+                                DBG_UNHANDLED_EXCEPTION("xmloff.draw");
                             }
                         }
                     }
@@ -4961,9 +4961,9 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
                     aBase64Exp.exportOfficeBinaryDataElement( uno::Reference < io::XInputStream >( xPictureStream, uno::UNO_QUERY_THROW ) );
                 }
             }
-            catch( uno::Exception& )
+            catch( uno::Exception const & )
             {
-                DBG_UNHANDLED_EXCEPTION();
+                DBG_UNHANDLED_EXCEPTION("xmloff.draw");
             }
         }
 
@@ -4971,9 +4971,9 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
         ImpExportGluePoints( xShape );
         ImpExportDescription( xShape ); // #i68101#
     }
-    catch( uno::Exception& )
+    catch( uno::Exception const & )
     {
-        DBG_UNHANDLED_EXCEPTION();
+        DBG_UNHANDLED_EXCEPTION("xmloff.draw");
     }
 }
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index edcbcf4af1bc..3d74d57f0853 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3921,7 +3921,7 @@ void SdXMLTableShapeContext::StartElement( const css::uno::Reference< css::xml::
             }
             catch(const Exception&)
             {
-                DBG_UNHANDLED_EXCEPTION();
+                DBG_UNHANDLED_EXCEPTION("xmloff.draw");
             }
 
             const XMLPropertyMapEntry* pEntry = &aXMLTableShapeAttributes[0];
@@ -3934,7 +3934,7 @@ void SdXMLTableShapeContext::StartElement( const css::uno::Reference< css::xml::
                 }
                 catch(const Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION();
+                    DBG_UNHANDLED_EXCEPTION("xmloff.draw");
                 }
             }
         }
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index ccc088d3f3a8..b846ac745732 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -509,7 +509,7 @@ namespace xmloff
             }
             catch( const Exception& )
             {
-                DBG_UNHANDLED_EXCEPTION();
+                DBG_UNHANDLED_EXCEPTION("xmloff.forms");
             }
         }
     }
@@ -1797,7 +1797,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OControlExport::exportCellBindingAttributes: caught an exception!" );
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
         }
     }
 
@@ -1839,7 +1839,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OControlExport::exportCellListSourceRange: caught an exception!" );
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
         }
     }
 
@@ -1886,7 +1886,7 @@ namespace xmloff
         }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
         }
     }
 
@@ -1912,7 +1912,7 @@ namespace xmloff
         catch( const Exception& )
         {
             OSL_FAIL( "OColumnExport::controlHasActiveDataBinding: caught an exception!" );
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
         }
 
         return false;
@@ -1942,8 +1942,7 @@ namespace xmloff
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OControlExport::controlHasUserSuppliedListEntries: caught an exception!" );
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
         }
 
         OSL_FAIL( "OControlExport::controlHasUserSuppliedListEntries: unreachable code!" );
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 15662c336f27..87d633bd0e5d 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -267,8 +267,8 @@ namespace xmloff
             }
             catch(const Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION("xmloff.forms");
                 OSL_FAIL("OElementImport::implApplySpecificProperties: could not set the properties (using the XMultiPropertySet)!");
-                DBG_UNHANDLED_EXCEPTION();
             }
         }
 
@@ -288,10 +288,10 @@ namespace xmloff
                 }
                 catch(const Exception&)
                 {
+                    DBG_UNHANDLED_EXCEPTION("xmloff.forms");
                     OSL_FAIL(OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \"").
                         append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)).
                         append("\"!").getStr());
-                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
         }
@@ -435,10 +435,10 @@ namespace xmloff
             }
             catch(const Exception&)
             {
+                DBG_UNHANDLED_EXCEPTION("xmloff.forms");
                 OSL_FAIL(OStringBuffer("OElementImport::EndElement: could not set the property \"").
                     append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)).
                     append("\"!").getStr());
-                DBG_UNHANDLED_EXCEPTION();
             }
         }
     }
@@ -978,8 +978,8 @@ namespace xmloff
         }
         catch( const Exception& )
         {
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
             OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the class id!" );
-            DBG_UNHANDLED_EXCEPTION();
         }
 
         const sal_Char* pValueProperty = nullptr;
@@ -1016,8 +1016,8 @@ namespace xmloff
                 }
                 catch( const Exception& )
                 {
+                    DBG_UNHANDLED_EXCEPTION("xmloff.forms");
                     OSL_FAIL( "OControlImport::EndElement: caught an exception while retrieving the current value property!" );
-                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
         }
@@ -1034,8 +1034,8 @@ namespace xmloff
             }
             catch( const Exception& )
             {
+                DBG_UNHANDLED_EXCEPTION("xmloff.forms");
                 OSL_FAIL( "OControlImport::EndElement: caught an exception while restoring the value property!" );
-                DBG_UNHANDLED_EXCEPTION();
             }
         }
 
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 78c54829edd6..1e4687c377ce 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -611,7 +611,7 @@ namespace xmloff
         }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION();
+            DBG_UNHANDLED_EXCEPTION("xmloff.forms");
         }
     }
 
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 128cd618ad35..ddcdb64c2ee0 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -460,7 +460,7 @@ void XMLTextStyleContext::FillPropertySet(
             catch( const RuntimeException& ) { throw; }
             catch( const Exception& )
             {
-                DBG_UNHANDLED_EXCEPTION();
+                DBG_UNHANDLED_EXCEPTION("xmloff.text");
                 bAutomatic = false;
             }
         }
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index d760754a2ef0..1b34786766e5 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -795,7 +795,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop
     }
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION();
+        DBG_UNHANDLED_EXCEPTION("xmloff");
     }
 }
 
diff --git a/xmloff/source/xforms/xformsimport.cxx b/xmloff/source/xforms/xformsimport.cxx
index 7a5220a5a7d1..7b4db9784e44 100644
--- a/xmloff/source/xforms/xformsimport.cxx
+++ b/xmloff/source/xforms/xformsimport.cxx
@@ -184,7 +184,7 @@ void applyXFormsSettings( const Reference< XNameAccess >& _rXForms, const Sequen
     }
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION();
+        DBG_UNHANDLED_EXCEPTION("xmloff");
     }
 }