From ce6e4e815188b01eedf45b9e15749a1559e4d233 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 16 Oct 2016 17:12:16 +0000 Subject: [PATCH] .cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@10327 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/RichText/RichText.h | 2 +- uppsrc/RichText/TxtPaint.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/uppsrc/RichText/RichText.h b/uppsrc/RichText/RichText.h index 6a8b64a4e..2b8fe31ad 100644 --- a/uppsrc/RichText/RichText.h +++ b/uppsrc/RichText/RichText.h @@ -373,7 +373,7 @@ struct RichContext { void NewHeaderFooter(RichText *header, RichText *footer_qtf); void Page() { py.page++; py.y = page.top; } - RichContext(const RichStyles& styles, const RichText *text) : styles(&styles), text(text) { header_cy = footer_cy = 0; } + RichContext(const RichStyles& styles, const RichText *text) : text(text), styles(&styles) { header_cy = footer_cy = 0; } RichContext() {} }; diff --git a/uppsrc/RichText/TxtPaint.cpp b/uppsrc/RichText/TxtPaint.cpp index 15ba83fa3..61328d4d8 100644 --- a/uppsrc/RichText/TxtPaint.cpp +++ b/uppsrc/RichText/TxtPaint.cpp @@ -326,8 +326,6 @@ void RichTxt::GatherValPos(Vector& f, RichContext rc, int pos, int t if(part[parti].Is()) GetTable(parti).GatherValPos(f, begin, pos, type); else { - int nbefore = 0; - int nline = 0; const Para& p = part[parti].Get(); if(p.haspos) { if(type == LABELS)