[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - vcl/source

2014-05-28 Thread Markus Mohrhard 
 vcl/source/window/openglwin.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a1e1c477ba4baf4a4f0c3b55f478533c030e8562
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Wed May 28 17:41:14 2014 +0200

fix build error

Change-Id: I550616e1f6e63ac42103756014b1aa26cee5c21f

diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index 68eac16..0300987 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -24,9 +24,9 @@ private:
 OpenGLWindowImpl::OpenGLWindowImpl(Window* pWindow):
 mpChildWindow(new SystemChildWindow(pWindow))
 {
+mpChildWindow-Show();
 maContext.init(mpChildWindow.get());
 pWindow-SetMouseTransparent(false);
-maContext.show();
 }
 
 OpenGLContext* OpenGLWindowImpl::getContext()
@@ -60,7 +60,6 @@ void OpenGLWindow::Paint(const Rectangle)
 
 void OpenGLWindow::MouseButtonDown( const MouseEvent rMEvt )
 {
-getContext()-show();
 maStartPoint = rMEvt.GetPosPixel();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - vcl/source

2014-05-24 Thread Stephan Bergmann 
 vcl/source/opengl/OpenGLContext.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4871c68a108f2d28419a4e59384bf3644f80383b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 20 09:41:59 2014 +0200

Hack to for now work around dpy == null crashing CppunitTest_chart2_*

...since 2fc4f5cd750cc3899ffc6b2f831edcb01e7773b4 Register OpenGL windows 
to
ScGridWindow upon file load.  Should be revisited and fixed properly.

Change-Id: I5a3d08cb750fd9ec7c98d5b85250eaabd1c7a8b2

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 7221101..d111b3e 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -397,7 +397,7 @@ bool OpenGLContext::ImplInit()
 #elif defined( ANDROID )
 
 #elif defined( UNX )
-m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy,
+m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy,
  m_aGLWin.vi,
  0,
  GL_TRUE);
@@ -697,7 +697,7 @@ SystemWindowData OpenGLContext::generateWinData(Window* 
pParent)
 
 Display *dpy = reinterpret_castDisplay*(sysData-pDisplay);
 
-if( !glXQueryExtension( dpy, NULL, NULL ) )
+if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) )
 return aWinData;
 
 XLIB_Window win = sysData-aWindow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - vcl/source

2014-05-22 Thread Markus Mohrhard 
 vcl/source/opengl/OpenGLContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1766f4b4ca28fa03cc94f373cf52a0af1cfb863c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri May 23 03:01:35 2014 +0200

the variable is only available on linux

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index e07b341..7221101 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -21,7 +21,7 @@ using namespace com::sun::star;
 
 GLWindow::~GLWindow()
 {
-#if defined( UNX )
+#if defined( UNX )  !defined MACOSX  !defined IOS  !defined ANDROID
 XFree(vi);
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - vcl/source

2014-05-19 Thread Jan Holesovsky 
 vcl/source/opengl/OpenGLContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39536557e039252f110d22884cbbce68458356c3
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon May 19 15:36:06 2014 +0200

Don't disable painting.

Change-Id: Ia7d8a49af756a642c393f47b7dc342b8e48b5eda

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 6bb7c10..d0189fa 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -585,7 +585,7 @@ bool OpenGLContext::initWindow()
 m_pChildWindow-EnableEraseBackground( false );
 m_pChildWindow-SetControlForeground();
 m_pChildWindow-SetControlBackground();
-m_pChildWindow-EnablePaint(false);
+//m_pChildWindow-EnablePaint(false);
 
 const SystemEnvData* sysData(m_pChildWindow-GetSystemData());
 m_aGLWin.hWnd = sysData-hWnd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits