summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-07-28 19:08:20 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-07-28 19:08:20 +0000
commitf29837e4e28f859bd83c8002453e4dd8b82ef08f (patch)
treefc7b71a004e2dc9509645c43882c14220ca9a9c9 /src/style.cpp
parentFix for bug 1340683 for WMF input (diff)
downloadinkscape-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/style.cpp')
-rw-r--r--src/style.cpp11
1 files changed, 0 insertions, 11 deletions
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;
}