OSL_TRACE->SAL in sc..scripting

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

29 files changed, 43 insertions, 83 deletions

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 429eff05319d..da23524ad344 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -238,7 +238,7 @@ bool ScDocument::SetCodeName( SCTAB nTab, const OUString& rName )
             return true;
         }
     }
-    OSL_TRACE( "**** can't set code name %s", OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
+    SAL_WARN("sc",  "can't set code name " << rName );
     return false;
 }
 
@@ -2147,7 +2147,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam,
 
     if (!pClipDoc)
     {
-        OSL_TRACE("CopyToClip: no ClipDoc");
+        SAL_WARN("sc", "CopyToClip: no ClipDoc");
         pClipDoc = ScModule::GetClipDoc();
     }
 
@@ -2247,7 +2247,7 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1,
     {
         if (!pClipDoc)
         {
-            OSL_TRACE("CopyTabToClip: no ClipDoc");
+            SAL_WARN("sc", "CopyTabToClip: no ClipDoc");
             pClipDoc = ScModule::GetClipDoc();
         }
 
@@ -2355,7 +2355,7 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, InsertDeleteFlags nFlags
     }
     else
     {
-        OSL_TRACE("TransposeClip: Too big");
+        SAL_WARN("sc", "TransposeClip: Too big");
     }
 
     // This happens only when inserting...
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index eec366de3978..7fe7b8195fbd 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1030,7 +1030,7 @@ sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pO
                 aRes.mpMat->CompareNotEqual();
                 break;
             default:
-                OSL_TRACE( "ScInterpreter::QueryMat: unhandled comparison operator: %d", (int)eOp);
+                SAL_WARN("sc",  "ScInterpreter::QueryMat: unhandled comparison operator: " << (int)eOp);
                 aRes.mpMat.reset();
                 return aRes;
         }
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 273a5fb6685e..8ed28f41d825 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1496,7 +1496,7 @@ inline double evaluate( double fVal, ScQueryOp eOp )
             ;
     }
 
-    OSL_TRACE( "evaluate: unhandled comparison operator: %d", (int)eOp);
+    SAL_WARN("sc",  "evaluate: unhandled comparison operator: " << (int)eOp);
     return CreateDoubleError( FormulaError::UnknownState);
 }
 
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 88970ed3d120..cbcd92c33a15 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -450,7 +450,7 @@ FormulaToken* ScRawToken::CreateToken() const
             return new FormulaUnknownToken( eOp );
         default:
             {
-                OSL_TRACE( "unknown ScRawToken::CreateToken() type %d", int(GetType()));
+                SAL_WARN("sc",  "unknown ScRawToken::CreateToken() type " << int(GetType()));
                 return new FormulaUnknownToken( ocBad );
             }
     }
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 70fc840974df..b861037e621b 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -1117,14 +1117,11 @@ FltError ImportExcel8::Read()
                         if ( !bSheetHasCodeName )
                         {
                             nTabsWithNoCodeName.push_back( GetCurrScTab() );
-                            OSL_TRACE("No Codename for %d", GetCurrScTab() );
                         }
                         else
                         {
                             OUString sCodeName;
                             GetDoc().GetCodeName( GetCurrScTab(), sCodeName );
-                            OSL_TRACE("Have CodeName %s for SheetName %s",
-                                OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(),  OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() );
                             aCodeNames.push_back( sCodeName );
                         }
 
@@ -1256,7 +1253,6 @@ FltError ImportExcel8::Read()
         for ( std::vector < SCTAB >::iterator it = nTabsWithNoCodeName.begin(); it != it_end; ++it )
         {
             SCTAB nTab = 1;
-            OSL_TRACE("Trying to find suitable codename for %d", *it );
             while ( true )
             {
                 OUStringBuffer aBuf;
@@ -1274,13 +1270,11 @@ FltError ImportExcel8::Read()
 
                 if ( codeName_It == codeName_It_end ) // generated codename not found
                 {
-                    OSL_TRACE("Using generated codename %s", OUStringToOString( sTmpName, RTL_TEXTENCODING_UTF8 ).getStr() );
                     // Set new codename
                     GetDoc().SetCodeName( *it, sTmpName );
                     // Record newly used codename
                     aCodeNames.push_back(sTmpName);
-                    // Record those we have created so they can be created in
-                    // basic
+                    // Record those we have created so they can be created in basic
                     maAutoGeneratedCodeNames.push_back( sTmpName );
                     break;
                 }
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 5ceb584dc15c..11c8647ebf79 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1122,7 +1122,6 @@ void XclExpChartObj::Save( XclExpStream& rStrm )
 
 void XclExpChartObj::SaveXml( XclExpXmlStream& rStrm )
 {
-    OSL_TRACE("XclExpChartObj::SaveXml -- Entry point to export chart");
     sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream();
 
     // FIXME: two cell? it seems the two cell anchor is incorrect.
@@ -1359,7 +1358,6 @@ XclMacroHelper::SetMacroLink( const ScriptEventDescriptor& rEvent, const XclTbxE
 bool
 XclMacroHelper::SetMacroLink( const OUString& rMacroName )
 {
-    OSL_TRACE("SetMacroLink( macroname:=%s )", OUStringToOString( rMacroName, RTL_TEXTENCODING_UTF8 ).getStr() );
     if( !rMacroName.isEmpty() )
     {
         sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC );
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 9a1484d0ac55..50f00596c4b8 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -189,7 +189,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStr
             case EXC_OBJTYPE_BUTTON:        xDrawObj.reset( new XclImpButtonObj( rRoot ) );         break;
             case EXC_OBJTYPE_PICTURE:       xDrawObj.reset( new XclImpPictureObj( rRoot ) );        break;
             default:
-                OSL_TRACE( "XclImpDrawObjBase::ReadObj3 - unknown object type 0x%04hX", nObjType );
+                SAL_WARN("sc",  "XclImpDrawObjBase::ReadObj3 - unknown object type 0x" << std::hex << nObjType );
                 rRoot.GetTracer().TraceUnsupportedObjects();
         }
     }
@@ -226,7 +226,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStr
             case EXC_OBJTYPE_PICTURE:       xDrawObj.reset( new XclImpPictureObj( rRoot ) );        break;
             case EXC_OBJTYPE_POLYGON:       xDrawObj.reset( new XclImpPolygonObj( rRoot ) );        break;
             default:
-                OSL_TRACE( "XclImpDrawObjBase::ReadObj4 - unknown object type 0x%04hX", nObjType );
+                SAL_WARN("sc",  "XclImpDrawObjBase::ReadObj4 - unknown object type 0x" << std::hex << nObjType );
                 rRoot.GetTracer().TraceUnsupportedObjects();
         }
     }
@@ -273,7 +273,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStr
             case EXC_OBJTYPE_GROUPBOX:      xDrawObj.reset( new XclImpGroupBoxObj( rRoot ) );       break;
             case EXC_OBJTYPE_DROPDOWN:      xDrawObj.reset( new XclImpDropDownObj( rRoot ) );       break;
             default:
-                OSL_TRACE( "XclImpDrawObjBase::ReadObj5 - unknown object type 0x%04hX", nObjType );
+                SAL_WARN("sc",  "XclImpDrawObjBase::ReadObj5 - unknown object type 0x" << std::hex << nObjType );
                 rRoot.GetTracer().TraceUnsupportedObjects();
                 xDrawObj.reset( new XclImpPhObj( rRoot ) );
         }
@@ -338,7 +338,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStr
                 case EXC_OBJTYPE_NOTE:          xDrawObj.reset( new XclImpNoteObj( rRoot ) );           break;
 
                 default:
-                    OSL_TRACE( "XclImpDrawObjBase::ReadObj8 - unknown object type 0x%04hX", nObjType );
+                    SAL_WARN("sc",  "XclImpDrawObjBase::ReadObj8 - unknown object type 0x" << std::hex << nObjType );
                     rRoot.GetTracer().TraceUnsupportedObjects();
             }
         }
@@ -467,7 +467,7 @@ SdrObjectPtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, c
                     }
                     catch(const Exception&)
                     {
-                        OSL_TRACE("XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ControlTypeinMSO!");
+                        SAL_WARN("sc", "XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ControlTypeinMSO!");
                     }
                 }
                 if( mnObjType == 8 )//OCX
@@ -486,7 +486,7 @@ SdrObjectPtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, c
                         }
                         catch(const Exception&)
                         {
-                            OSL_TRACE("XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ObjIDinMSO!");
+                            SAL_WARN("sc", "XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ObjIDinMSO!");
                         }
                     }
                 }
@@ -2054,7 +2054,7 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const
             xPropset->setPropertyValue( "Description", makeAny(::rtl::OUString(aLabel)) );
         }catch( ... )
         {
-            OSL_TRACE( " Can't set a default text for TBX Control ");
+            SAL_WARN("sc", "Can't set a default text for TBX Control ");
         }
     }
     ConvertFont( rPropSet );
@@ -2279,9 +2279,8 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
         //     b) propagate the linked cell from the lead radiobutton
         //     c) apply the correct Ref value
         XclImpOptionButtonObj* pLeader = pTbxObj;
- ;
+
         sal_Int32 nRefVal = 1;
-        OSL_TRACE( "0x%x start group ", pLeader->GetObjId()/*.mnObjId */);
         do
         {
 
@@ -3278,9 +3277,6 @@ OUString XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId
         mxOleCtrlNameOverride->getByName( sCodeName ) >>= xIdToOleName;
         xIdToOleName->getByIndex( nObjId ) >>= sOleName;
     }
-    OSL_TRACE("XclImpObjectManager::GetOleNameOverride tab %d, ( module %s ) object id ( %d ) is %s", nTab,
-        OUStringToOString( sCodeName, RTL_TEXTENCODING_UTF8 ).getStr(), nObjId,
-        OUStringToOString( sOleName, RTL_TEXTENCODING_UTF8 ).getStr() );
 
     return sOleName;
 }
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index d8844fe65b15..d3ae97085658 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -829,7 +829,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
             break;
 
             default:
-                OSL_TRACE( "XclImpPivotCache::ReadPivotCacheStream - unknown record 0x%04hX", aPCStrm.GetRecId() );
+                SAL_WARN("sc",  "XclImpPivotCache::ReadPivotCacheStream - unknown record 0x" << std::hex << aPCStrm.GetRecId() );
         }
     }
 
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index c690970f4311..6c350e412e57 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -408,7 +408,7 @@ XclBiff XclImpStream::DetectBiffVersion( SvStream& rStrm )
                 case EXC_BOF_BIFF4: eBiff = EXC_BIFF4;  break;
                 case EXC_BOF_BIFF5: eBiff = EXC_BIFF5;  break;
                 case EXC_BOF_BIFF8: eBiff = EXC_BIFF8;  break;
-                default:    OSL_TRACE( "XclImpStream::DetectBiffVersion - unknown BIFF version: 0x%04hX", nVersion );
+                default:    SAL_WARN("sc",  "XclImpStream::DetectBiffVersion - unknown BIFF version: 0x" << std::hex << nVersion );
             }
         }
         break;
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 3ca6b13442d2..3384f0eb7879 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -227,7 +227,7 @@ sal_Int32 XclPCNumGroupInfo::GetScDateType() const
         case EXC_SXNUMGROUP_TYPE_MONTH: nScType = ScDPGroupBy::MONTHS;    break;
         case EXC_SXNUMGROUP_TYPE_QUART: nScType = ScDPGroupBy::QUARTERS;  break;
         case EXC_SXNUMGROUP_TYPE_YEAR:  nScType = ScDPGroupBy::YEARS;     break;
