r17742 by jghali - fix build error with gcc
scribus-commit
scribus-commit at lists.scribus.net
Sat Jul 28 19:55:33 UTC 2012
Author: jghali
Date: Sat Jul 28 19:55:33 2012
New Revision: 17742
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17742
Log:
fix build error with gcc
Modified:
trunk/Scribus/scribus/pageitem_textframe.cpp
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17742&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sat Jul 28 19:55:33 2012
@@ -1327,8 +1327,9 @@
double EndX, OFs, wide, kernVal;
QString chstr;
ScText *hl;
+ PageItem_TextFrame* nextFrame;
ParagraphStyle style;
- int /*ParagraphStyle::OpticalMarginType*/ opticalMargins = ParagraphStyle::OM_None;
+ int opticalMargins = ParagraphStyle::OM_None;
bool outs = false;
bool goNoRoom = false;
@@ -2809,7 +2810,7 @@
MaxChars = itemText.length();
invalid = false;
- PageItem_TextFrame* nextFrame = dynamic_cast<PageItem_TextFrame*>(NextBox);
+ nextFrame = dynamic_cast<PageItem_TextFrame*>(NextBox);
while (nextFrame != NULL)
{
nextFrame->invalid = true;
More information about the scribus-commit
mailing list