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

[Henry Castro (via logerrit)]

 sc/source/ui/docshell/docsh.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1854f8ae2cf5966db1b51968dafc27785d3b7a11
Author:     Henry Castro <hcas...@collabora.com>
AuthorDate: Thu Jan 5 11:32:32 2023 -0400
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Feb 9 13:06:14 2023 +0000

    lok: sc: avoid the shared spreadsheet dialog
    
    It is not needed the LO core shared spreadsheet
    because the online has collaborative functionality turns on
    by default.
    
    Signed-off-by: Henry Castro <hcas...@collabora.com>
    Change-Id: I57ab83eae2913522d55704ae5a115e30c9d10034
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145091
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145613
    Tested-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit 7137fa5158530c0f6adb1f80f82203b43213187f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146632
    Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1f58bf43f1b7..9d7b77b888e5 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -726,7 +726,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 #endif
 
 #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
-                    if ( IsDocShared() && !SC_MOD()->IsInSharedDocLoading() )
+                    if ( IsDocShared() && !SC_MOD()->IsInSharedDocLoading()
+                         && !comphelper::LibreOfficeKit::isActive() )
                     {
                         ScAppOptions aAppOptions = SC_MOD()->GetAppOptions();
                         if ( aAppOptions.GetShowSharedDocumentWarning() )