[Libreoffice-commits] core.git: 2 commits - sw/source vcl/jsdialog

[Szymon Kłos (via logerrit)]

 sw/source/ui/dialog/uiregionsw.cxx |   10 ++++------
 vcl/jsdialog/jsdialogbuilder.cxx   |    1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 77b2fd00eee43cac9defe55b9622d95c3cb21542
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed May 10 08:27:01 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri May 12 12:26:20 2023 +0200

    jsdialog: don't send full update on message dialog close
    
    this fixes regression introduced in:
    commit 09976bda9c196b2426b8826941f21384a58bf536
    jsdialog: don't close dialog on tab page destroy
    
    when enable macro warning was shown it required to
    close manually the dialog with 'x' button because
    after click on "enable' or 'disable' it wasn't closed
    
    Change-Id: I4741a874f93481ad03d043349520a1bf91a882be
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151602
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151694
    Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 9b185b2701e5..ed3a0893dbcb 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -905,6 +905,7 @@ std::unique_ptr<weld::MessageDialog> 
JSInstanceBuilder::weld_message_dialog(cons
         m_bHasTopLevelDialog = true;
 
         initializeSender(GetNotifierWindow(), GetContentWindow(), 
GetTypeOfJSON());
+        m_bSentInitialUpdate = true;
     }
 
     pRet.reset(pMessageDialog ? new JSMessageDialog(this, pMessageDialog, 
this, false) : nullptr);
commit 29f6cea1bf55bc40d124fb0ca5cd8895c9053843
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon May 1 16:34:07 2023 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri May 12 12:26:06 2023 +0200

    lok: Hide file name label
    
    this is followup for:
    commit 80c423520baa94cd3546e02cb383946a7d448ce9
    lok: Hide file linking in section
    
    Change-Id: I28f965766758d87f457e8471bf88b5db886fbba3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151232
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151692
    Tested-by: Jenkins

diff --git a/sw/source/ui/dialog/uiregionsw.cxx 
b/sw/source/ui/dialog/uiregionsw.cxx
index 2587cec535d7..96c5b7f8f708 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -418,15 +418,11 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, 
SwWrtShell& rWrtSh)
 
     if(comphelper::LibreOfficeKit::isActive())
     {
-        m_xBuilder->weld_label("label8")->hide(); // Link
-        m_xFileCB->hide();
         m_xDDECB->hide();
         m_xDDECommandFT->hide();
         m_xFileNameFT->hide();
         m_xFileNameED->hide();
         m_xFilePB->hide();
-        m_xSubRegionFT->hide();
-        m_xSubRegionED->hide();
     }
 }
 
@@ -1188,7 +1184,8 @@ IMPL_LINK(SwEditRegionDlg, DDEHdl, weld::Toggleable&, 
rButton, void)
     {
         m_xDDECommandFT->hide();
         m_xFileNameFT->set_sensitive(bFile);
-        m_xFileNameFT->show();
+        if(!comphelper::LibreOfficeKit::isActive())
+            m_xFileNameFT->show();
         m_xSubRegionED->show();
         m_xSubRegionFT->show();
         m_xSubRegionED->set_sensitive(bFile);
@@ -1755,7 +1752,8 @@ IMPL_LINK( SwInsertSectionTabPage, DDEHdl, 
weld::Toggleable&, rButton, void )
     {
         m_xDDECommandFT->hide();
         m_xFileNameFT->set_sensitive(bFile);
-        m_xFileNameFT->show();
+        if(!comphelper::LibreOfficeKit::isActive())
+            m_xFileNameFT->show();
         m_xSubRegionFT->show();
         m_xSubRegionED->show();
         m_xSubRegionED->set_sensitive(bFile);