EmbeddedObjects.lyx: add hint how to force a rotation direction for rotated floats

[lyx.git] / src / CutAndPaste.cpp

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 4e97ab987843313e5af8d34f9bf59531649e6c7a..c8438b02372126aca61a781bc08bca919980584a 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -28,7 +28,7 @@
 #include "lfuns.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
-#include "LyXText.h"
+#include "Text.h"
 #include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
@@ -128,7 +128,8 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        // Convert newline to paragraph break in ERT inset.
        // This should not be here!
        if (pars[pit].inInset() &&
-           pars[pit].inInset()->lyxCode() == Inset::ERT_CODE) {
+           (pars[pit].inInset()->lyxCode() == Inset::ERT_CODE ||
+               pars[pit].inInset()->lyxCode() == Inset::LISTINGS_CODE)) {
                for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
                        for (pos_type j = 0; j < insertion[i].size(); ++j) {
                                if (insertion[i].isNewline(j)) {
@@ -145,10 +146,10 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
        // If we are in an inset which returns forceDefaultParagraphs,
        // set the paragraphs to default
        if (cur.inset().forceDefaultParagraphs(cur.idx())) {
-               Layout_ptr const layout = 
+               Layout_ptr const layout =
                        buffer.params().getTextClass().defaultLayout();
                ParagraphList::iterator const end = insertion.end();
-               for (ParagraphList::iterator par = insertion.begin(); 
+               for (ParagraphList::iterator par = insertion.begin();
                                par != end; ++par)
                        par->layout(layout);
        }
@@ -197,7 +198,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
                }
 
                tmpbuf->setChange(Change(buffer.params().trackChanges ?
-                                        Change::INSERTED : Change::UNCHANGED));
+                                        Change::INSERTED : Change::UNCHANGED));
        }
 
        bool const empty = pars[pit].empty();
@@ -300,7 +301,12 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 
        for (pit_type pit = startpit; pit != endpit + 1;) {
                pos_type const left  = (pit == startpit ? startpos : 0);
-               pos_type const right = (pit == endpit ? endpos : pars[pit].size() + 1);
+               pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1);
+               // FIXME: this is a quick fix for bug 3600. It stops a crash but the problem
+               // still remains unsolved (e.g. the second example in the bug report).
+               // c.f. http://bugzilla.lyx.org/show_bug.cgi?id=3600
+               if (right > pars[pit].size() + 1)
+                       right = pars[pit].size() + 1;
 
                bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges);
 
@@ -329,7 +335,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params,
 
 
 void putClipboard(ParagraphList const & paragraphs, textclass_type textclass,
-                  docstring const & plaintext)
+                 docstring const & plaintext)
 {
        // For some strange reason gcc 3.2 and 3.3 do not accept
        // Buffer buffer(string(), false);
@@ -374,17 +380,17 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
                // ERT paragraphs have the Language latex_language.
                // This is invalid outside of ERT, so we need to change it
                // to the buffer language.
-               if (it->ownerCode() == Inset::ERT_CODE) {
+               if (it->ownerCode() == Inset::ERT_CODE || it->ownerCode() == Inset::LISTINGS_CODE) {
                        it->changeLanguage(buf.params(), latex_language,
-                                          buf.getLanguage());
+                                          buf.getLanguage());
                }
                it->setInsetOwner(0);
        }
 
        // do not copy text (also nested in insets) which is marked as deleted
-       // acceptChanges() is defined for LyXText rather than ParagraphList
-       // Thus we must wrap copy_pars into a LyXText object and cross our fingers
-       LyXText lt;
+       // acceptChanges() is defined for Text rather than ParagraphList
+       // Thus we must wrap copy_pars into a Text object and cross our fingers
+       Text lt;
        copy_pars.swap(lt.paragraphs());
        lt.acceptChanges(buf.params());
        copy_pars.swap(lt.paragraphs());
@@ -492,7 +498,7 @@ std::vector<docstring> const availableSelections(Buffer const & buffer)
                        asciiSel += pit->asString(buffer, false);
                        if (asciiSel.size() > 25) {
                                asciiSel.replace(22, docstring::npos,
-                                                from_ascii("..."));
+                                                from_ascii("..."));
                                break;
                        }
                }
@@ -520,7 +526,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
        // and cur.selEnd()
 
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
 
                // make sure that the depth behind the selection are restored, too
@@ -557,7 +563,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
                cur.pit() = endpit;
 
                // sometimes necessary
-               if (doclear 
+               if (doclear
                        && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges))
                        cur.fixIfBroken();
 
@@ -601,8 +607,12 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack)
        if (!cur.selection())
                return;
 
+       // copySelection can not yet handle the case of cross idx selection
+       if (cur.selBegin().idx() != cur.selEnd().idx())
+               return;
+
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
                // ok we have a selection. This is always between cur.selBegin()
                // and sel_end cursor
@@ -645,7 +655,7 @@ void copySelectionToStack()
 void copySelection(Cursor & cur, docstring const & plaintext)
 {
        // In tablemode, because copy and paste actually use special table stack
-       // we do not attemp to get selected paragraphs under cursor. Instead, a 
+       // we do not attemp to get selected paragraphs under cursor. Instead, a
        // paragraph with the plain text version is generated so that table cells
        // can be pasted as pure text somewhere else.
        if (cur.selBegin().idx() != cur.selEnd().idx()) {
@@ -669,7 +679,7 @@ void saveSelection(Cursor & cur)
        LYXERR(Debug::ACTION) << BOOST_CURRENT_FUNCTION << ": `"
               << to_utf8(cur.selectionAsString(true)) << "'."
               << endl;
-       
+
        if (cur.selection())
                copySelectionToStack(cur, selectionBuffer);
        // tell X whether we now have a valid selection
@@ -701,7 +711,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
                        textclass_type textclass, ErrorList & errorList)
 {
        if (cur.inTexted()) {
-               LyXText * text = cur.text();
+               Text * text = cur.text();
                BOOST_ASSERT(text);
 
                pit_type endpit;
@@ -778,7 +788,7 @@ void pasteSelection(Cursor & cur, ErrorList & errorList)
                return;
        recordUndo(cur);
        pasteParagraphList(cur, selectionBuffer[0].first,
-                          selectionBuffer[0].second, errorList);
+                          selectionBuffer[0].second, errorList);
        cur.setSelection();
 }