tdf#130924 [vcl] replace `*printf`s with `SAL_*` logging macros.

Change-Id: Ie3ec1e1767478bce12eecf7bfee02ed2d45fe58c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92331
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

3 files changed, 49 insertions, 28 deletions

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 821d030c1d24..dea4cd548949 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -659,8 +659,10 @@ void PrintFontManager::addFontconfigDir( const OString& rDirName )
         fclose( pCfgFile);
         bool bCfgOk = FcConfigParseAndLoad(FcConfigGetCurrent(),
                         reinterpret_cast<FcChar8 const *>(aConfFileName.getStr()), FcTrue);
-        if( !bCfgOk )
-            fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
+
+        SAL_INFO_IF(!bCfgOk,
+                "vcl.fonts", "FcConfigParseAndLoad( \""
+                << aConfFileName << "\") => " << bCfgOk);
     } else {
         SAL_INFO("vcl.fonts", "cannot open " << aConfFileName);
     }
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index a7ed0c4e1082..d1601335a1cd 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -680,7 +680,6 @@ void PrintFontManager::initialize()
         m_nNextFontID = 1;
         m_aFonts.clear();
     }
-
 #if OSL_DEBUG_LEVEL > 1
     clock_t aStart;
     clock_t aStep1;
@@ -721,14 +720,18 @@ void PrintFontManager::initialize()
 
 #if OSL_DEBUG_LEVEL > 1
     aStep1 = times( &tms );
-#endif
 
-#if OSL_DEBUG_LEVEL > 1
     aStep2 = times( &tms );
-    fprintf( stderr, "PrintFontManager::initialize: collected %" SAL_PRI_SIZET "u fonts\n", m_aFonts.size() );
+    SAL_INFO("vcl.fonts", "PrintFontManager::initialize: collected "
+            << m_aFonts.size()
+            << " fonts.");
     double fTick = (double)sysconf( _SC_CLK_TCK );
-    fprintf( stderr, "Step 1 took %lf seconds\n", (double)(aStep1 - aStart)/fTick );
-    fprintf( stderr, "Step 2 took %lf seconds\n", (double)(aStep2 - aStep1)/fTick );
+    SAL_INFO("vcl.fonts", "Step 1 took "
+            << ((double)(aStep1 - aStart)/fTick)
+            << " seconds.");
+    SAL_INFO("vcl.fonts", "Step 2 took "
+            << ((double)(aStep2 - aStep1)/fTick)
+            << " seconds.");
 #endif
 
     #ifdef CALLGRIND_COMPILE
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx
index 1b8fb5807bee..7e71a96c35e9 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -132,18 +132,26 @@ bool FcPreMatchSubstitution::FindFontSubstitute(FontSelectPattern &rFontSelData)
     const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut );
 
 #ifdef DEBUG
-    const OString aOrigName(OUStringToOString(rFontSelData.maTargetName,
-        RTL_TEXTENCODING_UTF8));
-    const OString aSubstName(OUStringToOString(aOut.maSearchName,
-        RTL_TEXTENCODING_UTF8));
-    printf( "FcPreMatchSubstitution \"%s\" bipw=%d%d%d%d -> ",
-        aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetItalic(),
-        rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
+    std::ostringstream oss;
+    oss << "FcPreMatchSubstitution \""
+        << rFontSelData.maTargetName
+        << "\" bipw="
+        << rFontSelData.GetWeight()
+        << rFontSelData.GetItalic()
+        << rFontSelData.GetPitch()
+        << rFontSelData.GetWidthType()
+        << " -> ";
     if( !bHaveSubstitute )
-        printf( "no substitute available\n" );
+        oss << "no substitute available.";
     else
-        printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(),
-        aOut.GetWeight(), aOut.GetItalic(), aOut.GetPitch(), aOut.GetWidthType() );
+        oss << "\""
+            << aOut.maSearchName
+            << "\" bipw="
+            << aOut.GetWeight()
+            << aOut.GetItalic()
+            << aOut.GetPitch()
+            << aOut.GetWidthType();
+    SAL_INFO("vcl.fonts", oss.str());
 #endif
 
     if( bHaveSubstitute )
@@ -182,18 +190,26 @@ bool FcGlyphFallbackSubstitution::FindFontSubstitute(FontSelectPattern& rFontSel
     const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut );
 
 #ifdef DEBUG
-    const OString aOrigName(OUStringToOString(rFontSelData.maTargetName,
-        RTL_TEXTENCODING_UTF8));
-    const OString aSubstName(OUStringToOString(aOut.maSearchName,
-        RTL_TEXTENCODING_UTF8));
-    printf( "FcGFSubstitution \"%s\" bipw=%d%d%d%d ->",
-        aOrigName.getStr(), rFontSelData.GetWeight(), rFontSelData.GetItalic(),
-        rFontSelData.GetPitch(), rFontSelData.GetWidthType() );
+    std::ostringstream oss;
+    oss << "FcGFSubstitution \""
+        << rFontSelData.maTargetName
+        << "\" bipw="
+        << rFontSelData.GetWeight()
+        << rFontSelData.GetItalic()
+        << rFontSelData.GetPitch()
+        << rFontSelData.GetWidthType()
+        << " -> ";
     if( !bHaveSubstitute )
-        printf( "no substitute available\n" );
+        oss << "no substitute available.";
     else
-        printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(),
-        aOut.GetWeight(), aOut.GetItalic(), aOut.GetPitch(), aOut.GetWidthType() );
+        oss << "\""
+            << aOut.maSearchName
+            << "\" bipw="
+            << aOut.GetWeight()
+            << aOut.GetItalic()
+            << aOut.GetPitch()
+            << aOut.GetWidthType();
+    SAL_INFO("vcl.fonts", oss.str());
 #endif
 
     if( bHaveSubstitute )