[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source sw/uiconfig

[Serge Krot (via logerrit)]

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

New commits:
commit ce8087a61350f1f51cf0a75a1a5698183b3e17db
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: Tue Jun 9 16:27:17 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/+/95938
    Tested-by: Vasily Melenchuk <vasily.melenchuk at cib.de>
    Reviewed-by: Vasily Melenchuk <vasily.melenchuk at cib.de>

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 3c99ab0c6848..e5be414d7bdb 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -344,6 +344,9 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS,
         m_xConditionED->set_visible( false );
     }
 
+    // disabled until "Hide" flag is not checked
+    m_xConditionED->set_sensitive(false);
+    m_xConditionFT->set_sensitive(false);
 }
 
 IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, nColumn, void)
diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui
index f062451af767..8b65bfc619b9 100644
--- a/sw/uiconfig/swriter/ui/insertbookmark.ui
+++ b/sw/uiconfig/swriter/ui/insertbookmark.ui
@@ -71,9 +71,9 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">6</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">7</property>
           </packing>
         </child>
         <child>
@@ -145,6 +145,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="valign">start</property>
+                <property name="halign">start</property>
                 <property name="use_underline">True</property>
                 <property name="draw_indicator">True</property>
               </object>