summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-12-24 09:03:50 +0000
committertavmjong-free <tavmjong@free.fr>2014-12-24 09:03:50 +0000
commit497b9890e0cb85fced32d6958b465d40212db482 (patch)
treee88edd2db9933208e9d53ca981c940a83f4211fc /src/style.cpp
parentUse gray for 'context-fill' and 'context-stroke' in marker selector. (diff)
downloadinkscape-497b9890e0cb85fced32d6958b465d40212db482.tar.gz
inkscape-497b9890e0cb85fced32d6958b465d40212db482.zip
Remove sp_style_new_from_object()
(bzr r13822.1.1)
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/style.cpp b/src/style.cpp
index a7e50b17a..464c402fa 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -476,7 +476,7 @@ SPStyle::clear() {
// (this->*(i->second)).clear();
// }
- // Release connection to object, created in sp_style_new_from_object()
+ // Release connection to object, created in constructor.
release_connection.disconnect();
// href->detach() called in fill->clear()...
@@ -899,7 +899,7 @@ SPStyle::write( guint const flags, SPStyle const *const base ) const {
// Corresponds to sp_style_merge_from_parent()
void
SPStyle::cascade( SPStyle const *const parent ) {
- // std::cout << "SPStyle::cascade" << std::endl;
+ // std::cout << "SPStyle::cascade: " << (object->getId()?object->getId():"null") << std::endl;
for(std::vector<SPIBase*>::size_type i = 0; i != _properties.size(); ++i) {
_properties[i]->cascade( parent->_properties[i] );
}
@@ -1157,20 +1157,6 @@ sp_style_new(SPDocument *document)
return style;
}
-// Called in: sp-object.cpp
-/**
- * Creates a new SPStyle object, and attaches it to the specified SPObject.
- */
-SPStyle *
-sp_style_new_from_object(SPObject *object)
-{
- g_return_val_if_fail(object != NULL, NULL);
- g_return_val_if_fail(SP_IS_OBJECT(object), NULL);
-
- SPStyle *const style = new SPStyle( NULL, object );
- return style;
-}
-
// Called in display/drawing-item.cpp, display/nr-filter-primitive.cpp, libnrtype/Layout-TNG-Input.cpp
/**
* Increase refcount of style.