sc/source/ui/vba/vbarange.cxx | 6 ++++++ 1 file changed, 6 insertions(+)
New commits: commit 980fbcaf9de67013b1e72806de7746543040d48e Author: Dennis Francis <dennis.fran...@collabora.co.uk> Date: Tue Aug 29 15:32:14 2017 +0530 tdf#111939: Fallback to getting view data from best view shell... ...when ScDocShell::GetViewData() returns nullptr. This is needed when a macro is run from the macro editor window instead of running the macro from Tools menu in the Calc window. Change-Id: I89c23c2ec08e8e9907f02eb1389236111530058b Reviewed-on: https://gerrit.libreoffice.org/41733 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Dennis Francis <dennis.fran...@collabora.co.uk> (cherry picked from commit c864fc9eab79d0b24036588cf8fc37ef51bd1907) Reviewed-on: https://gerrit.libreoffice.org/41757 Reviewed-by: Eike Rathke <er...@redhat.com> diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 151403fa1f31..dbe33eed468d 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -4257,6 +4257,12 @@ static void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam ) if ( pDocShell ) { ScViewData* pViewData = ScDocShell::GetViewData(); + if ( !pViewData ) + { + ScTabViewShell* pViewSh = pDocShell->GetBestViewShell( true ); + pViewData = pViewSh ? &pViewSh->GetViewData() : nullptr; + } + if ( pViewData ) { pViewData->GetView()->Query( aParam, nullptr, true ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits