teach sallogareas plugin to catch inconsistencies

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

6 files changed, 42 insertions, 44 deletions

diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 63de2b436765..5a937fcdb234 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -549,11 +549,9 @@ cairo::SurfaceSharedPtr X11SalGraphics::CreateBitmapSurface( const OutputDevice&
                                       const BitmapSystemData& rData,
                                       const Size&             rSize ) const
 {
-    SAL_INFO(
-        "canvas.cairo",
-        "requested size: " << rSize.Width() << " x " << rSize.Height()
-            << " available size: " << rData.mnWidth << " x "
-            << rData.mnHeight);
+    SAL_INFO("vcl", "requested size: " << rSize.Width() << " x " << rSize.Height()
+              << " available size: " << rData.mnWidth << " x "
+              << rData.mnHeight);
     if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
     {
         if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index cc661fb839b9..00ed8860c3e2 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -540,11 +540,11 @@ void CUPSManager::setupJobContextData( JobData& rData )
 
 FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand )
 {
-    SAL_INFO( "vcl", "startSpool: " << rPrintername << " " << (bQuickCommand ? "true" : "false") );
+    SAL_INFO( "vcl.unx.print", "startSpool: " << rPrintername << " " << (bQuickCommand ? "true" : "false") );
 
     if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() )
     {
-        SAL_INFO( "vcl", "defer to PrinterInfoManager::startSpool" );
+        SAL_INFO( "vcl.unx.print", "defer to PrinterInfoManager::startSpool" );
         return PrinterInfoManager::startSpool( rPrintername, bQuickCommand );
     }
 
@@ -617,7 +617,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
 
 bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber )
 {
-    SAL_INFO( "vcl", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies );
+    SAL_INFO( "vcl.unx.print", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies );
 
     int nJobID = 0;
 
@@ -627,7 +627,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
         m_aCUPSDestMap.find( rPrintername );
     if( dest_it == m_aCUPSDestMap.end() )
     {
-        SAL_INFO( "vcl", "defer to PrinterInfoManager::endSpool" );
+        SAL_INFO( "vcl.unx.print", "defer to PrinterInfoManager::endSpool" );
         return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber );
     }
 
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 72d7cfa297f7..234ed35d5100 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -717,40 +717,40 @@ PPDParser::PPDParser( const OUString& rFile ) :
     if( m_pImageableAreas )
         m_pDefaultImageableArea = m_pImageableAreas->getDefaultValue();
     if (m_pImageableAreas == nullptr) {
-        SAL_WARN( "vcl", "no ImageableArea in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no ImageableArea in " << m_aFile);
     }
     if (m_pDefaultImageableArea == nullptr) {
-        SAL_WARN( "vcl", "no DefaultImageableArea in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no DefaultImageableArea in " << m_aFile);
     }
 
     m_pPaperDimensions = getKey( OUString( "PaperDimension" ) );
     if( m_pPaperDimensions )
         m_pDefaultPaperDimension = m_pPaperDimensions->getDefaultValue();
     if (m_pPaperDimensions == nullptr) {
-        SAL_WARN( "vcl", "no PaperDimensions in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no PaperDimensions in " << m_aFile);
     }
     if (m_pDefaultPaperDimension == nullptr) {
-        SAL_WARN( "vcl", "no DefaultPaperDimensions in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no DefaultPaperDimensions in " << m_aFile);
     }
 
     m_pResolutions = getKey( OUString( "Resolution" ) );
     if( m_pResolutions )
         m_pDefaultResolution = m_pResolutions->getDefaultValue();
     if (m_pResolutions == nullptr) {
-        SAL_WARN( "vcl", "no Resolution in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no Resolution in " << m_aFile);
     }
     if (m_pDefaultResolution == nullptr) {
-        SAL_WARN( "vcl", "no DefaultResolution in " + m_aFile);
+        SAL_WARN( "vcl.unx.print", "no DefaultResolution in " + m_aFile);
     }
 
     m_pInputSlots = getKey( OUString( "InputSlot" ) );
     if( m_pInputSlots )
         m_pDefaultInputSlot = m_pInputSlots->getDefaultValue();
     if (m_pInputSlots == nullptr) {
-        SAL_WARN( "vcl", "no InputSlot in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no InputSlot in " << m_aFile);
     }
     if (m_pDefaultInputSlot == nullptr) {
-        SAL_WARN( "vcl", "no DefaultInputSlot in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no DefaultInputSlot in " << m_aFile);
     }
 
     m_pDuplexTypes = getKey( OUString( "Duplex" ) );
