desktop/source/lib/init.cxx | 2 +- sd/source/ui/inc/PaneChildWindows.hxx | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit fa18cdce824525ebd76b542a44741a35062741ce Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Sun Mar 10 12:21:33 2019 -0400 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Tue Sep 3 13:39:35 2019 +0200 LOK: don't segfault when reporting error Change-Id: Ia6d614eb15b15f43ddd3e0b5742b888060dfd581 Reviewed-on: https://gerrit.libreoffice.org/69069 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> (cherry picked from commit 9fa568dced78011072390320f64eae28dd06d2b9) Reviewed-on: https://gerrit.libreoffice.org/78443 diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 43e3168a49ad..e0e8aca13776 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3315,7 +3315,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma else bResult = comphelper::dispatchCommand(aCommand, comphelper::containerToSequence(aPropertyValuesVector)); - if (!bResult) + if (!bResult && gImpl) { SetLastExceptionMsg("Failed to dispatch the .uno: command"); } commit 17d338ae7c8d6ac3e66706887aada270dccade0e Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk> AuthorDate: Mon Nov 12 08:22:17 2018 -0500 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Tue Sep 3 13:39:11 2019 +0200 sd: document the left pane classes Change-Id: Id037e2f5f733ef7266ef6d48ff2ff7dea956ea25 Reviewed-on: https://gerrit.libreoffice.org/69070 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> (cherry picked from commit 0b3c2cb3cb8c8b2ddec6063c2ea75b24abf518fc) Reviewed-on: https://gerrit.libreoffice.org/78442 diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index d277a808d6b7..ff72731b822c 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -24,6 +24,7 @@ namespace sd { +/// Base class of Impress and Draw left sidebars/panes. class PaneChildWindow : public SfxChildWindow { @@ -37,20 +38,24 @@ public: virtual ~PaneChildWindow() override; }; +/// The slide-sorter sidebar (on the left) in Impress. class LeftPaneImpressChildWindow : public PaneChildWindow { public: - LeftPaneImpressChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneImpressChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, + SfxChildWinInfo* pInfo); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow); }; +/// The pages sidebar (on the left) in Draw. class LeftPaneDrawChildWindow : public PaneChildWindow { public: - LeftPaneDrawChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneDrawChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, + SfxChildWinInfo* pInfo); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow); }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits