drop document_io_logring.txt and use global logging

Change-Id: Ibda0ce925bc76355e636022c955077ac89e66cce
Reviewed-on: https://gerrit.libreoffice.org/36434
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 28 insertions, 28 deletions

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 3fc6d41bd1cb..226032910265 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -456,7 +456,7 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const css::uno::Reference< css
         bRet = aImport.Import(ImportFlags::All, nError);
 
     if ( nError )
-        pLoadMedium->SetError( nError, OSL_LOG_PREFIX );
+        pLoadMedium->SetError(nError);
 
     processDataStream(*this, aImport.GetImportPostProcessData());
 
@@ -615,10 +615,10 @@ bool ScDocShell::Load( SfxMedium& rMedium )
     }
 
     if (!bRet && !rMedium.GetError())
-        rMedium.SetError( SVSTREAM_FILEFORMAT_ERROR, OSL_LOG_PREFIX );
+        rMedium.SetError(SVSTREAM_FILEFORMAT_ERROR);
 
     if (rMedium.GetError())
-        SetError( rMedium.GetError(), OSL_LOG_PREFIX );
+        SetError(rMedium.GetError());
 
     InitItems();
     CalcOutputFactor();
@@ -941,7 +941,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
                         }
 
                         if ( !bSuccess )
-                            SetError( ERRCODE_IO_ABORT, OSL_LOG_PREFIX ); // this error code will produce no error message, but will break the further saving process
+                            SetError(ERRCODE_IO_ABORT); // this error code will produce no error message, but will break the further saving process
                     }
 #endif
 
@@ -958,7 +958,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
 
                         if( RET_NO == aBox->Execute())
                         {
-                            SetError( ERRCODE_IO_ABORT, OSL_LOG_PREFIX ); // this error code will produce no error message, but will break the further saving process
+                            SetError(ERRCODE_IO_ABORT); // this error code will produce no error message, but will break the further saving process
                         }
                     }
                     SAL_FALLTHROUGH;
@@ -1101,7 +1101,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 if (eError != eERR_OK)
                 {
                     if (!GetError())
-                        SetError(eError, OSL_LOG_PREFIX);
+                        SetError(eError);
                 }
                 else
                     bRet = true;
@@ -1130,7 +1130,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             if (eError != eERR_OK)
             {
                 if (!GetError())
-                    SetError(eError, OSL_LOG_PREFIX);
+                    SetError(eError);
 
                 if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
                     bRet = true;
@@ -1167,13 +1167,13 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             if (eError == SCWARN_IMPORT_RANGE_OVERFLOW)
             {
                 if (!GetError())
-                    SetError(eError, OSL_LOG_PREFIX);
+                    SetError(eError);
                 bRet = true;
             }
             else if (eError != eERR_OK)
             {
                 if (!GetError())
-                    SetError(eError, OSL_LOG_PREFIX);
+                    SetError(eError);
             }
             else
                 bRet = true;
@@ -1255,7 +1255,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             if (eError != eERR_OK)
             {
                 if (!GetError())
-                    SetError(eError, OSL_LOG_PREFIX);
+                    SetError(eError);
             }
             else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell))
             {
@@ -1263,7 +1263,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 FltError nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW :
                         (bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW :
                          SCWARN_IMPORT_CELL_OVERFLOW));
-                SetError( nWarn, OSL_LOG_PREFIX);
+                SetError(nWarn);
             }
             bSetColWidths = true;
             bSetSimpleTextColWidths = true;
@@ -1295,7 +1295,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             if (eError != eERR_OK)
             {
                 if (!GetError())
-                    SetError(eError, OSL_LOG_PREFIX);
+                    SetError(eError);
                 bRet = ( eError == SCWARN_IMPORT_RANGE_OVERFLOW );
             }
             else
@@ -1333,7 +1333,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                 if (eError != eERR_OK)
                 {
                     if (!GetError())
-                        SetError(eError, OSL_LOG_PREFIX);
+                        SetError(eError);
 
                     if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
                         bRet = true;
@@ -1369,7 +1369,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             }
 
             if ( eError != eERR_OK && !GetError() )
