svx/uiconfig/ui/sidebarparagraph.ui | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 578667856462c9f7374b0714c5cc311191122b00
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Feb 20 16:43:43 2020 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Feb 20 18:43:06 2020 +0100
sidebar: provide indent field boxes with useful id for hiding on mobile.
Change-Id: I45feb65dbc48810f27e4f7151de46bafcb54af00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89128
Tested-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui
b/svx/uiconfig/ui/sidebarparagraph.ui
index 4e0a7df6836f..6433ab60612c 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -381,7 +381,11 @@
</packing>
</child>
<child>
+<<<<<<< HEAD (aad94d Silence warnings in salvtables.hxx)
<object class="GtkBox" id="box4">
+=======
+ <object class="GtkBox" id="indentfieldbox">
+>>>>>>> CHANGE (8b9246 sidebar: provide indent field boxes with useful id for
hidin)
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
