diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-04 07:58:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-04 07:58:25 +0000 |
| commit | 8c9b3a9fd24239d096703f6fdd3b26d9c2bfab77 (patch) | |
| tree | 88a61cda3ac474bedfc97f3774def44b581676d2 /src/xml/repr-css.cpp | |
| parent | merge from trunk (r11709) (diff) | |
| download | inkscape-8c9b3a9fd24239d096703f6fdd3b26d9c2bfab77.tar.gz inkscape-8c9b3a9fd24239d096703f6fdd3b26d9c2bfab77.zip | |
revert changes in r11686 (not related to EMF support)
(bzr r11668.1.20)
Diffstat (limited to 'src/xml/repr-css.cpp')
| -rw-r--r-- | src/xml/repr-css.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index e0497978a..7fba4d7c6 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -361,10 +361,8 @@ static void sp_repr_css_merge_from_decl(SPCSSAttr *css, CRDeclaration const *con * HACK for now is to strip off em and ex units and add them back at the end */ int l = strlen(value_unquoted); - if (l>2 && - (!strncmp(&value_unquoted[l-2], "em", 2) || - !strncmp(&value_unquoted[l-2], "ex", 2) - )) { + if (!strncmp(&value_unquoted[l-2], "em", 2) || + !strncmp(&value_unquoted[l-2], "ex", 2)) { units = g_strndup(&value_unquoted[l-2], 2); value_unquoted = g_strndup(value_unquoted, l-2); } |