From 4450b2a16677431b1b9dfaa28d0b9af9e51ebdec Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 2 Apr 2018 08:58:19 +0200
Subject: 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>
---
 xmloff/source/forms/elementexport.cxx | 13 ++++++-------
 xmloff/source/forms/elementimport.cxx | 12 ++++++------
 xmloff/source/forms/layerexport.cxx   |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'xmloff/source/forms')

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");
         }
     }
 
-- 
cgit