vcl/source/window/window2.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 44a04f68e88da833707bc829242351f349278732
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Dec 24 21:09:38 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Dec 24 22:12:30 2020 +0100
Temporarily disable assert that kills Jenkins
It was introduced by 4491cee27c80bc83493136b323af5bdd128352e7 "replace
margin-left with margin-start and margin-right with margin-end", but keeps
breaking CppunitTest_sw_dialogs_test and CppunitTest_sw_dialogs_test2 of
<https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/> now.
Change-Id: I91a7e4bdb6f39f3d6c094efe68a4accb1d6a99b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108273
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index dc3dcdc93db0..6b334257afc2 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")
{
- assert(rKey == "margin-start" && "margin-left deprecated in favor of
margin-start");
+ //TODO: 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
