diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-02-20 10:37:24 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-02-20 10:37:24 +0000 |
| commit | 60119035d8b8cf1f32cce97a4a4b9b181ba91cf8 (patch) | |
| tree | 8550482cf2bd66a77d3266e2b0135aa685eb6ce5 /src/conn-avoid-ref.cpp | |
| parent | Fix the zoom changed signal to no longer be sent out before the values have f... (diff) | |
| download | inkscape-60119035d8b8cf1f32cce97a4a4b9b181ba91cf8.tar.gz inkscape-60119035d8b8cf1f32cce97a4a4b9b181ba91cf8.zip | |
Pass removing some outdated C-macro use.
(bzr r10059)
Diffstat (limited to 'src/conn-avoid-ref.cpp')
| -rw-r--r-- | src/conn-avoid-ref.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp index 410090e22..4c6139672 100644 --- a/src/conn-avoid-ref.cpp +++ b/src/conn-avoid-ref.cpp @@ -75,13 +75,12 @@ SPAvoidRef::~SPAvoidRef() void SPAvoidRef::setAvoid(char const *value) { - if (SP_OBJECT_IS_CLONED(item)) { - // Don't keep avoidance information for cloned objects. - return; - } - new_setting = false; - if (value && (strcmp(value, "true") == 0)) { - new_setting = true; + // Don't keep avoidance information for cloned objects. + if ( !item->cloned ) { + new_setting = false; + if (value && (strcmp(value, "true") == 0)) { + new_setting = true; + } } } @@ -194,7 +193,7 @@ void SPAvoidRef::setConnectionPoints(gchar const *value) void SPAvoidRef::setConnectionPointsAttrUndoable(const gchar* value, const gchar* action) { - SPDocument* doc = SP_OBJECT_DOCUMENT(item); + SPDocument* doc = item->document; item->setAttribute( "inkscape:connection-points", value, 0 ); item->updateRepr(); |