-                SetError(eError, OSL_LOG_PREFIX);
+                SetError(eError);
             bSetColWidths = true;
             bSetSimpleTextColWidths = true;
             bSetRowHeights = true;
@@ -1380,7 +1380,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             if (eError != eERR_OK)
             {
                 if (!GetError())
-                    SetError( eError, OSL_LOG_PREFIX );
+                    SetError(eError);
                 if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
                     bRet = true;
             }
@@ -1406,7 +1406,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                     if (eError != eERR_OK)
                     {
                         if (!GetError())
-                            SetError(eError, OSL_LOG_PREFIX);
+                            SetError(eError);
 
                         if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
                             bRet = true;
@@ -1426,7 +1426,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             }
 
             if ( eError != eERR_OK && !GetError() )
-                SetError(eError, OSL_LOG_PREFIX);
+                SetError(eError);
         }
         else if (aFltName == pFilterHtml || aFltName == pFilterHtmlWebQ)
         {
@@ -1458,7 +1458,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
                     if (eError != eERR_OK)
                     {
                         if (!GetError())
-                            SetError(eError, OSL_LOG_PREFIX);
+                            SetError(eError);
 
                         if( ( eError & ERRCODE_WARNING_MASK ) == ERRCODE_WARNING_MASK )
                             bRet = true;
@@ -1477,12 +1477,12 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
             }
 
             if ( eError != eERR_OK && !GetError() )
-                SetError(eError, OSL_LOG_PREFIX);
+                SetError(eError);
         }
         else
         {
             if (!GetError())
-                SetError(SCERR_IMPORT_NI, OSL_LOG_PREFIX);
+                SetError(SCERR_IMPORT_NI);
         }
 
         if (!bCalc3)
@@ -2289,7 +2289,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
             FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 );
 
             if( eError && !GetError() )
-                SetError( eError, OSL_LOG_PREFIX );
+                SetError(eError);
 
             // don't return false for warnings
             bRet = ((eError & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK) || (eError == eERR_OK);
@@ -2297,7 +2297,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
         else
         {
             // export aborted, i.e. "Save without password" warning
-            SetError( ERRCODE_ABORT, OSL_LOG_PREFIX );
+            SetError(ERRCODE_ABORT);
         }
     }
     else if (aFltName == pFilterAscii)
@@ -2330,7 +2330,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
 
             if (aDocument.GetTableCount() > 1)
                 if (!rMed.GetError())
-                    rMed.SetError(SCWARN_EXPORT_ASCII, OSL_LOG_PREFIX);
+                    rMed.SetError(SCWARN_EXPORT_ASCII);
         }
     }
     else if (aFltName == pFilterDBase)
@@ -2371,7 +2371,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
         if ( eError != eERR_OK )
         {
             if (!GetError())
-                SetError(eError, OSL_LOG_PREFIX);
+                SetError(eError);
             if ( bHasMemo && IsDocument( aTmpFile ) )
                 KillFile( aTmpFile );
         }
@@ -2391,7 +2391,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
                 {
                     KillFile( aTmpFile );
                     if ( !GetError() )
-                        SetError( SCERR_EXPORT_DATA, OSL_LOG_PREFIX );
+                        SetError(SCERR_EXPORT_DATA);
                 }
             }
         }
@@ -2425,7 +2425,7 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
 
             if (aDocument.GetTableCount() > 1)
                 if (!rMed.GetError())
-                    rMed.SetError(SCWARN_EXPORT_ASCII, OSL_LOG_PREFIX);
+                    rMed.SetError(SCWARN_EXPORT_ASCII);
         }
     }
     else if (aFltName == pFilterSylk)
@@ -2467,14 +2467,14 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed )
                 SetError(*new StringErrorInfo(
                     SCWARN_EXPORT_NONCONVERTIBLE_CHARS,
                     aImExport.GetNonConvertibleChars(),
-                    ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageInfo), OSL_LOG_PREFIX);
+                    ErrorHandlerFlags::ButtonsOk | ErrorHandlerFlags::MessageInfo));
             }
         }
     }
     else
     {
         if (GetError())
-            SetError(SCERR_IMPORT_NI, OSL_LOG_PREFIX);
+            SetError(SCERR_IMPORT_NI);
     }
     return bRet;
 }