sc/source/ui/vba/vbarange.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit c864fc9eab79d0b24036588cf8fc37ef51bd1907
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>
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index dec8b43ca9d8..29380216900b 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4255,6 +4255,12 @@ static void lcl_SelectAll( const ScDocShell* pDocShell,
const ScQueryParam& aPar
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
