OSL_TRACE->SAL in sd..sdext

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

7 files changed, 7 insertions, 41 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index f87acfa1908a..f460b87b5679 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -338,11 +338,8 @@ Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
     }
     catch (const Exception& rException)
     {
-        OSL_TRACE ("caught exception while getting configuration node %s: %s",
-            OUStringToOString(sPathToNode,
-                RTL_TEXTENCODING_UTF8).getStr(),
-            OUStringToOString(rException.Message,
-                RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN("sdext.minimizer", "caught exception while getting configuration node "
+                  << sPathToNode << " : " << rException.Message);
         (void)rException;
     }
     return xNode;
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index 747fab155576..7d2975857518 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -324,10 +324,6 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF
             }
             aOutTypeName = "pdf_Portable_Document_Format";
 
-            OSL_TRACE( "setting filter name %s, input stream %s\n",
-                       OUStringToOString( aOutFilterName, RTL_TEXTENCODING_UTF8 ).getStr(),
-                       xEmbedStream.is() ? "present" : "not present" );
-
             rFilterData[nFilterNamePos].Value <<= aOutFilterName;
             if( xEmbedStream.is() )
             {
@@ -407,7 +403,6 @@ bool checkDocChecksum( const OUString& rInPDFFileURL,
                        sal_uInt32           nBytes,
                        const OUString& rChkSum )
 {
-    bool bRet = false;
     if( rChkSum.getLength() != 2* RTL_DIGEST_LENGTH_MD5 )
     {
         SAL_INFO(
@@ -467,20 +462,7 @@ bool checkDocChecksum( const OUString& rInPDFFileURL,
     rtl_digest_destroyMD5( aActualDigest );
 
     // compare the contents
-    bRet = (0 == memcmp( nActualChecksum, nTestChecksum, sizeof( nActualChecksum ) ));
-#if OSL_DEBUG_LEVEL > 0
-    OSL_TRACE( "test checksum: " );
-    for(sal_uInt8 i : nTestChecksum) {
-        OSL_TRACE( "%.2X", int(i) );
-    }
-    OSL_TRACE( "\n" );
-    OSL_TRACE( "file checksum: " );
-    for(sal_uInt8 i : nActualChecksum) {
-        OSL_TRACE( "%.2X", int(i) );
-    }
-    OSL_TRACE( "\n" );
-#endif
-    return bRet;
+    return (0 == memcmp( nActualChecksum, nTestChecksum, sizeof( nActualChecksum ) ));
 }
 
 uno::Reference< io::XStream > getAdditionalStream( const OUString&                          rInPDFFileURL,
@@ -600,7 +582,6 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString&
                                     } while( bEntered && ! bAuthenticated );
                                 }
 
-                                OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" );
                                 if( ! bAuthenticated )
                                     continue;
                             }
@@ -619,9 +600,6 @@ uno::Reference< io::XStream > getAdditionalStream( const OUString&
         }
     }
 
-    OSL_TRACE( "extracted add stream: mimetype %s\n",
-               OUStringToOString( rOutMimetype,
-                                       RTL_TEXTENCODING_UTF8 ).getStr());
     return xEmbed;
 }
 
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index ef25e919ee1c..6c8a8959319c 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -169,7 +169,6 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler,
     {
     }
 
-    OSL_TRACE( "request %s selected", xReq->isSelected() ? "was" : "was not" );
     if( xReq->isSelected() )
     {
         bSuccess = true;
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index dbc94360ca61..cb514072e91b 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -141,7 +141,7 @@ void PDFIProcessor::setLineCap(sal_Int8 nCap)
 
 void PDFIProcessor::setMiterLimit(double)
 {
-    OSL_TRACE("PDFIProcessor::setMiterLimit(): not supported by ODF");
+    SAL_WARN("sdext.pdfimport", "PDFIProcessor::setMiterLimit(): not supported by ODF");
 }
 
 void PDFIProcessor::setLineWidth(double nWidth)
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 90d471a23bb8..7c5221cc4922 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -952,7 +952,6 @@ static bool checkEncryption( const OUString&                               i_rPa
                             } while( bEntered && ! bAuthenticated );
                         }
 
-                        OSL_TRACE( "password: %s", bAuthenticated ? "matches" : "does not match" );
                         bSuccess = bAuthenticated;
                     }
                 }
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 49e0711ed867..2ad9c1269581 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -77,9 +77,7 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
     }
     catch (const Exception& rException)
     {
-        OSL_TRACE ("caught exception while opening configuration: %s",
-            OUStringToOString(rException.Message,
-                RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN("sdext.presenter", "caught exception while opening configuration: " << rException.Message);
     }
 }
 
@@ -161,9 +159,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
     }
     catch (const Exception& rException)
     {
-        OSL_TRACE ("caught exception while getting configuration node %s: %s",
-            OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(),
-            OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr());
+        SAL_WARN("sdext.presenter", "caught exception while getting configuration node " << sPathToNode << " : " << rException.Message);
     }
 
     return Any();
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 2db64ef5eb11..7907ae25b691 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -330,13 +330,10 @@ void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& r
 
 //----- XFocusListener --------------------------------------------------------
 
-void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& rEvent)
+void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& /*rEvent*/)
     throw (css::uno::RuntimeException, std::exception)
 {
     ThrowIfDisposed();
-    (void)rEvent;
-    OSL_TRACE("PresenterWindowManager::focusGained window %p\n",
-        rEvent.Source.get());
 }
 
 void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEvent)