cui/uiconfig/ui/aboutdialog.ui | 2 +-
sw/uiconfig/swriter/ui/viewoptionspage.ui | 2 +-
vcl/source/window/window2.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3d44173d81042eea788488bc5249b40f5f7e9a36
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Dec 27 19:39:54 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 27 22:35:18 2020 +0100
replace margin-left with margin-start
and restore assert to not use margin-left/right anymore
Change-Id: I05d2a4cc829ed9de3cca73d987f5a66e0582eaa5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108379
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 5fe95759a3f4..0a6783950ee6 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -98,7 +98,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_start">6</property>
+ <property name="margin-start">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="lbVersion">
diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui
b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index b1ef4247bc3c..8cb6fde80a39 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -654,7 +654,7 @@
<property name="label" translatable="yes"
context="viewoptionspage|suboutlinelevelscontent">Include sub _levels</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="margin_left">12</property>
+ <property name="margin-start">12</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 6b334257afc2..dc3dcdc93db0 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1532,7 +1532,7 @@ bool Window::set_property(const OString &rKey, const
OUString &rValue)
set_border_width(rValue.toInt32());
else if (rKey == "margin-start" || rKey == "margin-left")
{
- //TODO: assert(rKey == "margin-start" && "margin-left deprecated in
favor of margin-start");
+ assert(rKey == "margin-start" && "margin-left deprecated in favor of
margin-start");
set_margin_start(rValue.toInt32());
}
else if (rKey == "margin-end" || rKey == "margin-right")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
