diff options
| author | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-07-28 19:54:43 +0000 |
|---|---|---|
| committer | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-07-28 19:54:43 +0000 |
| commit | 7d5ed2f76d11a6b0ad428e69680c4d4d6f444cc5 (patch) | |
| tree | 212726c04f22ad90839752dd0eb38d6bea39f26f | |
| parent | 54bb3b108238b6d9eefff7dea8d7b2d1f74487de (diff) | |
| download | scribus-7d5ed2f76d11a6b0ad428e69680c4d4d6f444cc5.tar.gz scribus-7d5ed2f76d11a6b0ad428e69680c4d4d6f444cc5.tar.xz scribus-7d5ed2f76d11a6b0ad428e69680c4d4d6f444cc5.zip | |
fix build error with gcc
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17741 11d20701-8431-0410-a711-e3c959e3b870
| -rw-r--r-- | scribus/pageitem_textframe.cpp | 5 |
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; |