diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-09-29 14:21:07 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-09-29 14:21:07 +0000 |
| commit | e186cf544131e582a43316767257f199e6af986c (patch) | |
| tree | 5da57745079691219f151008346091fede639020 /src/desktop-style.cpp | |
| parent | Quick fix to unbreak build from last check in. (diff) | |
| download | inkscape-e186cf544131e582a43316767257f199e6af986c.tar.gz inkscape-e186cf544131e582a43316767257f199e6af986c.zip | |
Remove NRTypePosDef class and associated cruft. More direct CSS -> Pango translation.
(bzr r13341.1.233)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 2c20524a2..ce8a06f29 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -41,7 +41,6 @@ #include "sp-tspan.h" #include "xml/repr.h" #include "xml/sp-css-attr.h" -#include "libnrtype/font-style-to-pos.h" #include "sp-path.h" #include "ui/tools/tool-base.h" @@ -1099,7 +1098,10 @@ objects_query_fontstyle (GSList *objects, SPStyle *style_res) texts ++; if (set && - font_style_to_pos(*style_res).signature() != font_style_to_pos(*style).signature() ) { + ( ( style_res->font_weight.computed != style->font_weight.computed ) || + ( style_res->font_style.computed != style->font_style.computed ) || + ( style_res->font_stretch.computed != style->font_stretch.computed ) || + ( style_res->font_variant.computed != style->font_variant.computed ) ) ) { different = true; // different styles } |