diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-05-14 22:37:39 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-05-14 22:37:39 +0000 |
| commit | 8609611d800af9cea373ed41f88c27b030570ff5 (patch) | |
| tree | faeb2dcaf8dbb21bf0c857256c202adab5cf7fbb /src/layer-manager.cpp | |
| parent | Update to current SVN. (diff) | |
| download | inkscape-8609611d800af9cea373ed41f88c27b030570ff5.tar.gz inkscape-8609611d800af9cea373ed41f88c27b030570ff5.zip | |
Minor update for compile problem
(bzr r839)
Diffstat (limited to 'src/layer-manager.cpp')
| -rw-r--r-- | src/layer-manager.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index 15bd57fd9..2e09ff472 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -16,6 +16,7 @@ #include "layer-manager.h" #include "ui/view/view.h" #include "sp-object.h" +#include "xml/node.h" namespace Inkscape { @@ -54,20 +55,21 @@ void LayerManager::_rebuild() { SPObject *root=_desktop->currentRoot(); if ( root ) { _addOne(root); - } - for ( GSList const *iter=layers ; iter ; iter = iter->next ) { - SPObject *layer=static_cast<SPObject *>(iter->data); - for ( SPObject* curr = layer; curr && (curr != root) ; curr = SP_OBJECT_PARENT(curr) ) { - if ( (curr != root) && root->isAncestorOf(curr) && !includes(curr) ) { - // Filter out objects in the middle of being deleted - SPObject const *higher = curr; - while ( higher && (SP_OBJECT_PARENT(higher) != root) ) { - higher = SP_OBJECT_PARENT(higher); - } - Inkscape::XML::Node* node = higher ? SP_OBJECT_REPR(higher) : 0; - if ( node && node->parent() ) { - _addOne(curr); + for ( GSList const *iter=layers ; iter ; iter = iter->next ) { + SPObject *layer=static_cast<SPObject *>(iter->data); + + for ( SPObject* curr = layer; curr && (curr != root) ; curr = SP_OBJECT_PARENT(curr) ) { + if ( (curr != root) && root->isAncestorOf(curr) && !includes(curr) ) { + // Filter out objects in the middle of being deleted + SPObject const *higher = curr; + while ( higher && (SP_OBJECT_PARENT(higher) != root) ) { + higher = SP_OBJECT_PARENT(higher); + } + Inkscape::XML::Node* node = higher ? SP_OBJECT_REPR(higher) : 0; + if ( node && node->parent() ) { + _addOne(curr); + } } } } |