diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/sp-use-reference.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/sp-use-reference.cpp')
| -rw-r--r-- | src/sp-use-reference.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp index ec03ffce6..642cfede8 100644 --- a/src/sp-use-reference.cpp +++ b/src/sp-use-reference.cpp @@ -215,23 +215,26 @@ void SPUsePath::refresh_source() // [tr: The bad case: no d attribute. Must check that it's a SPShape and then take the outline.] SPObject *refobj = sourceObject; if ( refobj == NULL ) return; + SPItem *item = SP_ITEM(refobj); - SPCurve *curve = NULL; - if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item)) { - return; - } - if (SP_IS_SHAPE(item)) { + + if (SP_IS_SHAPE(item)) + { curve = SP_SHAPE(item)->getCurve(); - if (curve == NULL) - return; } - if (SP_IS_TEXT(item)) { + else if (SP_IS_TEXT(item)) + { curve = SP_TEXT(item)->getNormalizedBpath(); - if (curve == NULL) { - return; - } } + else + { + return; + } + + if (curve == NULL) + return; + originalPath = new Path; originalPath->LoadPathVector(curve->get_pathvector(), item->transform, true); curve->unref(); |