[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/tabcont.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2502b80e57eb2116fd7043603833ff38f9da1320
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 12 11:31:20 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 12 15:39:37 2021 +0100

    query the DocShell if we have entered modal mode
    
    rather than using Application::IsInModalMode()
    
    Change-Id: Ib630aeef06928c2bbc5fb9697e6864874f2f2a71
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112384
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index c96f3424a511..31628bc9c342 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -621,7 +621,7 @@ TabBarAllowRenamingReturnCode ScTabControl::AllowRenaming()
             OSL_FAIL("ScTabControl::AllowRenaming: nested calls");
             nRet = TABBAR_RENAMING_NO;
         }
-        else if ( Application::IsInModalMode() )
+        else if (pViewData->GetDocShell()->IsInModalMode())
         {
             //  don't show error message above any modal dialog
             //  instead cancel renaming without error message