[Libreoffice-commits] core.git: 3 commits - avmedia/source sal/osl vcl/source

[Jan Holesovsky]

 avmedia/source/viewer/mediawindow_impl.cxx |    2 +-
 sal/osl/all/log.cxx                        |    1 +
 vcl/source/opengl/OpenGLContext.cxx        |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 18d4f6c9ee24dc080bc3b6fed7403f5d0c18f965
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 6 02:31:42 2014 +0200

    Use WB_CLIPCHILDREN consistently.
    
    Change-Id: Ifd53e37d23c29efb2f084a39b48c88ea4bc0d70a

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index e52e524..58c2d49 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -84,7 +84,7 @@ MediaChildWindow::MediaChildWindow( Window* pParent ) :
 }
 
 MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData ) :
-    SystemChildWindow( pParent, 0, pData )
+    SystemChildWindow( pParent, WB_CLIPCHILDREN, pData )
 {
 }
 
commit d9fb35083dd34a4a3b486e4b1c8969448c522103
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 6 02:22:57 2014 +0200

    OpenGLContext: Use the right window handle on Windows.
    
    Change-Id: I77eaf1dad9ce4c855b5f88bd8568944fd4128227

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 5271214..3e838ea 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -566,8 +566,6 @@ void OpenGLContext::renderToFile()
 
 bool OpenGLContext::initWindow()
 {
-    const SystemEnvData* sysData(mpWindow->GetSystemData());
-    m_aGLWin.hWnd = sysData->hWnd;
     if( !m_pChildWindow )
     {
         SystemWindowData winData = generateWinData(mpWindow);
@@ -583,6 +581,8 @@ bool OpenGLContext::initWindow()
         m_pChildWindow->SetControlForeground();
         m_pChildWindow->SetControlBackground();
         m_pChildWindow->EnablePaint(sal_False);
+
+        const SystemEnvData* sysData(m_pChildWindow->GetSystemData());
         m_aGLWin.hWnd = sysData->hWnd;
     }
 
commit 68e5207306dad9ce4cdf95283f4b2c5e32f131e2
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon May 5 18:32:49 2014 +0200

    sal logging: Flush after having written the output.
    
    Makes it possible to see the messages immediately on Windows; otherwise the
    SAL_DEBUG() etc. is useless as it shows on screen too late.
    
    Change-Id: I701922aa4fcacf66d6b044e0badca7ef1f9cac94

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 056d2a4..aa3105d 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -240,6 +240,7 @@ void log(
 #endif
     } else {
         std::fputs(s.str().c_str(), stderr);
+        std::fflush(stderr);
     }
 #endif
 }