summaryrefslogtreecommitdiffstats
path: root/scribus/pageitem_textframe.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scribus/pageitem_textframe.cpp')
-rw-r--r--scribus/pageitem_textframe.cpp5
1 files changed, 3 insertions, 2 deletions
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;