r17741 by jghali - fix build error with gcc

scribus-commit scribus-commit at lists.scribus.net
Sat Jul 28 19:54:43 UTC 2012


Author: jghali
Date: Sat Jul 28 19:54:43 2012
New Revision: 17741

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17741
Log:
fix build error with gcc

Modified:
    branches/Version14x/Scribus/scribus/pageitem_textframe.cpp

Modified: branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17741&path=/branches/Version14x/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem_textframe.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem_textframe.cpp Sat Jul 28 19:54:43 2012
@@ -1037,8 +1037,9 @@
 	double oldCurY, 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;
@@ -2498,7 +2499,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