@@ -759,7 +759,7 @@ PPDParser::PPDParser( const OUString& rFile ) :
 
     m_pFontList = getKey( OUString( "Font" ) );
     if (m_pFontList == nullptr) {
-        SAL_WARN( "vcl", "no Font in " << m_aFile);
+        SAL_WARN( "vcl.unx.print", "no Font in " << m_aFile);
     }
 
     // fill in direct values
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 7d122b1d02aa..b31cc783c8d5 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -161,7 +161,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
         LABEL_TOGGLE( PREVIEW );
         LABEL_TOGGLE( SELECTION );
         default:
-            SAL_WARN( "vcl", "Handle unknown control " << i);
+            SAL_WARN( "vcl.gtk", "Handle unknown control " << i);
             break;
         }
 
@@ -197,7 +197,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
             LABEL_LIST( TEMPLATE );
             LABEL_LIST( IMAGE_TEMPLATE );
             default:
-                SAL_WARN( "vcl", "Handle unknown control " << i);
+                SAL_WARN( "vcl.gtk", "Handle unknown control " << i);
                 break;
         }
 
@@ -1078,7 +1078,7 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
         MAP_LIST_LABEL( TEMPLATE );
         MAP_LIST_LABEL( IMAGE_TEMPLATE );
     default:
-        SAL_WARN( "vcl", "Handle unknown control " << nControlId);
+        SAL_WARN( "vcl.gtk", "Handle unknown control " << nControlId);
         break;
     }
 #undef MAP
@@ -1166,7 +1166,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nContr
             }
             break;
         default:
-            SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction);
+            SAL_WARN( "vcl.gtk", "undocumented/unimplemented ControlAction for a list " << nControlAction);
             break;
     }
 
@@ -1228,7 +1228,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC
             }
             break;
         default:
-            SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction);
+            SAL_WARN( "vcl.gtk", "undocumented/unimplemented ControlAction for a list " << nControlAction);
             break;
     }
     return aAny;
@@ -1245,7 +1245,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
     GtkWidget *pWidget;
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
-        SAL_WARN( "vcl", "enable unknown control " << nControlId);
+        SAL_WARN( "vcl.gtk", "enable unknown control " << nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON )
     {
         bool bChecked = false;
@@ -1256,7 +1256,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr
         HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue);
     else
     {
-        SAL_WARN( "vcl", "Can't set value on button / list " << nControlId << " " << nControlAction );
+        SAL_WARN( "vcl.gtk", "Can't set value on button / list " << nControlId << " " << nControlAction );
     }
 }
 
@@ -1273,13 +1273,13 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC
     GtkWidget *pWidget;
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
-        SAL_WARN( "vcl", "enable unknown control " << nControlId);
+        SAL_WARN( "vcl.gtk", "enable unknown control " << nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON )
         aRetval <<= bool( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ) );
     else if( tType == GTK_TYPE_COMBO_BOX )
         aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction);
     else
-        SAL_WARN( "vcl", "Can't get value on button / list " << nControlId << " " << nControlAction );
+        SAL_WARN( "vcl.gtk", "Can't get value on button / list " << nControlId << " " << nControlAction );
 
     return aRetval;
 }
@@ -1305,7 +1305,7 @@ throw( uno::RuntimeException, std::exception )
         }
     }
     else
-        SAL_WARN( "vcl", "enable unknown control " << nControlId );
+        SAL_WARN( "vcl.gtk", "enable unknown control " << nControlId );
 }
 
 void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel )
@@ -1320,7 +1320,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
     {
-        SAL_WARN( "vcl", "Set label on unknown control " << nControlId);
+        SAL_WARN( "vcl.gtk", "Set label on unknown control " << nControlId);
         return;
     }
 
@@ -1342,7 +1342,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
         g_object_set( pWidget, "label", aTxt.getStr(),
                       "use_underline", true, nullptr );
     else
-        SAL_WARN( "vcl", "Can't set label on list");
+        SAL_WARN( "vcl.gtk", "Can't set label on list");
 }
 
 OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
@@ -1357,11 +1357,11 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
     GtkWidget *pWidget;
 
     if( !( pWidget = getWidget( nControlId, &tType ) ) )
-        SAL_WARN( "vcl", "Get label on unknown control " << nControlId);
+        SAL_WARN( "vcl.gtk", "Get label on unknown control " << nControlId);
     else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
         aTxt = gtk_button_get_label( GTK_BUTTON( pWidget ) );
     else
