From 6031728e438feb9457596baae886c803883535e4 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 4 May 2018 18:45:37 +0200 Subject: Revert "Fix include order with clang-tidy check llvm-include-order" This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60. --- src/text-editing.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/text-editing.cpp') diff --git a/src/text-editing.cpp b/src/text-editing.cpp index eaaaafaf7..ec9b82235 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -16,8 +16,8 @@ #endif #include -#include #include +#include #include "desktop.h" #include "document.h" @@ -25,11 +25,11 @@ #include "message-stack.h" #include "text-editing.h" +#include "object/sp-textpath.h" +#include "object/sp-flowtext.h" #include "object/sp-flowdiv.h" #include "object/sp-flowregion.h" -#include "object/sp-flowtext.h" #include "object/sp-item-group.h" -#include "object/sp-textpath.h" #include "object/sp-tref.h" #include "object/sp-tspan.h" #include "style.h" @@ -1240,7 +1240,7 @@ sp_te_adjust_line_height (SPObject *object, double amount, double average, bool // Always set if top level true. // Also set if line_height is set to a non-zero value. if (top_level || - (style->line_height.set && !style->line_height.inherit && (!(style->line_height.computed) == 0))){ + (style->line_height.set && !style->line_height.inherit && !style->line_height.computed == 0)){ // Scale default values if (!style->line_height.set || style->line_height.inherit || style->line_height.normal) { -- cgit v1.2.3