merge with trunk

(bzr r14059.1.12)

1 files changed, 16 insertions, 18 deletions

diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index a48370d9b..95b89bf5f 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -54,7 +54,7 @@ Inkscape::Selection *StyleSubject::Selection::_getSelection() const {
         return NULL;
     }
 }
-
+/*
 StyleSubject::iterator StyleSubject::Selection::begin() {
     Inkscape::Selection *selection = _getSelection();
     if (selection) {
@@ -62,7 +62,7 @@ StyleSubject::iterator StyleSubject::Selection::begin() {
     } else {
         return iterator(NULL);
     }
-}
+}*/
 
 Geom::OptRect StyleSubject::Selection::getBounds(SPItem::BBoxType type) {
     Inkscape::Selection *selection = _getSelection();
@@ -104,8 +104,7 @@ void StyleSubject::Selection::setCSS(SPCSSAttr *css) {
 }
 
 StyleSubject::CurrentLayer::CurrentLayer() {
-    _element.data = NULL;
-    _element.next = NULL;
+    _element = NULL;
 }
 
 StyleSubject::CurrentLayer::~CurrentLayer() {
@@ -114,10 +113,10 @@ StyleSubject::CurrentLayer::~CurrentLayer() {
 void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
     _layer_release.disconnect();
     _layer_modified.disconnect();
-    if (_element.data) {
-        sp_object_unref(static_cast<SPObject *>(_element.data), NULL);
+    if (_element) {
+        sp_object_unref(_element, NULL);
     }
-    _element.data = layer;
+    _element = layer;
     if (layer) {
         sp_object_ref(layer, NULL);
         _layer_release = layer->connectRelease(sigc::hide(sigc::bind(sigc::mem_fun(*this, &CurrentLayer::_setLayer), (SPObject *)NULL)));
@@ -127,20 +126,17 @@ void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
 }
 
 SPObject *StyleSubject::CurrentLayer::_getLayer() const {
-    return static_cast<SPObject *>(_element.data);
+    return _element;
 }
 
-GSList *StyleSubject::CurrentLayer::_getLayerSList() const {
-    if (_element.data) {
-        return &_element;
-    } else {
-        return NULL;
-    }
-}
+SPObject *StyleSubject::CurrentLayer::_getLayerSList() const {
+        return _element;
 
+}
+/*
 StyleSubject::iterator StyleSubject::CurrentLayer::begin() {
     return iterator(_getLayerSList());
-}
+}*/
 
 Geom::OptRect StyleSubject::CurrentLayer::getBounds(SPItem::BBoxType type) {
     SPObject *layer = _getLayer();
@@ -152,8 +148,10 @@ Geom::OptRect StyleSubject::CurrentLayer::getBounds(SPItem::BBoxType type) {
 }
 
 int StyleSubject::CurrentLayer::queryStyle(SPStyle *query, int property) {
-    GSList *list = _getLayerSList();
-    if (list) {
+	std::vector<SPItem*> list;
+    SPObject* i=_getLayerSList();
+    if (i) {
+		list.push_back((SPItem*)i);
         return sp_desktop_query_style_from_list(list, query, property);
     } else {
         return QUERY_STYLE_NOTHING;