mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
use the par iterators a bit more, make paragraphs public in insettext
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6315 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
aaa02999f2
commit
ea59317b9a
@ -1,3 +1,7 @@
|
||||
2003-03-03 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* tabular.C (UseParbox): rewrite to use ParagraphList iterators.
|
||||
|
||||
2003-03-02 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* buffer.C (readInset): remove compability code for old Figure and
|
||||
|
@ -1,3 +1,7 @@
|
||||
2003-03-03 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* insettext.h: move paragraphs to be public.
|
||||
|
||||
2003-03-02 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* insetnote.[Ch] (InsetNote): remove unused constructor
|
||||
|
@ -223,7 +223,7 @@ public:
|
||||
void selectSelectedWord(BufferView *);
|
||||
///
|
||||
void toggleSelection(BufferView *, bool kill_selection);
|
||||
|
||||
|
||||
/// mark as erased for change tracking
|
||||
void markErased() { clear(true); };
|
||||
/**
|
||||
@ -236,7 +236,7 @@ public:
|
||||
void markNew(bool track_changes = false);
|
||||
/// find next change
|
||||
bool nextChange(BufferView *, lyx::pos_type & length);
|
||||
|
||||
|
||||
///
|
||||
bool searchForward(BufferView *, string const &,
|
||||
bool = true, bool = false);
|
||||
@ -249,7 +249,7 @@ public:
|
||||
void getDrawFont(LyXFont &) const;
|
||||
/// append text onto the existing text
|
||||
void appendParagraphs(BufferParams const & bp, Paragraph *);
|
||||
|
||||
|
||||
///
|
||||
void addPreview(grfx::PreviewLoader &) const;
|
||||
|
||||
@ -258,6 +258,8 @@ public:
|
||||
///
|
||||
mutable int need_update;
|
||||
|
||||
///
|
||||
ParagraphList paragraphs;
|
||||
protected:
|
||||
///
|
||||
void updateLocal(BufferView *, int what, bool mark_dirty) const;
|
||||
@ -360,8 +362,6 @@ private:
|
||||
|
||||
/* Private structures and variables */
|
||||
///
|
||||
ParagraphList paragraphs;
|
||||
///
|
||||
mutable bool locked;
|
||||
///
|
||||
mutable int insetAscent;
|
||||
|
@ -2770,11 +2770,13 @@ vector<string> const LyXTabular::getLabelList() const
|
||||
|
||||
LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
|
||||
{
|
||||
Paragraph * par = GetCellInset(cell)->paragraph();
|
||||
ParagraphList const & parlist = GetCellInset(cell)->paragraphs;
|
||||
ParagraphList::iterator cit = parlist.begin();
|
||||
ParagraphList::iterator end = parlist.end();
|
||||
|
||||
for (; par; par = par->next()) {
|
||||
for (int i = 0; i < par->size(); ++i) {
|
||||
if (par->getChar(i) == Paragraph::META_NEWLINE)
|
||||
for (; cit != end; ++cit) {
|
||||
for (int i = 0; i < cit->size(); ++i) {
|
||||
if (cit->getChar(i) == Paragraph::META_NEWLINE)
|
||||
return BOX_PARBOX;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user