anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-04 16:42:57 +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

600
src/CutAndPaste.C
View File

@ -56,18 +56,18 @@ LyXTextClassList::size_type textclass = 0;
void DeleteBuffer() void DeleteBuffer()
{ {
if (!buf) if (!buf)
return; return;
LyXParagraph * tmppar; LyXParagraph * tmppar;
while (buf) { while (buf) {
tmppar = buf; tmppar = buf;
#ifndef NEW_INSETS #ifndef NEW_INSETS
buf = buf->next_; buf = buf->next_;
#else #else
buf = buf->next(); buf = buf->next();
#endif #endif
delete tmppar; delete tmppar;
} }
buf = 0; buf = 0;
} }
@ -79,10 +79,10 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
{ {
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (!startpar || (start > startpar->Last())) if (!startpar || (start > startpar->Last()))
return false; return false;
#else #else
if (!startpar || (start > startpar->size())) if (!startpar || (start > startpar->size()))
return false; return false;
#endif #endif
DeleteBuffer(); DeleteBuffer();
@ -91,96 +91,97 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
if (!(*endpar) || if (!(*endpar) ||
#ifndef NEW_INSETS #ifndef NEW_INSETS
(startpar->ParFromPos(start) == (startpar->ParFromPos(start) ==
(*endpar)->ParFromPos(end)) (*endpar)->ParFromPos(end))
#else #else
(startpar == (*endpar)) (startpar == (*endpar))
#endif #endif
) { ) {
// only within one paragraph // only within one paragraph
buf = new LyXParagraph; buf = new LyXParagraph;
LyXParagraph::size_type i = start; LyXParagraph::size_type i = start;
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (end > startpar->Last()) if (end > startpar->Last())
end = startpar->Last(); end = startpar->Last();
#else #else
if (end > startpar->size()) if (end > startpar->size())
end = startpar->size(); end = startpar->size();
#endif #endif
for (; i < end; ++i) { for (; i < end; ++i) {
startpar->CopyIntoMinibuffer(*current_view->buffer(), start); startpar->CopyIntoMinibuffer(*current_view->buffer(), start);
startpar->Erase(start); startpar->Erase(start);
#ifndef NEW_INSETS #ifndef NEW_INSETS
buf->InsertFromMinibuffer(buf->Last()); buf->InsertFromMinibuffer(buf->Last());
#else #else
buf->InsertFromMinibuffer(buf->size()); buf->InsertFromMinibuffer(buf->size());
#endif #endif
} }
end = start-1; end = start-1;
} else { } else {
// more than one paragraph // more than one paragraph
(*endpar)->BreakParagraphConservative(current_view->buffer()->params, (*endpar)->BreakParagraphConservative(current_view->buffer()->params,
end); end);
*endpar = (*endpar)->next(); *endpar = (*endpar)->next();
end = 0; end = 0;
startpar->BreakParagraphConservative(current_view->buffer()->params, startpar->BreakParagraphConservative(current_view->buffer()->params,
start); start);
// store the selection // store the selection
#ifndef NEW_INSETS #ifndef NEW_INSETS
buf = startpar->ParFromPos(start)->next_; buf = startpar->ParFromPos(start)->next_;
#else #else
buf = startpar->next(); buf = startpar->next();
#endif #endif
buf->previous(0); buf->previous(0);
(*endpar)->previous()->next(0); (*endpar)->previous()->next(0);
// cut the selection // cut the selection
#ifndef NEW_INSETS #ifndef NEW_INSETS
startpar->ParFromPos(start)->next(*endpar); startpar->ParFromPos(start)->next(*endpar);
(*endpar)->previous(startpar->ParFromPos(start)); (*endpar)->previous(startpar->ParFromPos(start));
#else #else
startpar->next(*endpar); startpar->next(*endpar);
(*endpar)->previous(startpar); (*endpar)->previous(startpar);
#endif #endif
#ifndef NEW_INSETS #ifndef NEW_INSETS
// care about footnotes // care about footnotes
if (buf->footnoteflag) { if (buf->footnoteflag) {
LyXParagraph * tmppar = buf; LyXParagraph * tmppar = buf;
while (tmppar){ while (tmppar){
tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE; tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
tmppar = tmppar->next_; tmppar = tmppar->next_;
} }
} }
#endif #endif
// the cut selection should begin with standard layout // the cut selection should begin with standard layout
buf->Clear(); buf->Clear();
// paste the paragraphs again, if possible // paste the paragraphs again, if possible
if (doclear) if (doclear)
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
startpar->PasteParagraph(current_view->buffer()->params); startpar->PasteParagraph(current_view->buffer()->params);
#endif #endif
(*endpar) = startpar; // this because endpar gets deleted here! (*endpar) = startpar; // this because endpar gets deleted here!
}
} }
} return true;
return true;
} }
@ -189,10 +190,10 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
{ {
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (!startpar || (start > startpar->Last())) if (!startpar || (start > startpar->Last()))
return false; return false;
#else #else
if (!startpar || (start > startpar->size())) if (!startpar || (start > startpar->size()))
return false; return false;
#endif #endif
DeleteBuffer(); DeleteBuffer();
@ -201,90 +202,90 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
if (!(endpar) || if (!(endpar) ||
#ifndef NEW_INSETS #ifndef NEW_INSETS
(startpar->ParFromPos(start) == (startpar->ParFromPos(start) ==
(endpar)->ParFromPos(end)) (endpar)->ParFromPos(end))
#else #else
(startpar == endpar) (startpar == endpar)
#endif #endif
) { ) {
// only within one paragraph // only within one paragraph
buf = new LyXParagraph; buf = new LyXParagraph;
LyXParagraph::size_type i = start; LyXParagraph::size_type i = start;
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (end > startpar->Last()) if (end > startpar->Last())
end = startpar->Last(); end = startpar->Last();
#else #else
if (end > startpar->size()) if (end > startpar->size())
end = startpar->size(); end = startpar->size();
#endif #endif
for (; i < end; ++i) { for (; i < end; ++i) {
startpar->CopyIntoMinibuffer(*current_view->buffer(), i); startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
#ifndef NEW_INSETS #ifndef NEW_INSETS
buf->InsertFromMinibuffer(buf->Last()); buf->InsertFromMinibuffer(buf->Last());
#else #else
buf->InsertFromMinibuffer(buf->size()); buf->InsertFromMinibuffer(buf->size());
#endif #endif
} }
} else { } else {
// copy more than one paragraph // copy more than one paragraph
// clone the paragraphs within the selection // clone the paragraphs within the selection
#ifndef NEW_INSETS #ifndef NEW_INSETS
LyXParagraph * tmppar = startpar->ParFromPos(start); LyXParagraph * tmppar = startpar->ParFromPos(start);
#else #else
LyXParagraph * tmppar = startpar; LyXParagraph * tmppar = startpar;
#endif #endif
buf = tmppar->Clone(); buf = tmppar->Clone();
LyXParagraph * tmppar2 = buf; LyXParagraph * tmppar2 = buf;
#ifndef NEW_INSETS #ifndef NEW_INSETS
while (tmppar != endpar->ParFromPos(end) while (tmppar != endpar->ParFromPos(end)
&& tmppar->next_) { && tmppar->next_) {
tmppar = tmppar->next_; tmppar = tmppar->next_;
tmppar2->next(tmppar->Clone()); tmppar2->next(tmppar->Clone());
tmppar2->next_->previous(tmppar2); tmppar2->next_->previous(tmppar2);
tmppar2 = tmppar2->next_; tmppar2 = tmppar2->next_;
} }
tmppar2->next(0); tmppar2->next(0);
#else #else
while (tmppar != endpar while (tmppar != endpar
&& tmppar->next()) { && tmppar->next()) {
tmppar = tmppar->next(); tmppar = tmppar->next();
tmppar2->next(tmppar->Clone()); tmppar2->next(tmppar->Clone());
tmppar2->next()->previous(tmppar2); tmppar2->next()->previous(tmppar2);
tmppar2 = tmppar2->next(); tmppar2 = tmppar2->next();
} }
tmppar2->next(0); tmppar2->next(0);
#endif #endif
#ifndef NEW_INSETS #ifndef NEW_INSETS
// care about footnotes // care about footnotes
if (buf->footnoteflag) { if (buf->footnoteflag) {
tmppar = buf; tmppar = buf;
while (tmppar) { while (tmppar) {
tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE; tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE;
tmppar = tmppar->next_; tmppar = tmppar->next_;
} }
} }
#endif #endif
// the buf paragraph is too big // the buf paragraph is too big
#ifndef NEW_INSETS #ifndef NEW_INSETS
LyXParagraph::size_type tmpi2 = startpar->PositionInParFromPos(start); LyXParagraph::size_type tmpi2 = startpar->PositionInParFromPos(start);
#else #else
LyXParagraph::size_type tmpi2 = start; LyXParagraph::size_type tmpi2 = start;
#endif #endif
for (; tmpi2; --tmpi2) for (; tmpi2; --tmpi2)
buf->Erase(0); buf->Erase(0);
// now tmppar 2 is too big, delete all after end // now tmppar 2 is too big, delete all after end
#ifndef NEW_INSETS #ifndef NEW_INSETS
tmpi2 = endpar->PositionInParFromPos(end); tmpi2 = endpar->PositionInParFromPos(end);
#else #else
tmpi2 = end; tmpi2 = end;
#endif #endif
while (tmppar2->size() > tmpi2) { while (tmppar2->size() > tmpi2) {
tmppar2->Erase(tmppar2->size() - 1); tmppar2->Erase(tmppar2->size() - 1);
} }
} }
return true; return true;
} }
@ -294,14 +295,14 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
int & pos, char tc) int & pos, char tc)
{ {
if (!checkPastePossible(*par)) if (!checkPastePossible(*par))
return false; return false;
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (pos > (*par)->Last()) if (pos > (*par)->Last())
pos = (*par)->Last(); pos = (*par)->Last();
#else #else
if (pos > (*par)->size()) if (pos > (*par)->size())
pos = (*par)->size(); pos = (*par)->size();
#endif #endif
LyXParagraph * tmpbuf; LyXParagraph * tmpbuf;
@ -312,161 +313,161 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
#ifndef NEW_INSETS #ifndef NEW_INSETS
if (!buf->next_) { if (!buf->next_) {
#else #else
if (!buf->next()) { if (!buf->next()) {
#endif #endif
// only within a paragraph // only within a paragraph
tmpbuf = buf->Clone(); tmpbuf = buf->Clone();
// Some provisions should be done here for checking // Some provisions should be done here for checking
// if we are inserting at the beginning of a // if we are inserting at the beginning of a
// paragraph. If there are a space at the beginning // paragraph. If there are a space at the beginning
// of the text to insert and we are inserting at // of the text to insert and we are inserting at
// the beginning of the paragraph the space should // the beginning of the paragraph the space should
// be removed. // be removed.
while (buf->size()) { while (buf->size()) {
// This is an attempt to fix the // This is an attempt to fix the
// "never insert a space at the // "never insert a space at the
// beginning of a paragraph" problem. // beginning of a paragraph" problem.
if (!tmppos && buf->IsLineSeparator(0)) { if (!tmppos && buf->IsLineSeparator(0)) {
buf->Erase(0); buf->Erase(0);
} else {
buf->CutIntoMinibuffer(current_view->buffer()->params, 0);
buf->Erase(0);
if (tmppar->InsertFromMinibuffer(tmppos))
++tmppos;
}
}
delete buf;
buf = tmpbuf;
*endpar = tmppar->next();
pos = tmppos;
} else { } else {
buf->CutIntoMinibuffer(current_view->buffer()->params, 0); // many paragraphs
buf->Erase(0);
if (tmppar->InsertFromMinibuffer(tmppos))
++tmppos;
}
}
delete buf;
buf = tmpbuf;
*endpar = tmppar->next();
pos = tmppos;
} else {
// many paragraphs
// make a copy of the simple cut_buffer // make a copy of the simple cut_buffer
tmpbuf = buf; tmpbuf = buf;
LyXParagraph * simple_cut_clone = tmpbuf->Clone(); LyXParagraph * simple_cut_clone = tmpbuf->Clone();
LyXParagraph * tmpbuf2 = simple_cut_clone; LyXParagraph * tmpbuf2 = simple_cut_clone;
#ifndef NEW_INSETS #ifndef NEW_INSETS
if ((*par)->footnoteflag) { if ((*par)->footnoteflag) {
tmpbuf->footnoteflag = (*par)->footnoteflag; tmpbuf->footnoteflag = (*par)->footnoteflag;
tmpbuf->footnotekind = (*par)->footnotekind; tmpbuf->footnotekind = (*par)->footnotekind;
} }
while (tmpbuf->next_) { while (tmpbuf->next_) {
tmpbuf = tmpbuf->next_; tmpbuf = tmpbuf->next_;
tmpbuf2->next(tmpbuf->Clone()); tmpbuf2->next(tmpbuf->Clone());
tmpbuf2->next_->previous(tmpbuf2); tmpbuf2->next_->previous(tmpbuf2);
tmpbuf2 = tmpbuf2->next_; tmpbuf2 = tmpbuf2->next_;
if ((*par)->footnoteflag){ if ((*par)->footnoteflag){
tmpbuf->footnoteflag = (*par)->footnoteflag; tmpbuf->footnoteflag = (*par)->footnoteflag;
tmpbuf->footnotekind = (*par)->footnotekind; tmpbuf->footnotekind = (*par)->footnotekind;
} }
} }
#else #else
while (tmpbuf->next()) { while (tmpbuf->next()) {
tmpbuf = tmpbuf->next(); tmpbuf = tmpbuf->next();
tmpbuf2->next(tmpbuf->Clone()); tmpbuf2->next(tmpbuf->Clone());
tmpbuf2->next()->previous(tmpbuf2); tmpbuf2->next()->previous(tmpbuf2);
tmpbuf2 = tmpbuf2->next(); tmpbuf2 = tmpbuf2->next();
} }
#endif #endif
// make sure there is no class difference // make sure there is no class difference
SwitchLayoutsBetweenClasses(textclass, tc, buf); SwitchLayoutsBetweenClasses(textclass, tc, buf);
// make the buf exactly the same layout than // make the buf exactly the same layout than
// the cursor paragraph // the cursor paragraph
buf->MakeSameLayout(*par); buf->MakeSameLayout(*par);
// find the end of the buffer // find the end of the buffer
LyXParagraph * lastbuffer = buf; LyXParagraph * lastbuffer = buf;
while (lastbuffer->next()) while (lastbuffer->next())
lastbuffer = lastbuffer->next(); lastbuffer = lastbuffer->next();
bool paste_the_end = false; bool paste_the_end = false;
#ifndef NEW_INSETS #ifndef NEW_INSETS
// open the paragraph for inserting the buf // open the paragraph for inserting the buf
// if necessary // if necessary
if (((*par)->Last() > pos) || !(*par)->next()) { if (((*par)->Last() > pos) || !(*par)->next()) {
(*par)->BreakParagraphConservative(current_view->buffer()->params, (*par)->BreakParagraphConservative(current_view->buffer()->params,
pos); pos);
paste_the_end = true; paste_the_end = true;
} }
// set the end for redoing later // set the end for redoing later
*endpar = (*par)->ParFromPos(pos)->next_->next(); *endpar = (*par)->ParFromPos(pos)->next_->next();
// paste it! // paste it!
lastbuffer->ParFromPos(lastbuffer->Last())->next( lastbuffer->ParFromPos(lastbuffer->Last())->next(
(*par)->ParFromPos(pos)->next_); (*par)->ParFromPos(pos)->next_);
(*par)->ParFromPos(pos)->next()->previous( (*par)->ParFromPos(pos)->next()->previous(
lastbuffer->ParFromPos(lastbuffer->Last())); lastbuffer->ParFromPos(lastbuffer->Last()));
(*par)->ParFromPos(pos)->next(buf); (*par)->ParFromPos(pos)->next(buf);
buf->previous((*par)->ParFromPos(pos)); buf->previous((*par)->ParFromPos(pos));
if ((*par)->ParFromPos(pos)->next() == lastbuffer) if ((*par)->ParFromPos(pos)->next() == lastbuffer)
lastbuffer = *par; lastbuffer = *par;
(*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params); (*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
// store the new cursor position // store the new cursor position
*par = lastbuffer; *par = lastbuffer;
pos = lastbuffer->Last(); pos = lastbuffer->Last();
// maybe some pasting // maybe some pasting
if (lastbuffer->next() && paste_the_end) { if (lastbuffer->next() && paste_the_end) {
if (lastbuffer->next()->HasSameLayout(lastbuffer)) { if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params); lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
} else if (!lastbuffer->next()->Last()) { } else if (!lastbuffer->next()->Last()) {
lastbuffer->next()->MakeSameLayout(lastbuffer); lastbuffer->next()->MakeSameLayout(lastbuffer);
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params); lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
} else if (!lastbuffer->Last()) { } else if (!lastbuffer->Last()) {
lastbuffer->MakeSameLayout(lastbuffer->next_); lastbuffer->MakeSameLayout(lastbuffer->next_);
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params); lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
} else } else
lastbuffer->next()->StripLeadingSpaces(tc); lastbuffer->next()->StripLeadingSpaces(tc);
} }
// restore the simple cut buffer // restore the simple cut buffer
buf = simple_cut_clone; buf = simple_cut_clone;
} }
#else #else
// open the paragraph for inserting the buf // open the paragraph for inserting the buf
// if necessary // if necessary
if (((*par)->size() > pos) || !(*par)->next()) { if (((*par)->size() > pos) || !(*par)->next()) {
(*par)->BreakParagraphConservative(current_view->buffer()->params, (*par)->BreakParagraphConservative(current_view->buffer()->params,
pos); pos);
paste_the_end = true; paste_the_end = true;
} }
// set the end for redoing later // set the end for redoing later
*endpar = (*par)->next()->next(); *endpar = (*par)->next()->next();
// paste it! // paste it!
lastbuffer->next((*par)->next()); lastbuffer->next((*par)->next());
(*par)->next()->previous(lastbuffer); (*par)->next()->previous(lastbuffer);
(*par)->next(buf); (*par)->next(buf);
buf->previous(*par); buf->previous(*par);
if ((*par)->next() == lastbuffer) if ((*par)->next() == lastbuffer)
lastbuffer = *par; lastbuffer = *par;
(*par)->PasteParagraph(current_view->buffer()->params); (*par)->PasteParagraph(current_view->buffer()->params);
// store the new cursor position // store the new cursor position
*par = lastbuffer; *par = lastbuffer;
pos = lastbuffer->size(); pos = lastbuffer->size();
// maybe some pasting // maybe some pasting
if (lastbuffer->next() && paste_the_end) { if (lastbuffer->next() && paste_the_end) {
if (lastbuffer->next()->HasSameLayout(lastbuffer)) { if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
lastbuffer->PasteParagraph(current_view->buffer()->params); lastbuffer->PasteParagraph(current_view->buffer()->params);
} else if (!lastbuffer->next()->size()) { } else if (!lastbuffer->next()->size()) {
lastbuffer->next()->MakeSameLayout(lastbuffer); lastbuffer->next()->MakeSameLayout(lastbuffer);
lastbuffer->PasteParagraph(current_view->buffer()->params); lastbuffer->PasteParagraph(current_view->buffer()->params);
} else if (!lastbuffer->size()) { } else if (!lastbuffer->size()) {
lastbuffer->MakeSameLayout(lastbuffer->next()); lastbuffer->MakeSameLayout(lastbuffer->next());
lastbuffer->PasteParagraph(current_view->buffer()->params); lastbuffer->PasteParagraph(current_view->buffer()->params);
} else } else
lastbuffer->next()->StripLeadingSpaces(tc); lastbuffer->next()->StripLeadingSpaces(tc);
} }
// restore the simple cut buffer // restore the simple cut buffer
buf = simple_cut_clone; buf = simple_cut_clone;
} }
#endif #endif
@ -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;
@ -501,62 +503,66 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1,
{ {
int ret = 0; int ret = 0;
if (!par || c1 == c2) if (!par || c1 == c2)
return ret; return ret;
#ifndef NEW_INSETS #ifndef NEW_INSETS
par = par->FirstPhysicalPar(); par = par->FirstPhysicalPar();
#endif #endif
while (par) { while (par) {
string name = textclasslist.NameOfLayout(c1, par->layout); string name = textclasslist.NameOfLayout(c1, par->layout);
int lay = 0; int lay = 0;
pair<bool, LyXTextClass::LayoutList::size_type> pp = pair<bool, LyXTextClass::LayoutList::size_type> pp =
textclasslist.NumberOfLayout(c2, name); textclasslist.NumberOfLayout(c2, name);
if (pp.first) { if (pp.first) {
lay = pp.second; lay = pp.second;
} else { // layout not found } else { // layout not found
// use default layout "Standard" (0) // use default layout "Standard" (0)
lay = 0; lay = 0;
} }
par->layout = lay; par->layout = lay;
if (name != textclasslist.NameOfLayout(c2, par->layout)) { if (name != textclasslist.NameOfLayout(c2, par->layout)) {
++ret; ++ret;
string s = _("Layout had to be changed from\n") string s = _("Layout had to be changed from\n")
+ name + _(" to ") + name + _(" to ")
+ textclasslist.NameOfLayout(c2, par->layout) + textclasslist.NameOfLayout(c2, par->layout)
+ _("\nbecause of class conversion from\n") + _("\nbecause of class conversion from\n")
+ textclasslist.NameOfClass(c1) + _(" to ") + textclasslist.NameOfClass(c1) + _(" to ")
+ textclasslist.NameOfClass(c2); + textclasslist.NameOfClass(c2);
InsetError * new_inset = new InsetError(s); InsetError * new_inset = new InsetError(s);
par->InsertInset(0, new_inset); par->InsertInset(0, new_inset);
} }
#ifndef NEW_INSETS #ifndef NEW_INSETS
par = par->next_; par = par->next_;
#else #else
par = par->next(); par = par->next();
#endif #endif
} }
return ret; return ret;
} }
#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;
#ifndef NEW_INSETS #ifndef NEW_INSETS
// be carefull with footnotes in footnotes // be carefull with footnotes in footnotes
if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) { if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
// check whether the cut_buffer includes a footnote // check whether the cut_buffer includes a footnote
LyXParagraph * tmppar = buf; LyXParagraph * tmppar = buf;
while (tmppar && tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE) while (tmppar && tmppar->footnoteflag == LyXParagraph::NO_FOOTNOTE)
tmppar = tmppar->next_; tmppar = tmppar->next_;
if (tmppar) { if (tmppar) {
WriteAlert(_("Impossible operation"), WriteAlert(_("Impossible operation"),
_("Can't paste float into float!"), _("Can't paste float into float!"),
_("Sorry.")); _("Sorry."));
return false; return false;
} }
} }
#endif #endif
return true; return true;

11
src/CutAndPaste.h
View File

@ -25,16 +25,15 @@ 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,
int start, int end, char tc); int start, int end, char tc);
/// ///
static static
bool pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar, bool pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
int & pos, char tc); int & pos, char tc);
/// ///
static static
int nrOfParagraphs(); int nrOfParagraphs();
@ -44,8 +43,8 @@ public:
*/ */
static static
int SwitchLayoutsBetweenClasses(LyXTextClassList::size_type class1, int SwitchLayoutsBetweenClasses(LyXTextClassList::size_type class1,
LyXTextClassList::size_type class2, LyXTextClassList::size_type class2,
LyXParagraph * par); LyXParagraph * par);
/// ///
static static
bool checkPastePossible(LyXParagraph *); bool checkPastePossible(LyXParagraph *);