[Libreoffice-commits] core.git: vcl/win

Tor Lillqvist tml at collabora.com
Fri Aug 21 06:30:35 PDT 2015


 vcl/win/source/gdi/winlayout.cxx |   50 ---------------------------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

New commits:
commit 50eda89e53914eb1272fffda8de4f15ac824a030
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Aug 21 16:29:13 2015 +0300

    Let's not overdo the verboseness in this SAL_INFO
    
    Change-Id: I7b06d0ffe53c6ebf2b479951321dcb37cb22c355

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index b0575a6..85b1e97 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -307,53 +307,6 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, const WinLayout& rLayou
     }
     aChunk.mnAscentPlusIntLeading = aTextMetric.tmAscent + aTextMetric.tmInternalLeading;
 
-    UINT nAlign = GetTextAlign(hDC);
-    if (nAlign == GDI_ERROR)
-    {
-        SAL_WARN("vcl.gdi", "GetTextAlign failed: " << WindowsErrorString(GetLastError()));
-        SelectObject(hDC, hOrigFont);
-        DeleteDC(hDC);
-        return false;
-    }
-
-    OUString sAlign;
-    switch ((TA_LEFT|TA_CENTER|TA_RIGHT) & nAlign)
-    {
-    case TA_LEFT:
-        sAlign = "LEFT";
-        break;
-    case TA_CENTER:
-        sAlign = "CENTER";
-        break;
-    case TA_RIGHT:
-        sAlign = "RIGHT";
-        break;
-    default:
-        sAlign = "0x" + OUString::number((TA_LEFT|TA_CENTER|TA_RIGHT) & nAlign,16);
-        break;
-    }
-    sAlign += "|";
-    switch ((TA_BOTTOM|TA_BASELINE|TA_TOP) & nAlign)
-    {
-    case TA_BOTTOM:
-        sAlign += "BOTTOM";
-        break;
-    case TA_BASELINE:
-        sAlign += "BASELINE";
-        break;
-    case TA_TOP:
-        sAlign += "TOP";
-        break;
-    default:
-        sAlign += "0x" + OUString::number((TA_BOTTOM|TA_BASELINE|TA_TOP) & nAlign,16);
-        break;
-    }
-    sAlign += "|";
-    if (TA_UPDATECP & nAlign)
-        sAlign += "UPDATECP";
-    else
-        sAlign += "NOUPDATECP";
-
     LOGFONTW aLogfont;
     if (!GetObjectW(rLayout.mhFont, sizeof(aLogfont), &aLogfont))
     {
@@ -374,8 +327,7 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, const WinLayout& rLayou
     }
 
     SAL_INFO("vcl.gdi.opengl", OUString(sFaceName, nFaceNameLen) <<
-             ": " << sAlign <<
-             " Escapement=" << aLogfont.lfEscapement <<
+             ": Escapement=" << aLogfont.lfEscapement <<
              " Orientation=" << aLogfont.lfOrientation <<
              " Ascent=" << aTextMetric.tmAscent <<
              " InternalLeading=" << aTextMetric.tmInternalLeading <<


More information about the Libreoffice-commits mailing list