[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/win

[Norbert Thiebaud]

 vcl/win/source/window/salobj.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0a2f81a35d338c8e2d2da55df3fb221fa1de5bba
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu May 10 13:49:01 2012 -0500

fdo#45081: We never registered the SAL_OBJECT_CHILDCLASSNAMEA window class

A crucial line of code that called RegisterClassExA() for that window
class had been deleted by accident in commit
cda4a293608514783d38d470799cfbf97b245cc6 Code cleanup in May 2011,
whoa. So apparently that window class is not needed for much except
embedded video in Impress?

Change-Id: I I19e70cefcf47aaf8a12a62539e0dacc5adb3c3b1
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 29125c0..5c847b9 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -559,7 +559,8 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, 
WinSalFrame* pParent )
 aWndClassEx.hbrBackground   = (HBRUSH)(COLOR_WINDOW+1);
 aWndClassEx.lpfnWndProc = SalSysObjChildWndProcA;
 aWndClassEx.lpszClassName   = SAL_OBJECT_CHILDCLASSNAMEA;
-pSalData-mbObjClassInit = TRUE;
+if ( RegisterClassExA( aWndClassEx ) )
+pSalData-mbObjClassInit = TRUE;
 }
 }
 
@@ -593,6 +594,15 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, 
WinSalFrame* pParent )
 
 if ( !hWndChild )
 {
+#if OSL_DEBUG_LEVEL  1
+char *msg = NULL;
+FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER
+  |FORMAT_MESSAGE_IGNORE_INSERTS
+  |FORMAT_MESSAGE_FROM_SYSTEM,
+   NULL, GetLastError(), 0,
+   (LPSTR) msg, 0, NULL);
+MessageBoxA(NULL, msg, CreateWindowExA failed, MB_OK);
+#endif
 delete pObject;
 return NULL;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/win

[Caolán McNamara]

 vcl/win/source/gdi/winlayout.cxx |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 88907415f03b4566d0ed87e98e372dd5c3c74e50
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 20 13:06:27 2012 +

Resolves: fdo#46923 fdo#46750 revert thai glyph fallback

Revert fdo#33090 better glyph fallback under windows for complex text

This reverts commit e601c32661735e9fd78def7ee11bfe21279cca71.

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7b08ee8..c191149 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1855,28 +1855,6 @@ int UniscribeLayout::GetNextGlyphs( int nLen, 
sal_GlyphId* pGlyphs, Point rPos,
 const VisualItem rVI = mpVisualItems[ nItem ];
 if( rVI.IsEmpty() )
 continue;
-
-//Resolves: fdo#33090 Ensure that all glyph slots, even if 0-width
-//or empty due to combining chars etc, map back to a character
-//position so that iterating over glyph slots one at a time for
-//glyph fallback can keep context as to what characters are the
-//inputs that caused a missing glyph in a given font.
-{
-int dir = 1;
-int out = rVI.mnMinCharPos;
-if (rVI.IsRTL())
-{
-dir = -1;
-out = rVI.mnEndCharPos-1;
-}
-for(c = rVI.mnMinCharPos; c  rVI.mnEndCharPos; ++c)
-{
-int i = out;
-mpGlyphs2Chars[i] = c;
-out += dir;
-}
-}
-
 // calculate the mapping by using mpLogClusters[]
 // mpGlyphs2Chars[] should obey the logical order
 // = reversing the loop does this by overwriting higher logicals
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits