From 934aeb7383d7a5c4af795eecc3f4b55f8b122ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 24 Oct 2003 08:33:52 +0000 Subject: [PATCH] Alfredos list<> -> vector<> for RowList Show RightAddress again git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7975 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/RowList_fwd.h | 4 ++-- src/text.C | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/RowList_fwd.h b/src/RowList_fwd.h index 8f79e3e50f..a86fae5e53 100644 --- a/src/RowList_fwd.h +++ b/src/RowList_fwd.h @@ -12,10 +12,10 @@ #ifndef ROW_LIST_FWD_H #define ROW_LIST_FWD_H -#include +#include class Row; -typedef std::list RowList; +typedef std::vector RowList; #endif diff --git a/src/text.C b/src/text.C index 31eebcf5f2..f68d505238 100644 --- a/src/text.C +++ b/src/text.C @@ -364,11 +364,11 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const // row in this paragraph. RowList::iterator rit = pit->rows.begin(); RowList::iterator end = pit->rows.end(); - int minfill = rit->fill(); +#warning This is wrong. + int minfill = workWidth() / 2; for ( ; rit != end; ++rit) if (rit->fill() < minfill) minfill = rit->fill(); - x += font_metrics::signedWidth(layout->leftmargin, tclass.defaultfont()); x += minfill;