Commit 7e872f8f authored by Thomas Zander's avatar Thomas Zander

Different solution; this should work better with older compilers

svn path=/trunk/koffice/; revision=650510
parent 27dba224
......@@ -40,16 +40,6 @@ public:
delete stylesPrivate;
stylesPrivate = 0;
charStyle = 0; // QObject will delete it.
removeListStyle();
}
void removeListStyle() {
if(listStyle == 0)
return;
listStyle->removeUser();
if(listStyle->userCount() == 0)
delete listStyle;
listStyle = 0;
}
QString name;
......@@ -147,6 +137,7 @@ KoParagraphStyle::KoParagraphStyle(const KoParagraphStyle &orig)
}
KoParagraphStyle::~KoParagraphStyle() {
removeListStyle();
delete d;
}
......@@ -253,7 +244,12 @@ void KoParagraphStyle::setListStyle(const KoListStyle &style) {
}
void KoParagraphStyle::removeListStyle() {
d->removeListStyle();
if(d->listStyle == 0)
return;
d->listStyle->removeUser();
if(d->listStyle->userCount() == 0)
delete d->listStyle;
d->listStyle = 0;
}
static KoParagraphStyle::BorderStyle oasisBorderStyle(const QString& borderstyle) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment