give DBG_UNHANDLED_EXCEPTION_WHEN an area parameter

and rename it to DBG_UNHANDLED_EXCEPTION, to make it more like
the SAL_WARN-type macros.

Use some macro magic to deal with different numbers of arguments.

Update the sallogareas plugin to check the area parameter of
DBG_UNHANDLED_EXCEPTION.

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

2 files changed, 18 insertions, 18 deletions

diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index b0422e8fde8b..fd2ad7ca647c 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -554,7 +554,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
             }
             catch(const uno::Exception&)
             {
-                DBG_UNHANDLED_EXCEPTION_WHEN( "collecting auto styles for a table" );
+                DBG_UNHANDLED_EXCEPTION( "xmloff", "collecting auto styles for a table" );
             }
             break;
         }
@@ -746,7 +746,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
             }
             catch(const uno::Exception&)
             {
-                DBG_UNHANDLED_EXCEPTION_WHEN( "exporting layer name for shape" );
+                DBG_UNHANDLED_EXCEPTION( "xmloff", "exporting layer name for shape" );
             }
         }
     }
@@ -1867,7 +1867,7 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
     }
     catch( uno::Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION_WHEN( "exporting Title and/or Description for shape" );
+        DBG_UNHANDLED_EXCEPTION( "xmloff", "exporting Title and/or Description for shape" );
     }
 }
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index b48c92d3c577..edcbcf4af1bc 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -330,7 +330,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
         }
         catch(const uno::Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION_WHEN( "during setting of glue points");
+            DBG_UNHANDLED_EXCEPTION( "xmloff", "during setting of glue points");
         }
     }
 }
@@ -401,7 +401,7 @@ void SdXMLShapeContext::EndElement()
     }
     catch(const Exception&)
     {
-        DBG_UNHANDLED_EXCEPTION_WHEN("while setting hyperlink");
+        DBG_UNHANDLED_EXCEPTION("xmloff", "while setting hyperlink");
     }
 
     if( mxLockable.is() )
@@ -443,7 +443,7 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
         }
         catch(const Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION_WHEN( "while setting visible or printable" );
+            DBG_UNHANDLED_EXCEPTION( "xmloff", "while setting visible or printable" );
         }
 
         if(!mbTemporaryShape && (!GetImport().HasTextImport()
@@ -678,7 +678,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
                 }
                 catch(const uno::Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION_WHEN( "finding style for shape" );
+                    DBG_UNHANDLED_EXCEPTION( "xmloff", "finding style for shape" );
                 }
             }
 
@@ -691,7 +691,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
                 }
                 catch(const uno::Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION_WHEN( "setting style for shape" );
+                    DBG_UNHANDLED_EXCEPTION( "xmloff", "setting style for shape" );
                 }
             }
 
@@ -986,7 +986,7 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
                 }
                 catch(const uno::Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION_WHEN( "setting corner radius");
+                    DBG_UNHANDLED_EXCEPTION( "xmloff", "setting corner radius");
                 }
             }
         }
@@ -1647,7 +1647,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                 }
                 catch(const uno::Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION_WHEN( "setting corner radius");
+                    DBG_UNHANDLED_EXCEPTION( "xmloff", "setting corner radius");
                 }
             }
         }
@@ -1664,7 +1664,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                 }
                 catch(const uno::Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION_WHEN( "setting name of next chain link");
+                    DBG_UNHANDLED_EXCEPTION( "xmloff", "setting name of next chain link");
                 }
             }
         }
@@ -2300,7 +2300,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                 }
                 catch(const uno::Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION_WHEN( "setting corner radius");
+                    DBG_UNHANDLED_EXCEPTION( "xmloff", "setting corner radius");
                 }
             }
         }
@@ -3352,7 +3352,7 @@ void SdXMLFrameShapeContext::removeGraphicFromImportContext(const SvXMLImportCon
         }
         catch( uno::Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION_WHEN( "Error in cleanup of multiple graphic object import." );
+            DBG_UNHANDLED_EXCEPTION( "xmloff", "Error in cleanup of multiple graphic object import." );
         }
     }
 }
@@ -3386,7 +3386,7 @@ uno::Reference<graphic::XGraphic> SdXMLFrameShapeContext::getGraphicFromImportCo
     }
     catch( uno::Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION_WHEN("Error in cleanup of multiple graphic object import.");
+        DBG_UNHANDLED_EXCEPTION("xmloff", "Error in cleanup of multiple graphic object import.");
     }
 
     return xGraphic;
@@ -3410,7 +3410,7 @@ OUString SdXMLFrameShapeContext::getGraphicPackageURLFromImportContext(const SvX
         }
         catch( uno::Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION_WHEN( "Error in cleanup of multiple graphic object import." );
+            DBG_UNHANDLED_EXCEPTION( "xmloff", "Error in cleanup of multiple graphic object import." );
         }
     }
 
@@ -3713,7 +3713,7 @@ void SdXMLCustomShapeContext::StartElement( const uno::Reference< xml::sax::XAtt
         }
         catch(const uno::Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION_WHEN( "setting enhanced customshape geometry" );
+            DBG_UNHANDLED_EXCEPTION( "xmloff", "setting enhanced customshape geometry" );
         }
         SdXMLShapeContext::StartElement(xAttrList);
     }
@@ -3796,7 +3796,7 @@ void SdXMLCustomShapeContext::EndElement()
         }
         catch(const uno::Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION_WHEN( "setting enhanced customshape geometry" );
+            DBG_UNHANDLED_EXCEPTION( "xmloff", "setting enhanced customshape geometry" );
         }
 
         sal_Int32 nUPD;
@@ -3834,7 +3834,7 @@ void SdXMLCustomShapeContext::EndElement()
     }
     catch(const uno::Exception&)
     {
-        DBG_UNHANDLED_EXCEPTION_WHEN("flushing after load");
+        DBG_UNHANDLED_EXCEPTION("xmloff", "flushing after load");
     }
 }