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

New commits:
commit 83269aa84a0af8b9a32424af6b01815aaad4f42a
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue May 7 15:33:21 2024 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue May 7 19:07:01 2024 +0200

    lok: don't show separator conversion dialog
    
    in online it is more likely that you run file not
    created with your user locale. Don't show annoying
    dialog about separator conversion in LOK as we didn't
    show it before. Recently we enabled it and it become visible.
    
    Change-Id: I5a37865dbe63bca0c55205b59be3a64ceb824b17
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167281
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>

diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 344b52953faf..0e147f14c3fe 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -496,7 +496,7 @@ void ScDocShell::CheckConfigOptions()
         pScMod->SetFormulaOptions(aNew);
 
         // Launch a nice warning dialog to let the users know of this change.
-        ScTabViewShell* pViewShell = GetBestViewShell();
+        ScTabViewShell* pViewShell = comphelper::LibreOfficeKit::isActive() ? 
nullptr : GetBestViewShell();
         if (pViewShell)
         {
             std::shared_ptr<weld::MessageDialog> 
xInfoBox(Application::CreateMessageDialog(pViewShell->GetFrameWeld(),

Reply via email to