sc/source/filter/oox/workbookhelper.cxx | 3 +++ vcl/unx/gtk3/gtkdata.cxx | 5 ----- vcl/unx/gtk3/gtkinst.cxx | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 948066dba3556598337b3b5db75f77439627f94f Author: Caolán McNamara <[email protected]> AuthorDate: Tue May 11 12:24:48 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue May 11 14:40:34 2021 +0200 gtk4: enable svg pointer cursors Change-Id: I15086c16733b862dfea7dc9be621a527000b97cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115398 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx index eb534b0d42e6..a30e4df0b853 100644 --- a/vcl/unx/gtk3/gtkdata.cxx +++ b/vcl/unx/gtk3/gtkdata.cxx @@ -135,12 +135,7 @@ void GtkSalDisplay::monitorsChanged( GdkScreen const * pScreen ) GdkCursor* GtkSalDisplay::getFromSvg(OUString const & name, int nXHot, int nYHot) { -#if !GTK_CHECK_VERSION(4, 0, 0) GdkPixbuf* pPixBuf = load_icon_by_name(name); -#else - (void)name; - GdkPixbuf* pPixBuf = nullptr; -#endif assert(pPixBuf && "missing image?"); if (!pPixBuf) return nullptr; diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index b8ddee717811..3f15bf1f9fe0 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -3665,6 +3665,7 @@ namespace return OUString(pText, pText ? strlen(pText) : 0, RTL_TEXTENCODING_UTF8); } } +#endif namespace { @@ -3702,6 +3703,7 @@ GdkPixbuf* load_icon_by_name(const OUString& rIconName) return load_icon_by_name_theme_lang(rIconName, sIconTheme, sUILang); } +#if !GTK_CHECK_VERSION(4, 0, 0) namespace { GdkPixbuf* getPixbuf(const css::uno::Reference<css::graphic::XGraphic>& rImage) commit 31d3f7c7e571acbce0b4da98e6a240ecdc8ea014 Author: Noel Grandin <[email protected]> AuthorDate: Tue May 11 12:30:43 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue May 11 14:40:15 2021 +0200 do not leak on error path Change-Id: Iba675c7465b1850e154152d86141947c4779952b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115394 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 7adb76bcb7ef..8c7ffb3de4d8 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -370,7 +370,10 @@ ScRangeData* lcl_addNewByNameAndTokens( ScDocument& rDoc, ScRangeName* pNames, c if ( pNames->insert(pNew) ) bDone = true; if (!bDone) + { + delete pNew; throw RuntimeException(); + } return pNew; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
