sd/source/ui/unoidl/unomodel.cxx | 3 ++- svx/source/svdraw/sdrpagewindow.cxx | 3 +++ vcl/jsdialog/enabled.cxx | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit dee282441f3483c49759caff73ed3e1cde13f58d Author: Szymon Kłos <[email protected]> AuthorDate: Mon Oct 4 12:25:56 2021 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Wed Oct 6 14:14:36 2021 +0200 lok: fix crash on chart doubleclick in patchPaintWindow backtrace: SdrPageWindow::patchPaintWindow(SdrPaintWindow&) (this=0x0, rPaintWindow=...) at svx/source/svdraw/sdrpagewindow.cxx:168 SdXImpressDocument::paintTile(VirtualDevice&, int, int, int, int, long, long) (this=0x64589d0, rDevice=..., nOutputWidth=180, nOutputHeight=135, nTilePosX=0, nTilePosY=0, nTileWidth=15875, nTileHeight=11906) at sd/source/ui/unoidl/unomodel.cxx:2240 Change-Id: Ie5270c3cc4a40121485d5da756a498ec4fd8bf80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123044 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123134 Tested-by: Jenkins diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index d064f6434c98..a7d1e8568168 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2223,7 +2223,8 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice, { patchedPageWindow = pSdrPageView->FindPageWindow(*getDocWindow()->GetOutDev()); temporaryPaintWindow.reset(new SdrPaintWindow(*pDrawView, rDevice)); - previousPaintWindow = patchedPageWindow->patchPaintWindow(*temporaryPaintWindow); + if (patchedPageWindow) + previousPaintWindow = patchedPageWindow->patchPaintWindow(*temporaryPaintWindow); } } diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 428faa990f39..aeb337d7a8e5 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -167,6 +167,9 @@ rtl::Reference< sdr::overlay::OverlayManager > const & SdrPageWindow::GetOverlay SdrPaintWindow* SdrPageWindow::patchPaintWindow(SdrPaintWindow& rPaintWindow) { + if (!mpImpl) + return nullptr; + if (!mpImpl->mpOriginalPaintWindow) { // first patch commit 07ed070307e84e9f4f42461b788e5ec62a8f5a4b Author: Szymon Kłos <[email protected]> AuthorDate: Mon Oct 4 09:54:36 2021 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Wed Oct 6 14:14:25 2021 +0200 jsdialog: sidebar: fix master page layout value sets fixes: https://github.com/CollaboraOnline/online/issues/3322 Change-Id: Iaed50c19d4a0f45b00ada305fadcb1372aa6ba63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123037 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123133 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 6aa323ed38df..4f490861dbfa 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -95,6 +95,8 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile) || rUIFile == u"modules/simpress/ui/customanimationspanel.ui" || rUIFile == u"modules/simpress/ui/layoutpanel.ui" || rUIFile == u"modules/simpress/ui/masterpagepanel.ui" + || rUIFile == u"modules/simpress/ui/masterpagepanelall.ui" + || rUIFile == u"modules/simpress/ui/masterpagepanelrecent.ui" || rUIFile == u"modules/simpress/ui/slidetransitionspanel.ui" || rUIFile == u"modules/simpress/ui/tabledesignpanel.ui" || rUIFile == u"modules/simpress/ui/navigatorpanel.ui"
