anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some cosmetics after r32157.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32159 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-11-22 21:45:51 +00:00
parent 3870c6ae40
commit 92c8561674
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Cursor.cpp
View File

@ -2163,9 +2163,9 @@ bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur)
// notify everything on top of the common part in old cursor, // notify everything on top of the common part in old cursor,
// but stop if the inset claims the cursor to be invalid now // but stop if the inset claims the cursor to be invalid now
for (size_type j = i; j < old.depth(); ++j) { for (size_type j = i; j < old.depth(); ++j) {
Cursor insetPos = old; Cursor inset_pos = old;
insetPos.cutOff(j); inset_pos.cutOff(j);
if (old[j].inset().notifyCursorLeaves(insetPos, cur)) if (old[j].inset().notifyCursorLeaves(inset_pos, cur))
return true; return true;
} }

4
src/mathed/InsetMathHull.cpp
View File

@ -457,11 +457,11 @@ void InsetMathHull::initUnicodeMath() const
} }
void InsetMathHull::addPreview(DocIterator const & insetPos, void InsetMathHull::addPreview(DocIterator const & inset_pos,
graphics::PreviewLoader & /*ploader*/) const graphics::PreviewLoader & /*ploader*/) const
{ {
if (RenderPreview::status() == LyXRC::PREVIEW_ON) { if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
reloadPreview(insetPos); reloadPreview(inset_pos);
} }
} }

2
src/mathed/InsetMathHull.h
View File

@ -132,7 +132,7 @@ public:
/// ///
//bool insetAllowed(InsetCode code) const; //bool insetAllowed(InsetCode code) const;
/// ///
void addPreview(DocIterator const & insetPos, void addPreview(DocIterator const & inset_pos,
graphics::PreviewLoader &) const; graphics::PreviewLoader &) const;
/// Recreate the preview if preview is enabled. /// Recreate the preview if preview is enabled.
void reloadPreview(DocIterator const & pos) const; void reloadPreview(DocIterator const & pos) const;

11
src/mathed/MathMacroTemplate.cpp
View File

@ -631,9 +631,10 @@ bool MathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur)
void MathMacroTemplate::removeArguments(Cursor & cur, void MathMacroTemplate::removeArguments(Cursor & cur,
DocIterator const & /*insetPos*/, int from, int to) DocIterator const & /*inset_pos*/, int from, int to)
{ {
for (DocIterator it = doc_iterator_begin(&buffer(), this); it; it.forwardChar()) { DocIterator it = doc_iterator_begin(&buffer(), this);
for (; it; it.forwardChar()) {
if (!it.nextInset()) if (!it.nextInset())
continue; continue;
if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE) if (it.nextInset()->lyxCode() != MATH_MACROARG_CODE)
@ -716,15 +717,15 @@ void MathMacroTemplate::insertMissingArguments(int maxArg)
void MathMacroTemplate::changeArity(Cursor & cur, void MathMacroTemplate::changeArity(Cursor & cur,
DocIterator const & insetPos, int newNumArg) DocIterator const & inset_pos, int newNumArg)
{ {
// remove parameter which do not appear anymore in the definition // remove parameter which do not appear anymore in the definition
for (int i = numargs_; i > newNumArg; --i) for (int i = numargs_; i > newNumArg; --i)
removeParameter(cur, insetPos, numargs_ - 1, false); removeParameter(cur, inset_pos, numargs_ - 1, false);
// add missing parameter // add missing parameter
for (int i = numargs_; i < newNumArg; ++i) for (int i = numargs_; i < newNumArg; ++i)
insertParameter(cur, insetPos, numargs_, false, false); insertParameter(cur, inset_pos, numargs_, false, false);
} }