diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-07-28 19:08:20 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-07-28 19:08:20 +0000 |
| commit | f29837e4e28f859bd83c8002453e4dd8b82ef08f (patch) | |
| tree | fc7b71a004e2dc9509645c43882c14220ca9a9c9 /src | |
| parent | Fix for bug 1340683 for WMF input (diff) | |
| download | inkscape-f29837e4e28f859bd83c8002453e4dd8b82ef08f.tar.gz inkscape-f29837e4e28f859bd83c8002453e4dd8b82ef08f.zip | |
Fix placement news and calls to destructor. Fixes crash regressions #1348891, #1344217, #1333445, and stubborn Windows bug #956225 (possibly more).
Fixed bugs:
- https://launchpad.net/bugs/1348891
- https://launchpad.net/bugs/1344217
- https://launchpad.net/bugs/1333445
- https://launchpad.net/bugs/956225
(bzr r13474)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-offset.cpp | 5 | ||||
| -rw-r--r-- | src/style.cpp | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp index c6a4b730d..3aa1e4eb6 100644 --- a/src/sp-offset.cpp +++ b/src/sp-offset.cpp @@ -107,11 +107,6 @@ SPOffset::SPOffset() : SPShape() { this->sourceRepr = NULL; this->sourceObject = NULL; - new (&this->_modified_connection) sigc::connection(); - new (&this->_delete_connection) sigc::connection(); - new (&this->_changed_connection) sigc::connection(); - new (&this->_transformed_connection) sigc::connection(); - // set up the uri reference this->sourceRef = new SPUseReference(this); this->_changed_connection = this->sourceRef->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_offset_href_changed), this)); diff --git a/src/style.cpp b/src/style.cpp index c6a98e7f4..222155a0c 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -227,11 +227,6 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : document = document_in; } - new (&release_connection) sigc::connection(); - new (&filter_modified_connection) sigc::connection(); - new (&fill_ps_modified_connection) sigc::connection(); - new (&stroke_ps_modified_connection) sigc::connection(); - // 'font' shorthand requires access to included properties. font.setStylePointer( this ); @@ -431,7 +426,6 @@ SPStyle::~SPStyle() { // Remove connections release_connection.disconnect(); - release_connection.~connection(); // The following shoud be moved into SPIPaint and SPIFilter if (fill.value.href) { @@ -446,12 +440,7 @@ SPStyle::~SPStyle() { filter_modified_connection.disconnect(); } - filter_modified_connection.~connection(); - fill_ps_modified_connection.~connection(); - stroke_ps_modified_connection.~connection(); - _properties.clear(); - //_propmap.clear(); // std::cout << "SPStyle::~SPstyle(): Exit\n" << std::endl; } |
