OSL_TRACE->SAL in avmedia..canvas

Change-Id: Id9077ea29e7028c12f40abfd4c57756c863e3cd9

11 files changed, 5 insertions, 20 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 236c14e853b9..5df35bc110ad 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -207,7 +207,6 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
             if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( aModuleName ) )
             {
                 ModuleInfo aInfo = xVBAModuleInfo->getModuleInfo( aModuleName );
-                OSL_TRACE("#addLibraryModulesImpl - aMod");
                 pLib->MakeModule( aModuleName, aInfo, aMod );
             }
             else
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 19f121327927..190aec3bcbcc 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -170,7 +170,6 @@ SbxErrObject::SbxErrObject( const OUString& rName, const uno::Any& rUnoObj )
     : SbUnoObject( rName, rUnoObj )
     , m_pErrObject( nullptr )
 {
-    OSL_TRACE("SbxErrObject::SbxErrObject ctor");
     rUnoObj >>= m_xErr;
     if ( m_xErr.is() )
     {
@@ -181,7 +180,6 @@ SbxErrObject::SbxErrObject( const OUString& rName, const uno::Any& rUnoObj )
 
 SbxErrObject::~SbxErrObject()
 {
-    OSL_TRACE("SbxErrObject::~SbxErrObject dtor");
 }
 
 uno::Reference< vba::XErrObject > const &
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index b991514a4825..e5875224388a 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1950,7 +1950,7 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
     }
     if ( !pThisComponent )
     {
-        OSL_TRACE("Failed to get ThisComponent");
+        SAL_WARN("basic", "Failed to get ThisComponent");
             // the application Basic, at the latest, should have this variable
         return nullptr;
     }
@@ -1970,11 +1970,6 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic( SbxObject* pBasic )
     {
         return nullptr;
     }
-#if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE("Have model ThisComponent points to url %s",
-              OUStringToOString( xModel->getURL(),
-                                 RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-#endif
 
     return xModel;
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 18c000924ae1..56d07c36ef1a 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -152,7 +152,6 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj )
 
         if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) )
         {
-            OSL_TRACE("SetSbUnoObjectDfltPropName setting default prop for %s", OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
             pUnoObj->SetDfltProperty( sDfltPropName );
         }
     }
@@ -1713,7 +1712,6 @@ bool checkUnoObjectType(SbUnoObject& rUnoObj, const OUString& rClass)
             }
 
             // match interface name with passed class name
-            OSL_TRACE("Checking if object implements %s", OUStringToOString( aClassName, RTL_TEXTENCODING_UTF8 ).getStr() );
             if ( (aClassName.getLength() <= aInterfaceName.getLength()) &&
                     aInterfaceName.endsWithIgnoreAsciiCase( aClassName ) )
             {
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c114d6068fbc..94e1356394ba 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -143,7 +143,6 @@ void SbiCodeGen::Save()
     int nIfaceCount = 0;
     if( rMod.mnType == css::script::ModuleType::CLASS )
     {
-                OSL_TRACE("COdeGen::save() classmodule processing");
         rMod.bIsProxyModule = true;
         p->SetFlag( SbiImageFlags::CLASSMODULE );
         GetSbData()->pClassFac->AddClassModule( &rMod );
@@ -262,8 +261,6 @@ void SbiCodeGen::Save()
                     {
                         aPropName = aPropName.copy( aIfaceName.getLength() + 1 );
                     }
-                    OSL_TRACE("*** getProcedureProperty for thing %s",
-                              OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
                     rMod.GetProcedureProperty( aPropName, ePropType );
                 }
                 if( nPass == 1 )
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 1dda3110675a..da7048d28af5 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -130,7 +130,6 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm )
     bCodeCompleting =
     bExplicit = false;
     bClassModule = ( pm->GetModuleType() == css::script::ModuleType::CLASS );
-    OSL_TRACE("Parser - %s, bClassModule %d", OUStringToOString( pm->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), bClassModule );
     pPool    = &aPublics;
     for(SbxDataType & eDefType : eDefTypes)
         eDefType = SbxVARIANT;    // no explicit default type
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index bb263a802f12..092a239eabe9 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -574,7 +574,6 @@ eoln:
             // object _
             //    .Method
             // ^^^  <- spaces is legal in MSO VBA
-            OSL_TRACE("*** resetting bSpaces***");
             bSpaces = false;
         }
         return bRes;
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 5ef5f367acca..4c8a0409a635 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -690,7 +690,7 @@ public:
 
 Dll::~Dll() {
     if (handle != nullptr && !FreeLibrary(handle)) {
-        OSL_TRACE("FreeLibrary(%p) failed with %u", handle, GetLastError());
+        SAL_WARN("basic", "FreeLibrary(" << handle << ") failed with " << GetLastError());
     }
 }
 
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index fd41317c6a1f..7cc4c91a8552 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -644,7 +644,7 @@ public:
 
 Dll::~Dll() {
     if (handle != 0 && !FreeLibrary(handle)) {
-        OSL_TRACE("FreeLibrary(%p) failed with %u", handle, GetLastError());
+        SAL_WARN("basic", "FreeLibrary(" << handle << ") failed with " << GetLastError());
     }
 }
 
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 411d1f01f71e..d06f4e0073fa 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -257,7 +257,7 @@ SbxError ImpScan( const OUString& rWSrc, double& nVal, SbxDataType& rType,
 #if HAVE_FEATURE_SCRIPTING
     else if ( SbiRuntime::isVBAEnabled() )
     {
-        OSL_TRACE("Reporting error converting");
+        SAL_WARN("basic", "Reporting error converting");
         return ERRCODE_SBX_CONVERSION;
     }
 #endif
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e08e1e6e16fb..b50153e7eb2e 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -311,7 +311,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
                 }
                 catch(const uno::Exception&)
                 {
-                    OSL_TRACE("Failed to get document object for %s", OUStringToOString( aElementName, RTL_TEXTENCODING_UTF8 ).getStr() );
+                    SAL_WARN("basic", "Failed to get document object for " << aElementName );
                 }
             }
         }