From 7d5ed2f76d11a6b0ad428e69680c4d4d6f444cc5 Mon Sep 17 00:00:00 2001
From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
Date: Sat, 28 Jul 2012 19:54:43 +0000
Subject: fix build error with gcc

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17741 11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/pageitem_textframe.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scribus/pageitem_textframe.cpp')

diff --git a/scribus/pageitem_textframe.cpp b/scribus/pageitem_textframe.cpp
index e6f8fd4..e5672f7 100644
--- a/scribus/pageitem_textframe.cpp
+++ b/scribus/pageitem_textframe.cpp
@@ -1037,8 +1037,9 @@ void PageItem_TextFrame::layout()
 	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 @@ void PageItem_TextFrame::layout()
 	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;
-- 
cgit