-        SAL_WARN( "vcl", "Can't get label on list");
+        SAL_WARN( "vcl.gtk", "Can't get label on list");
 
     return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 );
 }
@@ -1458,21 +1458,21 @@ void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *,
 {
     FilePickerEvent evt;
     evt.ElementId = LISTBOX_FILTER;
-    SAL_INFO( "vcl", "filter_changed, isn't it great " << pobjFP );
+    SAL_INFO( "vcl.gtk", "filter_changed, isn't it great " << pobjFP );
     pobjFP->impl_controlStateChanged( evt );
 }
 
 void SalGtkFilePicker::folder_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
 {
     FilePickerEvent evt;
-    SAL_INFO( "vcl", "folder_changed, isn't it great " << pobjFP );
+    SAL_INFO( "vcl.gtk", "folder_changed, isn't it great " << pobjFP );
     pobjFP->impl_directoryChanged( evt );
 }
 
 void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP )
 {
     FilePickerEvent evt;
-    SAL_INFO( "vcl", "selection_changed, isn't it great " << pobjFP );
+    SAL_INFO( "vcl.gtk", "selection_changed, isn't it great " << pobjFP );
     pobjFP->impl_fileSelectionChanged( evt );
 }
 
@@ -1747,7 +1747,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter )
         OUString aShrunkName = shrinkFilterName( rFilter );
         if( aShrunkName.equals( sFilterName) )
         {
-            SAL_INFO( "vcl", "actually setting " << filtername );
+            SAL_INFO( "vcl.gtk", "actually setting " << filtername );
             gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter );
             bFound = true;
         }
@@ -1818,7 +1818,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
                     g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
                     g_free );
 
-                SAL_INFO( "vcl", "fustering with " << aToken );
+                SAL_INFO( "vcl.gtk", "fustering with " << aToken );
             }
 #if OSL_DEBUG_LEVEL > 0
             else
@@ -1936,7 +1936,7 @@ void SalGtkFilePicker::SetFilters()
     else if(!m_aCurrentFilter.isEmpty())
         SetCurFilter( m_aCurrentFilter );
 
-    SAL_INFO( "vcl", "end setting filters");
+    SAL_INFO( "vcl.gtk", "end setting filters");
 }
 
 SalGtkFilePicker::~SalGtkFilePicker()
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index c5cac3813e91..1f1a814828d3 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -2452,7 +2452,7 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
         pGraphics = static_cast<GtkSalGraphics*>(AcquireGraphics());
         if ( !pGraphics )
         {
-            SAL_WARN("vcl", "Could not get graphics - unable to update settings");
+            SAL_WARN("vcl.gtk", "Could not get graphics - unable to update settings");
             return;
         }
         bFreeGraphics = true;
@@ -3492,7 +3492,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
             return true;
         else
         {
-            SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl", "key press has vanished !" );
+            SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl.gtk", "key press has vanished !" );
             if( ! m_aPrevKeyPresses.empty() ) // sanity check
             {
                 // event was not swallowed, do not filter a following
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 01ed2c53a6fa..8c91660bd5df 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2348,7 +2348,7 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings )
         pGraphics = static_cast<GtkSalGraphics*>(AcquireGraphics());
         if ( !pGraphics )
         {
-            SAL_WARN("vcl", "Could not get graphics - unable to update settings");
+            SAL_WARN("vcl.gtk3", "Could not get graphics - unable to update settings");
             return;
         }
         bFreeGraphics = true;
@@ -3708,7 +3708,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent )
             return true;
         else
         {
-            SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl", "key press has vanished !" );
+            SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl.gtk3", "key press has vanished !" );
             if( ! m_aPrevKeyPresses.empty() ) // sanity check
             {
                 // event was not swallowed, do not filter a following
@@ -3927,7 +3927,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
         for (int i = start; i < end; ++i)
         {
             SAL_WARN_IF(i >= static_cast<int>(pThis->m_aInputFlags.size()),
-                "vcl.gtk", "pango attrib out of range. Broken range: "
+                "vcl.gtk3", "pango attrib out of range. Broken range: "
                 << start << "," << end << " Legal range: 0,"
                 << pThis->m_aInputFlags.size());
             if (i >= static_cast<int>(pThis->m_aInputFlags.size()))
@@ -4015,7 +4015,7 @@ static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(vcl::
     }
     catch(const uno::Exception& e)
     {
-        SAL_WARN( "vcl.gtk", "Exception in getting input method surrounding text: " << e.Message);
+        SAL_WARN( "vcl.gtk3", "Exception in getting input method surrounding text: " << e.Message);
     }
     return xText;
 }