diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-16 21:11:01 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-16 21:11:01 +0000 |
| commit | 8456986cea7b4a4cce5135e9b4170d39630a50ac (patch) | |
| tree | 20464cca95bf3f70bb5e89d69bdb1b832b3e02e5 /src/ui | |
| parent | Fix operands in LPE bool (diff) | |
| download | inkscape-8456986cea7b4a4cce5135e9b4170d39630a50ac.tar.gz inkscape-8456986cea7b4a4cce5135e9b4170d39630a50ac.zip | |
Improve casts from voids and fix a issue when fill/stroke is unset set desktop styles with it
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/spellcheck.cpp | 4 | ||||
| -rw-r--r-- | src/ui/tools/text-tool.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index 254a53daa..01826fbd8 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -470,14 +470,14 @@ SpellCheck::nextWord() void *rawptr; Glib::ustring::iterator text_iter; _layout->getSourceOfCharacter(_end_w, &rawptr, &text_iter); - SPObject *char_item = SP_OBJECT(rawptr); + SPObject *char_item = reinterpret_cast<SPObject *>(rawptr); if (SP_IS_STRING(char_item)) { int this_char = *text_iter; if (this_char == '\'' || this_char == 0x2019) { Inkscape::Text::Layout::iterator end_t = _end_w; end_t.nextCharacter(); _layout->getSourceOfCharacter(end_t, &rawptr, &text_iter); - SPObject *char_item = SP_OBJECT(rawptr); + SPObject *char_item = reinterpret_cast<SPObject *>(rawptr); if (SP_IS_STRING(char_item)) { int this_char = *text_iter; if (g_ascii_isalpha(this_char)) { // 's diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp index 7434d598f..651a00632 100644 --- a/src/ui/tools/text-tool.cpp +++ b/src/ui/tools/text-tool.cpp @@ -1612,7 +1612,7 @@ int TextTool::_styleQueried(SPStyle *style, int property) if (!rawptr || !SP_IS_OBJECT(rawptr)) { continue; } - pos_obj = SP_OBJECT(rawptr); + pos_obj = reinterpret_cast<SPObject *>(rawptr); while (SP_IS_STRING(pos_obj) && pos_obj->parent) { pos_obj = pos_obj->parent; // SPStrings don't have style } |