fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO

- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*

Change-Id: Id4e90b83a7275bfd30914f7514a609cebbfbf4ac
Reviewed-on: https://gerrit.libreoffice.org/4044
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>

2 files changed, 11 insertions, 13 deletions

diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 1da85ce08828..b89a6c3264c7 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/sequence.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/form/XForm.hpp>
-#include <rtl/logfile.hxx>
 
 //.........................................................................
 namespace frm
@@ -149,7 +148,7 @@ Reference< XCloneable > SAL_CALL OFormsCollection::createClone(  ) throw (Runtim
 void OFormsCollection::disposing()
 {
     {
-        RTL_LOGFILE_CONTEXT( aLogger, "forms::OFormsCollection::disposing" );
+        SAL_INFO( "forms.component", "forms::OFormsCollection::disposing" );
         OInterfaceContainer::disposing();
     }
     FormsCollectionComponentBase::disposing();
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index ee7c32709561..fe31087b12f0 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -46,7 +46,6 @@
 #include <connectivity/formattedcolumnvalue.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <rtl/logfile.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/sharedunocomponent.hxx>
@@ -342,7 +341,7 @@ namespace frm
         break;
 
         case PROPERTY_ID_VALUE_SEQ :
-            OSL_FAIL( "ValueItemList is read-only!" );
+            SAL_WARN( "forms.component", "ValueItemList is read-only!" );
             throw PropertyVetoException();
 
         case PROPERTY_ID_SELECT_VALUE_SEQ :
@@ -411,7 +410,7 @@ namespace frm
             break;
 
         case PROPERTY_ID_VALUE_SEQ :
-            OSL_FAIL( "ValueItemList is read-only!" );
+            SAL_WARN( "forms.component", "ValueItemList is read-only!" );
             throw PropertyVetoException();
 
         case PROPERTY_ID_SELECT_VALUE_SEQ :
@@ -575,7 +574,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
+            SAL_WARN( "forms.component", "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
         }
 
         // Version
@@ -584,7 +583,7 @@ namespace frm
 
         if (nVersion > 0x0004)
         {
-            OSL_FAIL("OListBoxModel::read : invalid (means unknown) version !");
+            SAL_WARN( "forms.component", "OListBoxModel::read : invalid (means unknown) version !");
             ValueList().swap(m_aListSourceValues);
             m_aBoundColumn <<= (sal_Int16)0;
             clearBoundValues();
@@ -675,7 +674,7 @@ namespace frm
     //------------------------------------------------------------------------------
     void OListBoxModel::loadData( bool _bForce )
     {
-        RTL_LOGFILE_CONTEXT( aLogContext, "OListBoxModel::loadData" );
+        SAL_INFO( "forms.component", "OListBoxModel::loadData" );
         DBG_ASSERT( m_eListSourceType != ListSourceType_VALUELIST, "OListBoxModel::loadData: cannot load value list from DB!" );
         DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::loadData: cannot load from DB when I have an external list source!" );
 
@@ -899,7 +898,7 @@ namespace frm
 
                     //  If the LB is bound to a field and empty entries are valid, we remember the position
                     //  for an empty entry
-                    RTL_LOGFILE_CONTEXT( aLogContext, "OListBoxModel::loadData: string collection" );
+                    SAL_INFO( "forms.component", "OListBoxModel::loadData: string collection" );
                     OUString aStr;
                     sal_Int16 entryPos = 0;
                     ORowSetValue aBoundValue;
@@ -937,7 +936,7 @@ namespace frm
                 }
                 break;
             default:
-                OSL_FAIL( "OListBoxModel::loadData: unreachable!" );
+                SAL_WARN( "forms.component", "OListBoxModel::loadData: unreachable!" );
                 break;
             }
         }
@@ -1086,7 +1085,7 @@ namespace frm
         size_t selectedValue = aSelectedIndices[0];
         if ( selectedValue >= aValues.size() )
         {
-            OSL_FAIL( "OListBoxModel::getFirstSelectedValue: inconsistent selection/valuelist!" );
+            SAL_WARN( "forms.component", "OListBoxModel::getFirstSelectedValue: inconsistent selection/valuelist!" );
             return s_aEmptyVaue;
         }
 
@@ -1194,7 +1193,7 @@ namespace frm
         Reference< XPropertySet > xBoundField( getField() );
         if ( !xBoundField.is() )
         {
-            OSL_FAIL( "OListBoxModel::translateDbColumnToControlValue: no field? How could that happen?!" );
+            SAL_WARN( "forms.component", "OListBoxModel::translateDbColumnToControlValue: no field? How could that happen?!" );
             return Any();
         }
 
@@ -1285,7 +1284,7 @@ namespace frm
             default:
                 break;
             }
-            OSL_FAIL( "lcl_getCurrentExchangeType: unsupported (unexpected) exchange type!" );
+            SAL_WARN( "forms.component", "lcl_getCurrentExchangeType: unsupported (unexpected) exchange type!" );
             return eEntry;
         }
     }