oox/source/export/chartexport.cxx | 3 +-- vcl/source/opengl/OpenGLContext.cxx | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit 127f51ec41d989ad19c2d47476de30990dd21462 Author: Markus Mohrhard <[email protected]> Date: Sat Nov 22 17:08:17 2014 +0100 small cosmetic clean-up Change-Id: Idce2856f656576dc58e137800e11da0178eb5201 diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 3dc8602..cf3ad46 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1575,7 +1575,6 @@ void ChartExport::exportUpDownBars( Reference< chart2::XChartType > xChartType) Reference< ::com::sun::star::chart::XStatisticDisplay > xChartPropProvider( mxDiagram, uno::UNO_QUERY ); if(xChartPropProvider.is()) { - Reference< beans::XPropertySet > xChartPropSet = xChartPropProvider->getMinMaxLine(); // updownbar pFS->startElement( FSNS( XML_c, XML_upDownBars ), FSEND ); @@ -1585,7 +1584,7 @@ void ChartExport::exportUpDownBars( Reference< chart2::XChartType > xChartType) XML_val, I32S( nGapWidth ), FSEND ); - xChartPropSet = xChartPropProvider->getUpBar(); + Reference< beans::XPropertySet > xChartPropSet = xChartPropProvider->getUpBar(); if( xChartPropSet.is() ) { pFS->startElement( FSNS( XML_c, XML_upBars ), commit 92e9753bd2b851597353603f5fc956460ff88231 Author: Markus Mohrhard <[email protected]> Date: Sat Nov 22 16:55:44 2014 +0100 fix glx resource leak Change-Id: I013676d2f4caa0479c917a7f833966be8f0b8009 diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index dac3b5c..6595709 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -83,8 +83,8 @@ OpenGLContext::~OpenGLContext() } glXDestroyContext(m_aGLWin.dpy, m_aGLWin.ctx); - if (mbPixmap) - glXDestroyGLXPixmap(m_aGLWin.dpy, m_aGLWin.glPix); + if (mbPixmap && m_aGLWin.glPix != None) + glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix); } #endif } @@ -613,6 +613,12 @@ void OpenGLContext::resetToReInitialize() if( !mbInitialized ) return; resetCurrent(); + + if (mbPixmap) + { + glXDestroyPixmap(m_aGLWin.dpy, m_aGLWin.glPix); + m_aGLWin.glPix = None; + } mbInitialized = false; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