-        default:    OSL_TRACE( "XclPCNumGroupInfo::GetScDateType - unexpected date type %d", GetXclDataType() );
+        default:    SAL_WARN("sc",  "XclPCNumGroupInfo::GetScDateType - unexpected date type " << GetXclDataType() );
     }
     return nScType;
 }
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 90870ec23da9..eb5341c59c90 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -153,7 +153,7 @@ ColorData XclDefaultPalette::GetDefColorData( sal_uInt16 nXclIndex ) const
         case EXC_COLOR_NOTETEXT:        nColor = mnNoteText;    break;
         case EXC_COLOR_FONTAUTO:        nColor = COL_AUTO;      break;
         default:
-            OSL_TRACE( "XclDefaultPalette::GetDefColorData - unknown default color index: %d", nXclIndex );
+            SAL_WARN("sc",  "XclDefaultPalette::GetDefColorData - unknown default color index: " << nXclIndex );
             nColor = COL_AUTO;
     }
     return nColor;
@@ -1488,7 +1488,7 @@ void XclNumFmtBuffer::InsertBuiltinFormats()
     // language not supported
     if( aBuiltInVec.empty() )
     {
-        OSL_TRACE( "XclNumFmtBuffer::InsertBuiltinFormats - language 0x%04hX not supported (#i29949#)", meSysLang );
+        SAL_WARN("sc",  "XclNumFmtBuffer::InsertBuiltinFormats - language not supported (#i29949#) 0x" << std::hex << meSysLang );
         XclBuiltInMap::const_iterator aMIt = aBuiltInMap.find( LANGUAGE_DONTKNOW );
         OSL_ENSURE( aMIt != aBuiltInMap.end(), "XclNumFmtBuffer::InsertBuiltinFormats - default map not found" );
         if( aMIt != aBuiltInMap.end() )
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 59b9243cbbc1..8e7d88a5092f 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -169,8 +169,6 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp
                 return false;
         }
 
-        OSL_TRACE("Name of toolbar :-/ %s", OUStringToOString( sToolBarName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
         helper.getCfgManager()->insertSettings( sToolBarName, xIndexAccess );
         helper.applyIcons();
 
@@ -330,7 +328,6 @@ bool TBCCmd::Read( SvStream &rS )
     rS.ReadUInt16( cmdID );
     sal_uInt16 temp;
     rS.ReadUInt16( temp );
-    OSL_TRACE("TBCmd temp = 0x%x", temp );
     A = (temp & 0x8000 ) == 0x8000;
     B = (temp & 0x4000) == 0x4000;
     cmdType = ( temp & 0x3E00 ) >> 9;
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index f2e33cff9539..2c0ea0f1862d 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -406,7 +406,7 @@ rtl_TextEncoding XclTools::GetTextEncoding( sal_uInt16 nCodePage )
     const XclCodePageEntry* pEntry = ::std::find_if( pCodePageTable, pCodePageTableEnd, XclCodePageEntry_CPPred( nCodePage ) );
     if( pEntry == pCodePageTableEnd )
     {
-        OSL_TRACE( "XclTools::GetTextEncoding - unknown code page: 0x%04hX (%d)", nCodePage, nCodePage );
+        SAL_WARN("sc",  "XclTools::GetTextEncoding - unknown code page: 0x" << std::hex << nCodePage );
         return RTL_TEXTENCODING_DONTKNOW;
     }
     return pEntry->meTextEnc;
@@ -420,7 +420,7 @@ sal_uInt16 XclTools::GetXclCodePage( rtl_TextEncoding eTextEnc )
     const XclCodePageEntry* pEntry = ::std::find_if( pCodePageTable, pCodePageTableEnd, XclCodePageEntry_TEPred( eTextEnc ) );
     if( pEntry == pCodePageTableEnd )
     {
-        OSL_TRACE( "XclTools::GetXclCodePage - unsupported text encoding: %d", eTextEnc );
+        SAL_WARN("sc",  "XclTools::GetXclCodePage - unsupported text encoding: 0x" << std::hex << eTextEnc );
         return 1252;
     }
     return pEntry->mnCodePage;
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 7c2d39f0d6a8..a79b695a514a 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -245,7 +245,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
             }
             catch(const Exception&)
             {
-                OSL_TRACE("XclEscherEx::StartShape, this control can't get the property ControlTypeinMSO!");
+                SAL_WARN("sc", "XclEscherEx::StartShape, this control can't get the property ControlTypeinMSO!");
             }
             if( nMsCtlType == 2 )  //OCX Form Control
                 pCurrXclObj = CreateOCXCtrlObj( rxShape, pChildAnchor ).release();
@@ -326,7 +326,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
             }
             catch(const Exception&)
             {
-                OSL_TRACE("XclEscherEx::StartShape, this control can't get the property ObjIDinMSO!");
+                SAL_WARN("sc", "XclEscherEx::StartShape, this control can't get the property ObjIDinMSO!");
             }
             sal_uInt16 nObjIDinMSO = 0xFFFF;
             aAny >>= nObjIDinMSO;
diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 69ad2cbf77be..8009d0c99603 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -114,7 +114,6 @@ public:
     {
         OUString sModuleName;
         Event.Accessor >>= sModuleName;
-        OSL_TRACE("VBAProjectListener::elementReplaced(%s)", OUStringToOString( sModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
         mpMacroMgr->InitUserFuncData();
         mpMacroMgr->BroadcastModuleUpdate(sModuleName);
     }
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 445ac52c058a..496f2df6b980 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -187,7 +187,6 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                    // For interoperability favour links over macros if both are defined
                    if ( !pInfo->GetHlink().isEmpty() )
                    {
-                       OSL_TRACE("** Got URL");
                        sURL = pInfo->GetHlink();
                    }
                    else if ( !pInfo->GetMacro().isEmpty() )
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a7a3bf73402e..112f3a6d55d6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -777,12 +777,12 @@ OString ScModelObj::getTextSelection(const char* pMimeType, OString& rUsedMimeTy
     }
     catch (const datatransfer::UnsupportedFlavorException& e)
     {
-        OSL_TRACE("Caught UnsupportedFlavorException '%s'", OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN("sc", "Caught UnsupportedFlavorException " << e.Message);
         return OString();
     }
     catch (const css::uno::Exception& e)
     {
-        OSL_TRACE("Caught UNO Exception '%s'", OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN("sc", "Caught UNO Exception " << e.Message);
         return OString();
     }
 
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index c27c493640d2..6511c5abb31f 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -138,8 +138,6 @@ public:
     css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
     {
         SolarMutexGuard aGuard;
-        OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )",
-            OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr() );
         if ( !hasByName( aName ) )
             throw css::container::NoSuchElementException();
         return maCachedObject;
@@ -545,14 +543,12 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
         case Type::VBAOBJECTPROVIDER:
             if (pDocShell && pDocShell->GetDocument().IsInVBAMode())
             {
-                OSL_TRACE("**** creating VBA Object mapper");
                 xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
             }
             break;
         case Type::VBACODENAMEPROVIDER:
             if ( pDocShell && isInVBAMode( *pDocShell ) )
             {
-                OSL_TRACE("**** creating VBA Object provider");
                 xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider(*pDocShell)));
             }
             break;
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index b766a89bbdbf..e080b0488558 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -474,7 +474,7 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc,
                     }
                     break;
                 default:
-                    OSL_TRACE( "ScTokenConversion::ConvertToTokenSequence: unhandled token type SvStackVar %d", rToken.GetType());
+                    SAL_WARN("sc",  "ScTokenConversion::ConvertToTokenSequence: unhandled token type SvStackVar " << rToken.GetType());
                     SAL_FALLTHROUGH;
                 case svSep:     // occurs with ocSep, ocOpen, ocClose, ocArray*
                 case svJump:    // occurs with ocIf, ocChoose
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 67cafa4da83f..146ef3ab9d99 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -228,7 +228,6 @@ ScVbaApplication::getAssistant() throw (uno::RuntimeException, std::exception)
 uno::Any SAL_CALL
 ScVbaApplication::getSelection() throw (uno::RuntimeException, std::exception)
 {
-    OSL_TRACE("** ScVbaApplication::getSelection() ** ");
     uno::Reference< frame::XModel > xModel( getCurrentDocument() );
 
     Reference< view::XSelectionSupplier > xSelSupp( xModel->getCurrentController(), UNO_QUERY_THROW );
@@ -1212,7 +1211,6 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile )  throw ( uno::RuntimeExc
     SbMethod* pMeth = StarBASIC::GetActiveMethod();
     if ( pMeth )
     {
-        OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
         uno::Reference< frame::XModel > xModel( getCurrentDocument() );
         ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument();
         rDoc.GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile);
@@ -1267,7 +1265,6 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep
         SbxVariableRef refTemp = pMeth;
         // forces a broadcast
         SbxVariableRef pNew = new  SbxMethod( *static_cast<SbxMethod*>(pMeth));
-                OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() );
         aRet = sbxToUnoValue( pNew.get() );
     }
     return aRet;
diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx
index abff0fa7edec..cf1a88f55e7a 100644
--- a/sc/source/ui/vba/vbachartobjects.cxx
+++ b/sc/source/ui/vba/vbachartobjects.cxx
@@ -146,7 +146,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight
     }
     catch (const uno::Exception& ex)
     {
-        OSL_TRACE("AddItem caught exception ->%s", OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_WARN("sc", "AddItem caught exception " << ex.Message );
     }
     return aNULL();
 }
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index a1ff3a5158c7..32299421d03c 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -274,7 +274,6 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve
     {
         uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY );
         VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
-        OSL_TRACE( "ScVbaEventListener::windowActivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow.get(), mpActiveWindow.get() );
         // do not fire activation event multiple time for the same window
         if( pWindow && (pWindow != mpActiveWindow) )
         {
@@ -296,7 +295,6 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE
     {
         uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY );
         VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xWindow );
-        OSL_TRACE( "ScVbaEventListener::windowDeactivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow.get(), mpActiveWindow.get() );
         // do not fire the deactivation event, if the window is not active (prevent multiple deactivation)
         if( pWindow && (pWindow == mpActiveWindow) )
             processWindowActivateEvent( pWindow, false );
diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx
index 52a9e58d9fac..12e8230ae3d2 100644
--- a/sc/source/ui/vba/vbaglobals.cxx
+++ b/sc/source/ui/vba/vbaglobals.cxx
@@ -40,20 +40,17 @@ using namespace ::ooo::vba;
 
 ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "ExcelDocumentContext" )
 {
-    OSL_TRACE("ScVbaGlobals::ScVbaGlobals()");
+    uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
+    aInitArgs[ 0 ].Name = "Application";
+    aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
+    aInitArgs[ 1 ].Name = "ExcelDocumentContext";
+    aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
 
-        uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
-        aInitArgs[ 0 ].Name = "Application";
-        aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
-        aInitArgs[ 1 ].Name = "ExcelDocumentContext";
-        aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
-
-        init( aInitArgs );
+    init( aInitArgs );
 }
 
 ScVbaGlobals::~ScVbaGlobals()
 {
-    OSL_TRACE("ScVbaGlobals::~ScVbaGlobals");
 }
 
 // XGlobals
@@ -61,7 +58,7 @@ ScVbaGlobals::~ScVbaGlobals()
 uno::Reference<excel::XApplication > const &
 ScVbaGlobals::getApplication() throw (uno::RuntimeException)
 {
-//  OSL_TRACE("In ScVbaGlobals::getApplication");
+//  SAL_WARNx("sc", "In ScVbaGlobals::getApplication");
     if ( !mxApplication.is() )
         mxApplication.set( new ScVbaApplication( mxContext) );
     return mxApplication;
@@ -76,7 +73,7 @@ ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception)
 uno::Reference< excel::XWorkbook > SAL_CALL
 ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception)
 {
-//  OSL_TRACE("In ScVbaGlobals::getActiveWorkbook");
+//  SAL_WARNx("sc", "In ScVbaGlobals::getActiveWorkbook");
     uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
     if ( xWorkbook.is() )
     {
diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx
index 09592fd9bd14..2c2e6bb9b605 100644
--- a/sc/source/ui/vba/vbahelper.cxx
+++ b/sc/source/ui/vba/vbahelper.cxx
@@ -236,7 +236,7 @@ getCurrentDocument() throw (uno::RuntimeException)
     SbxObject* basicChosen =  pBasic ;
     if ( basicChosen == NULL)
     {
-        OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
+        SAL_WARNx("sc", "getModelFromBasic() StarBASIC* is NULL" );
         return xModel;
     }
     SbxObject* p = pBasic;
@@ -274,14 +274,14 @@ getCurrentDocument() throw (uno::RuntimeException)
         }
         else
         {
-            OSL_TRACE("Have model ThisComponent points to url %s",
+            SAL_WARNx("sc", "Have model ThisComponent points to url %s",
             OUStringToOString( xModel->getURL(),
                 RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         }
     }
     else
     {
-        OSL_TRACE("Failed to get ThisComponent");
+        SAL_WARNx("sc", "Failed to get ThisComponent");
         throw uno::RuntimeException( "Can't determine the currently selected document" );
     }
     return xModel;
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index f08eab946af9..b47a127417e8 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -68,14 +68,12 @@ ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException, st
 sal_Bool SAL_CALL
 ScVbaOLEObject::getVisible() throw (uno::RuntimeException, std::exception)
 {
-    OSL_TRACE("OleObject %s returning visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" );
     return m_xControl->getVisible();
 }
 
 void SAL_CALL
 ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception)
 {
-    OSL_TRACE("OleObject %s set visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" );
     m_xControl->setVisible( _visible );
 }
 
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index f68d5495a9d8..54b5891822e1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1543,9 +1543,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter ) throw (
         }
         catch ( const uno::Exception& e )
         {
-            OSL_TRACE("Bahhh, caught exception %s",
-                OUStringToOString( e.Message,
-                    RTL_TEXTENCODING_UTF8 ).getStr() );
+            SAL_WARN("sc", "Bahhh, caught exception " << e.Message );
         }
     }
     else
