[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source sw/uiconfig

[Serge Krot (via logerrit)]

 sw/source/ui/misc/bookmark.cxx           |    4 ++++
 sw/uiconfig/swriter/ui/insertbookmark.ui |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit e4d5a57bdce67912847dacf2df113ef24c03aa8d
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Mon Jun 8 20:13:04 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jun 10 23:51:36 2020 +0200

    tdf#101856 correct Insert bookmark dialog
    
    - left align checkbox "Hide"
    - do not resize "Close" button
    - place "Close" button at the bottom of the dialog
    
    Change-Id: I57caa83edde2c377dfbf0aaacb60281e4966fbaf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95855
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96016
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 758b85ff73e2..76f9eacae7eb 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -338,6 +338,10 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(vcl::Window* pParent, SwWrtShell& rS, S
     m_pEditBox->SetCursorAtLast();
 
     sRemoveWarning = SwResId(STR_REMOVE_WARNING);
+
+    // disabled until "Hide" flag is not checked
+    m_pConditionED->Enable(false);
+    m_pConditionFT->Enable(false);
 }
 
 SwInsertBookmarkDlg::~SwInsertBookmarkDlg()
diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui
index 6079aefe7a88..81d5cac231dd 100644
--- a/sw/uiconfig/swriter/ui/insertbookmark.ui
+++ b/sw/uiconfig/swriter/ui/insertbookmark.ui
@@ -208,8 +208,8 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">5</property>
           </packing>
         </child>