sw/source/core/layout/newfrm.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit ce057e662b2e10e111353e9461c3c01434ddbb0f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 6 18:26:15 2017 +0200
Revert "Fix -fsanitize=signed-integer-overflow"
This reverts commit 63d845dc88690b9c5c8194e1512a8e4390c7ee24. The immediate
problem is fixed with 9dd0c0fcc141ae53cacb29cd0b144ac2b13e9f86 "Missing
dependency" now. For the general issue that loading
sw/qa/extras/uiwriter/data/tdf112860.fodt fails with a UBSan error or a null
deref SIGSEGV when fonts are missing see
<https://bugs.documentfoundation.org/show_bug.cgi?id=112942>
"SwUiWriterTest::testTdf112860 crashes when Liberation fonts are missing".
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index c51c379b89cf..6673ed22b909 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/config.h>
-
-#include <o3tl/safeint.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include <drawdoc.hxx>
@@ -107,7 +104,7 @@ static SwRectFnCollection aHorizontal = {
&FirstMinusSecond,
&FirstMinusSecond,
&SwIncrement,
- &o3tl::saturating_add<long>,
+ &SwIncrement,
&SwRect::SetLeftAndWidth,
&SwRect::SetTopAndHeight
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
