r18525 by jghali - fix operator priority problem causing assert when inserting text in frame
scribus-commit
scribus-commit at lists.scribus.net
Fri Oct 4 20:36:32 UTC 2013
Author: jghali
Date: Fri Oct 4 20:36:32 2013
New Revision: 18525
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18525
Log:
fix operator priority problem causing assert when inserting text in frame
Modified:
trunk/Scribus/scribus/text/storytext.cpp
Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18525&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Fri Oct 4 20:36:32 2013
@@ -864,7 +864,7 @@
assert(pos >= 0);
assert(pos < length());
- assert(flags & ScStyle_UserStyles == ScStyle_None);
+ assert((flags & ScStyle_UserStyles) == ScStyle_None);
return (flags & d->at(pos)->effects().value) == flags;
}
@@ -876,7 +876,7 @@
assert(pos >= 0);
assert(pos < length());
- assert(flags & ScStyle_UserStyles == ScStyle_None);
+ assert((flags & ScStyle_UserStyles) == ScStyle_None);
d->at(pos)->setEffects(flags | d->at(pos)->effects().value);
}
More information about the scribus-commit
mailing list