@@ -4240,7 +4238,6 @@ static void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
         ScViewData* pViewData = ScDocShell::GetViewData();
         if ( pViewData )
         {
-            OSL_TRACE("Pushing out SelectAll query");
             pViewData->GetView()->Query( aParam, nullptr, true );
         }
     }
@@ -4411,7 +4408,6 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const
         uno::Reference< sheet::XUnnamedDatabaseRanges > xDBRanges = excel::GetUnnamedDataBaseRanges( pShell );
         if ( xDBRanges.is() )
         {
-            OSL_TRACE("Going to add new autofilter range.. sheet %i", nSheet );
             if ( !xDBRanges->hasByTable( nSheet ) )
                 xDBRanges->setByTable( autoFiltAddress );
             xDataBaseRange.set( xDBRanges->getByTable(nSheet ), uno::UNO_QUERY_THROW );
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 535e554636b3..f245d77489a9 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -68,7 +68,6 @@ getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Refe
     uno::Reference< excel::XWorkbook > xWb( getVBADocument( xModel ), uno::UNO_QUERY );
     if ( xWb.is() )
     {
-        OSL_TRACE(" *** Returning Module uno Object *** ");
         return uno::Any( xWb );
     }
 
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 28c9573177c3..7aaec25242d1 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -924,12 +924,9 @@ ScVbaWorksheet::getIntrospection(  ) throw (uno::RuntimeException, std::exceptio
 }
 
 uno::Any SAL_CALL
-ScVbaWorksheet::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
+ScVbaWorksheet::invoke( const OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
 {
-    OSL_TRACE("** ScVbaWorksheet::invoke( %s ), will barf",
-        OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
-    throw uno::RuntimeException(); // unsupported operation
+    throw uno::RuntimeException("Unsupported"); // unsupported operation
 }
 
 void SAL_CALL
diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx
index cefd3fa790b2..4b70c34d3fe2 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -139,7 +139,6 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::
                 default:
                     break;
             }
-            OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() );
         }
     }