[Libreoffice-commits] .: 2 commits - vcl/inc vcl/win

[Tor Lillqvist]

 vcl/inc/win/saldata.hxx            |    1 
 vcl/win/source/window/salframe.cxx |   48 -------------------------------------
 2 files changed, 49 deletions(-)

New commits:
commit 62892c5cacd0b26f35e567f5a95867a15c807584
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Sep 30 16:25:18 2011 +0300

    Kill unused SalFrameWndProcA() function

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index ba90686..1126869 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -219,7 +219,6 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount );
 sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg );
 
 // \\WIN\SOURCE\WINDOW\SALFRAME.CXX
-LRESULT CALLBACK SalFrameWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
 LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
 // \SV\WIN\SOURCE\APP\SALTIMER.CXX
 #define SALTIMERPROC_RECURSIVE 0xffffffff
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 162f8dd..cfe05d7 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -6141,34 +6141,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
     return nRet;
 }
 
-LRESULT CALLBACK SalFrameWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
-{
-    int bDef = TRUE;
-    LRESULT nRet = 0;
-#ifdef __MINGW32__
-    jmp_buf jmpbuf;
-    __SEHandler han;
-    if (__builtin_setjmp(jmpbuf) == 0)
-    {
-        han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
-    __try
-    {
-#endif
-        nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );
-    }
-#ifdef __MINGW32__
-    han.Reset();
-#else
-    __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))
-    {
-    }
-#endif
-    if ( bDef )
-        nRet = DefWindowProcA( hWnd, nMsg, wParam, lParam );
-    return nRet;
-}
-
 LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
 {
     int bDef = TRUE;
commit d91a698637a53e20805f14b0aaa46e9fb2059bf4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Sep 30 16:23:28 2011 +0300

    Kill unused ImplSalUpdateStyleFontA() function

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 0c5e5ee..162f8dd 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2666,26 +2666,6 @@ inline Color ImplWinColorToSal( COLORREF nColor )
 
 // -----------------------------------------------------------------------
 
-static void ImplSalUpdateStyleFontA( HDC hDC, const LOGFONTA& rLogFont, Font& rFont )
-{
-    ImplSalLogFontToFontA( hDC, rLogFont, rFont );
-
-    // On Windows 9x, Windows NT we get sometimes very small sizes
-    // (for example for the small Caption height).
-    // So if it is MS Sans Serif, a none scalable font we use
-    // 8 Point as the minimum control height, in all other cases
-    // 6 Point is the smallest one
-    if ( rFont.GetHeight() < 8 )
-    {
-        if ( rtl_str_compareIgnoreAsciiCase( rLogFont.lfFaceName, "MS Sans Serif" ) == 0 )
-            rFont.SetHeight( 8 );
-        else if ( rFont.GetHeight() < 6 )
-            rFont.SetHeight( 6 );
-    }
-}
-
-// -----------------------------------------------------------------------
-
 static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
 {
     ImplSalLogFontToFontW( hDC, rLogFont, rFont );