canvas/source/cairo/cairo_textlayout.cxx | 1 sfx2/source/sidebar/Theme.cxx | 5 -- slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 19 +++++++++- svx/source/sidebar/paragraph/ParaPropertyPanel.src | 4 +- 4 files changed, 22 insertions(+), 7 deletions(-)
New commits: commit 2c4bb786a8a049bb5c230c9f2fdb7dc654926ce1 Author: Caolán McNamara <[email protected]> Date: Mon Jun 10 11:29:03 2013 +0100 update graphicrepository links for new icon-theme locations Change-Id: I8de2dbfa6eb98a9b879af362b850c487ab28fa7f (cherry picked from commit 09b054fc4c2a8d9ee2a6ed28194b828d8ff7dd0f) diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index a234215..967adc7 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -363,10 +363,7 @@ void Theme::UpdateTheme (void) Any(A2S("private:graphicrepository/sfx2/res/closedoc.png"))); setPropertyValue( maPropertyIdToNameMap[Image_CloseIndicator], - Any( - mbIsHighContrastMode - ? A2S("private:graphicrepository/res/commandimagelist/lch_decrementlevel.png") - : A2S("private:graphicrepository/res/commandimagelist/lc_decrementlevel.png"))); + Any(A2S("private:graphicrepository/cmd/lc_decrementlevel.png"))); setPropertyValue( maPropertyIdToNameMap[Image_ToolBoxItemSeparator], Any( diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 6db5c75..fa6009f 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -199,7 +199,7 @@ Control RID_SIDEBAR_PARA_PANEL defined for Draw/Impress. It has to be defined in GenericCommancs.xcu to be recognized. See issue 122446 for more details. */ - Command = "private:graphicrepository/res/commandimagelist/sc_paraspaceincrease.png"; + Command = "private:graphicrepository/cmd/sc_paraspaceincrease.png"; }; ToolBoxItem { @@ -209,7 +209,7 @@ Control RID_SIDEBAR_PARA_PANEL /** See above or issue 122446 why the following line is not Command = ".uno:ParaspaceDecrease"; */ - Command = "private:graphicrepository/res/commandimagelist/sc_paraspacedecrease.png"; + Command = "private:graphicrepository/cmd/sc_paraspacedecrease.png"; }; }; }; commit 2c8bd541ee804523fb8933ec4591251546f47dfd Author: Mark Wielaard <[email protected]> Date: Sat Jun 8 00:51:45 2013 +0200 Fix memory leak in OGLTransitionerImpl::createWindow. XFree the result of glXChooseVisual, glXGetVisualFromFBConfig and glXGetFBConfigs when done. Change-Id: I145c7f5f083718d983ccea4b534d4e90056eb14e Reviewed-on: https://gerrit.libreoffice.org/4195 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> (cherry picked from commit a775188f6bbf3bbf8448b2b7398a1902908bb5e2) diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 3c12fee..65c992a 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -537,7 +537,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) for ( ; i < nfbconfigs; i++) { visinfo = glXGetVisualFromFBConfig (GLWin.dpy, fbconfigs[i]); - if( !visinfo || visinfo->visualid != vi->visualid ) + if( !visinfo ) + continue; + + unx::VisualID visualid = visinfo->visualid; + XFree ( visinfo ); + + if ( visualid != vi->visualid ) continue; glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], GLX_DRAWABLE_TYPE, &value); @@ -565,11 +571,14 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) /* TODO: handle non Y inverted cases */ break; } + if (vi != firstVisual) + XFree (vi); if( i != nfbconfigs ) { vi = glXGetVisualFromFBConfig( GLWin.dpy, fbconfigs[i] ); mbHasTFPVisual = true; pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow ); + XFree ( vi ); SAL_INFO("slideshow.opengl", "found visual suitable for texture_from_pixmap"); } else if( firstVisual && pAttributeTable[1] == NULL ) { vi = firstVisual; @@ -577,8 +586,10 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow ); SAL_INFO("slideshow.opengl", "did not find visual suitable for texture_from_pixmap, using " << vi->visualid); } + XFree ( fbconfigs ); #else pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow ); + XFree ( vi ); #endif if ( pChildSysData ) break; @@ -586,6 +597,12 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ++pAttributeTable; } + +#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap ) + if ( firstVisual ) + XFree (firstVisual); +#endif + #endif #if defined( _WIN32 ) commit b1acc53079894e7ba6e186712e38177ffa1e809f Author: Mark Wielaard <[email protected]> Date: Sat Jun 8 00:38:00 2013 +0200 Fix memory leak in cairo TextLayout::draw. Destroy cairo_font_options when done. Change-Id: Ib49c07dee22fa59b4f6227c6b106a18b615aa060 Reviewed-on: https://gerrit.libreoffice.org/4193 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> (cherry picked from commit cad5e28b6bf761268d40236cd8aa381680007cae) diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index fe55665..35defcd 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -572,6 +572,7 @@ namespace cairocanvas cairo_restore( pSCairo.get() ); cairo_font_face_destroy(font_face); + cairo_font_options_destroy(options); } return true; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
