From c7731033ef400fccb6a49d830ded86068fcd3432 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 5 Feb 2014 12:29:11 +0100 Subject: Fix for Bug #1250685 (Unnecessary gender-specific terms in code). Fixed bugs: - https://launchpad.net/bugs/1250685 (bzr r12997) --- src/splivarot.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/splivarot.cpp') diff --git a/src/splivarot.cpp b/src/splivarot.cpp index e5006884c..5c7b389ff 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -371,18 +371,18 @@ sp_selected_path_boolop(Inkscape::Selection *selection, SPDesktop *desktop, bool // objects are not in parent/child relationship; // find their lowest common ancestor - Inkscape::XML::Node *dad = LCA(a, b); - if (dad == NULL) { + Inkscape::XML::Node *parent = LCA(a, b); + if (parent == NULL) { boolop_display_error_message(desktop, _("Unable to determine the z-order of the objects selected for difference, XOR, division, or path cut.")); return; } // find the children of the LCA that lead from it to the a and b - Inkscape::XML::Node *as = AncetreFils(a, dad); - Inkscape::XML::Node *bs = AncetreFils(b, dad); + Inkscape::XML::Node *as = AncetreFils(a, parent); + Inkscape::XML::Node *bs = AncetreFils(b, parent); // find out which comes first - for (Inkscape::XML::Node *child = dad->firstChild(); child; child = child->next()) { + for (Inkscape::XML::Node *child = parent->firstChild(); child; child = child->next()) { if (child == as) { /* a first, so reverse. */ reverseOrderForOp = true; -- cgit v1.2.3 From 1d31728fb7399f48d272560a290dc990b75a197e Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 11 Mar 2014 15:52:08 +0100 Subject: Change stroke-dasharray and stroke-dashoffset handling to match other properties. Split style.h into more manageable size files. (bzr r13135) --- src/splivarot.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/splivarot.cpp') diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 5c7b389ff..6aec42c5b 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -1004,7 +1004,7 @@ Geom::PathVector* item_outline(SPItem const *item, bool bbox_only) Path *res = new Path; res->SetBackData(false); - if (i_style->stroke_dash.n_dash) { + if (!i_style->stroke_dasharray.values.empty()) { // For dashed strokes, use Stroke method, because Outline can't do dashes // However Stroke adds lots of extra nodes _or_ makes the path crooked, so consider this a temporary workaround @@ -1273,7 +1273,7 @@ sp_selected_path_outline(SPDesktop *desktop) Path *res = new Path; res->SetBackData(false); - if (i_style->stroke_dash.n_dash) { + if (!i_style->stroke_dasharray.values.empty()) { // For dashed strokes, use Stroke method, because Outline can't do dashes // However Stroke adds lots of extra nodes _or_ makes the path crooked, so consider this a temporary workaround -- cgit v1.2.3