X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.C;h=d2707ff01cee2d95c6c5436043a9941f0b5d13c0;hb=fe4e2a84c664ab13a2cfbfcbdb953d72c77eb268;hp=e167fa9a44511e9e7e89555336dadd2f157749dd;hpb=3df345c9383480f68fad51feae8b9c64425c8729;p=lyx.git diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index e167fa9a44..d2707ff01c 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -22,33 +22,24 @@ using std::pair; static LyXParagraph * buf = 0; -CutAndPaste::CutAndPaste() -{ -} - - -CutAndPaste::~CutAndPaste() -{ -} - // for now here this should be in another Cut&Paste Class! // void CutAndPaste::DeleteBuffer() { - if (!buf) - return; - - LyXParagraph * tmppar; - - while (buf) { - tmppar = buf; - buf = buf->next; - delete tmppar; - } - buf = 0; + if (!buf) return; + + LyXParagraph * tmppar; + + while (buf) { + tmppar = buf; + buf = buf->next; + delete tmppar; + } + buf = 0; } -bool CutAndPaste::cutSelection(LyXParagraph *startpar, LyXParagraph **endpar, + +bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar, int start, int & end, char tc, bool doclear) { if (!startpar || (start > startpar->Last())) @@ -116,7 +107,8 @@ bool CutAndPaste::cutSelection(LyXParagraph *startpar, LyXParagraph **endpar, return true; } -bool CutAndPaste::copySelection(LyXParagraph *startpar, LyXParagraph *endpar, + +bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar, int start, int end, char tc) { if (!startpar || (start > startpar->Last())) @@ -156,7 +148,7 @@ bool CutAndPaste::copySelection(LyXParagraph *startpar, LyXParagraph *endpar, // care about footnotes if (buf->footnoteflag) { tmppar = buf; - while (tmppar){ + while (tmppar) { tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE; tmppar = tmppar->next; } @@ -177,8 +169,9 @@ bool CutAndPaste::copySelection(LyXParagraph *startpar, LyXParagraph *endpar, return true; } -bool CutAndPaste::pasteSelection(LyXParagraph **par, LyXParagraph **endpar, - int &pos, char tc) + +bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar, + int & pos, char tc) { if (!checkPastePossible(*par, pos)) return false; @@ -201,10 +194,10 @@ bool CutAndPaste::pasteSelection(LyXParagraph **par, LyXParagraph **endpar, if (buf->IsNewline(0)){ while((tmppos < tmppar->Last()) && !tmppar->IsNewline(tmppos)) - tmppos++; + ++tmppos; buf->Erase(0); if (tmppos < tmppar->Last()) - tmppos++; + ++tmppos; else table_too_small = true; } else { @@ -332,20 +325,21 @@ bool CutAndPaste::pasteSelection(LyXParagraph **par, LyXParagraph **endpar, return true; } + int CutAndPaste::nrOfParagraphs() const { - if (!buf) - return 0; - - int n = 1; - LyXParagraph *tmppar = buf; - while(tmppar->next) { - ++n; - tmppar = tmppar->next; - } - return n; + if (!buf) return 0; + + int n = 1; + LyXParagraph *tmppar = buf; + while(tmppar->next) { + ++n; + tmppar = tmppar->next; + } + return n; } + int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1, LyXTextClassList::size_type c2, LyXParagraph * par) @@ -385,17 +379,18 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(LyXTextClassList::size_type c1, return ret; } -char CutAndPaste::getBufferTextClass() + +LyXTextClassList::size_type CutAndPaste::getBufferTextClass() const { return textclass; } -bool CutAndPaste::checkPastePossible(LyXParagraph *par, int) + +bool CutAndPaste::checkPastePossible(LyXParagraph * par, int) const { - if (!buf) - return false; + if (!buf) return false; - LyXParagraph *tmppar; + LyXParagraph * tmppar; // be carefull with footnotes in footnotes if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE) {