diff options
| author | Marc Jeanmougin <marc.jeanmougin@telecom-paristech.fr> | 2018-04-29 22:12:42 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc.jeanmougin@telecom-paristech.fr> | 2018-04-29 22:12:42 +0000 |
| commit | bba4ff6672494fab59286b50f6c645ad62a47e60 (patch) | |
| tree | c357b8add3334ef1df340d4eb433404857c27e7d /src/text-editing.cpp | |
| parent | Fix test (diff) | |
| download | inkscape-bba4ff6672494fab59286b50f6c645ad62a47e60.tar.gz inkscape-bba4ff6672494fab59286b50f6c645ad62a47e60.zip | |
Fix include order with clang-tidy check llvm-include-order
Diffstat (limited to 'src/text-editing.cpp')
| -rw-r--r-- | src/text-editing.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp index ec9b82235..eaaaafaf7 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -16,8 +16,8 @@ #endif #include <cstring> -#include <string> #include <glibmm/i18n.h> +#include <string> #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) { |