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

[Serge Krot (via logerrit)]

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

New commits:
commit 280c56db840b5822d0b4560f02fcd1b8ced74f90
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 22:53:51 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>
    (cherry picked from commit 3a371da71ab738a99e81e75c736fa5e384ebd9d3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95971

diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 1c67f547558c..29f090f94ff6 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -343,6 +343,10 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg(weld::Window* pParent, SwWrtShell& rS,
     }
 
     m_bAreProtected = rSh.getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_BOOKMARKS);
+
+    // 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>