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

Indentation change + small #ifndef NEW_INSETS fix.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1877 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-04-03 08:34:52 +00:00
parent 0a26faefd1
commit c90c5e6386
3 changed files with 310 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -76,6 +76,7 @@ src/frontends/kde/urldlg.C
src/frontends/qt2/FileDialog.C src/frontends/qt2/FileDialog.C
src/frontends/qt2/FormCharacter.C src/frontends/qt2/FormCharacter.C
src/frontends/qt2/FormCitation.C src/frontends/qt2/FormCitation.C
src/frontends/qt2/FormCredits.C
src/frontends/qt2/FormDocument.C src/frontends/qt2/FormDocument.C
src/frontends/qt2/FormIndex.C src/frontends/qt2/FormIndex.C
src/frontends/qt2/FormParagraph.C src/frontends/qt2/FormParagraph.C
@ -155,6 +156,7 @@ src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/xforms_helpers.C src/frontends/xforms/xforms_helpers.C
src/gettext.h src/gettext.h
src/graphics/GraphicsCacheItem.C
src/importer.C src/importer.C
src/insets/figinset.C src/insets/figinset.C
src/insets/insetbib.C src/insets/insetbib.C

12
src/CutAndPaste.C
View File

@ -167,11 +167,12 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
startpar->next()->StripLeadingSpaces(textclass); startpar->next()->StripLeadingSpaces(textclass);
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->next()) || if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->next()) ||
!startpar->next()->Last()) { !startpar->next()->Last())
#else #else
if (startpar->HasSameLayout(startpar->next()) || if (startpar->HasSameLayout(startpar->next()) ||
!startpar->next()->size()) { !startpar->next()->size())
#endif #endif
{
#ifndef NEW_INSETS #ifndef NEW_INSETS
startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params); startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
#else #else
@ -476,7 +477,8 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
int CutAndPaste::nrOfParagraphs() int CutAndPaste::nrOfParagraphs()
{ {
if (!buf) return 0; if (!buf)
return 0;
int n = 1; int n = 1;
LyXParagraph * tmppar = buf; LyXParagraph * tmppar = buf;
@ -539,7 +541,11 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
} }
#ifndef NEW_INSETS
bool CutAndPaste::checkPastePossible(LyXParagraph * par) bool CutAndPaste::checkPastePossible(LyXParagraph * par)
#else
bool CutAndPaste::checkPastePossible(LyXParagraph *)
#endif
{ {
if (!buf) return false; if (!buf) return false;

3
src/CutAndPaste.h
View File

@ -25,8 +25,7 @@ public:
/// ///
static static
bool cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar, bool cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
int start, int & end, int start, int & end, char tc, bool doclear = false);
char tc, bool doclear = false);
/// ///
static static
bool copySelection(LyXParagraph * startpar, LyXParagraph * endpar, bool copySelection(LyXParagraph * startpar, LyXParagraph * endpar,