anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Repeat after me: into account, into account, into account

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2015-09-25 18:14:53 +02:00
parent 15ddf38b37
commit cc241bdaaf
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/attic/changelogs/ChangeLog-1.txt
View File

@ -12035,7 +12035,7 @@
* src/Makefile.am (lyx_DEPENDENCIES): give the explicit object * src/Makefile.am (lyx_DEPENDENCIES): give the explicit object
file name in insets and mathed directories (otherwise the file name in insets and mathed directories (otherwise the
dependency is not taken in account under cygwin). dependency is not taken into account under cygwin).
* src/text2.C (InsertString[AB]): make sure that we do not try to * src/text2.C (InsertString[AB]): make sure that we do not try to
read characters past the string length. read characters past the string length.

6
development/attic/changelogs/ChangeLog-src.txt
View File

@ -822,7 +822,7 @@
* buffer_funcs.C (getItemDepth): renamed from incrementItemDepth * buffer_funcs.C (getItemDepth): renamed from incrementItemDepth
and changed to just return the value of the item depth; take a and changed to just return the value of the item depth; take a
ParIterator as argument; take the itemdepth at outer nesting level ParIterator as argument; take the itemdepth at outer nesting level
in account if necessary; cleanup and comment the code. into account if necessary; cleanup and comment the code.
(resetEnumCounterNeeded): renamed from resetEnumCounterIfNeeded (resetEnumCounterNeeded): renamed from resetEnumCounterIfNeeded
and changed to just return true if reset is needed; take a and changed to just return true if reset is needed; take a
ParIterator as argument; cleanup and comment the code. ParIterator as argument; cleanup and comment the code.
@ -13899,7 +13899,7 @@
2002-03-05 Jos<6F>Ab<41>io Oliveira Matos <jamatos@novalis.fc.up.pt> 2002-03-05 Jos<6F>Ab<41>io Oliveira Matos <jamatos@novalis.fc.up.pt>
* buffer.C (makeLinuxDocFile, makeDocBookFile): take in account the * buffer.C (makeLinuxDocFile, makeDocBookFile): take into account the
final location of file, for the included files, and graphics. final location of file, for the included files, and graphics.
2002-03-05 Juergen Vigna <jug@sad.it> 2002-03-05 Juergen Vigna <jug@sad.it>
@ -16658,7 +16658,7 @@
* text2.C (insertInset): * text2.C (insertInset):
* paragraph.C (insetAllowed): * paragraph.C (insetAllowed):
* BufferView_pimpl.C (insertInset): update to take in account the * BufferView_pimpl.C (insertInset): update to take into account the
renaming of insertInsetAllowed renaming of insertInsetAllowed
* lyxfunc.C (getStatus): add support for LFUN_INSET_TOGGLE. * lyxfunc.C (getStatus): add support for LFUN_INSET_TOGGLE.

2
development/attic/changelogs/OLD-CHANGES
View File

@ -891,7 +891,7 @@ since 0.12.0pre7
- fixlets to the documentations (JMarc) - fixlets to the documentations (JMarc)
- added close handler to table_options forms (JMarc) - added close handler to table_options forms (JMarc)
- fixed the LaTeX output routines so that the length of insets is - fixed the LaTeX output routines so that the length of insets is
taken in account (JMarc) taken into account (JMarc)
- Changed the double keystroke deadkey behavior (alkis) - Changed the double keystroke deadkey behavior (alkis)
- Updated de.po (Peter) - Updated de.po (Peter)
- Small changes to AdvancedEdit (section aapaper) (Peter) - Small changes to AdvancedEdit (section aapaper) (Peter)

2
src/BufferView.cpp
View File

@ -986,7 +986,7 @@ void BufferView::updateDocumentClass(DocumentClassConstPtr olddc)
} }
/** Return the change status at cursor position, taking in account the /** Return the change status at cursor position, taking into account the
* status at each level of the document iterator (a table in a deleted * status at each level of the document iterator (a table in a deleted
* footnote is deleted). * footnote is deleted).
* When \param outer is true, the top slice is not looked at. * When \param outer is true, the top slice is not looked at.

2
src/TextMetrics.cpp
View File

@ -1448,7 +1448,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
for ( ; cit != row.end() ; ++cit) { for ( ; cit != row.end() ; ++cit) {
/** Look whether the cursor is inside the element's /** Look whether the cursor is inside the element's
* span. Note that it is necessary to take the * span. Note that it is necessary to take the
* boundary in account, and to accept virtual * boundary into account, and to accept virtual
* elements, which have pos == endpos. * elements, which have pos == endpos.
*/ */
if (pos + boundary_corr >= cit->pos if (pos + boundary_corr >= cit->pos

2
src/Undo.h
View File

@ -88,7 +88,7 @@ public:
/** /**
* This cursor takes precedence over what is passed to recordUndo. * This cursor takes precedence over what is passed to recordUndo.
* In the case of nested groups, only the first cur_before is * In the case of nested groups, only the first cur_before is
* taken in account. The cursor is reset at the end of the * taken into account. The cursor is reset at the end of the
* top-level group. * top-level group.
*/ */
void beginUndoGroup(CursorData const & cur_before); void beginUndoGroup(CursorData const & cur_before);