[ooo-build-commit] .: 2 commits - canvas/source vcl/win

[Tor Lillqvist]

 canvas/source/directx/dx_textlayout_drawhelper.cxx |    1 +
 vcl/win/source/gdi/salgdi3.cxx                     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 296bc0e30cf0044e1fac6a8240e8e785258fa72d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 1 18:13:13 2010 +0300

    Need to include <com/sun/star/rendering/PanoseProportion.hpp>
    
    Thanks to caolan for the hint.

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
old mode 100755
new mode 100644
index 380a329..484a81c
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -40,6 +40,7 @@
 #include <boost/bind.hpp>
 #include <com/sun/star/rendering/FontRequest.hpp>
 #include <com/sun/star/rendering/XCanvasFont.hpp>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
 #include <comphelper/sequence.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <tools/color.hxx>
commit e766f5c2a9a9327a1a836800fd94ca263a81d020
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 1 12:57:56 2010 +0300

    Fix Windows build

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f3c2f0a..02d3806 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1763,7 +1763,7 @@ USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
 void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel )
 {
     // temporarily change the HDC to the font in the fallback level
-    HFONT hOldFont = SelectFont( mhDC, mhFonts[i] );
+    HFONT hOldFont = SelectFont( mhDC, mhFonts[nFallbackLevel] );
 
     if ( aSalShlData.mbWNT )
     {
@@ -1783,7 +1783,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
     const bool bOK = GetTextMetricsA( mhDC, &aWinMetric );
     // restore the HDC to the font in the base level
     SelectFont( mhDC, hOldFont );
-    if( !bOk )
+    if( !bOK )
         return;
 
     // device independent font attributes