X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=2450e0fc5cbfa5dc5eec958adf8341ecf0ac7fe4;hb=dfd786e6a0cb8d2d9548d1a0ef17eb47b0752e1b;hp=96986dd69ff8343f186d4f558379096c214fe0f0;hpb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 96986dd69f..2450e0fc5c 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -15,6 +15,7 @@ #include "CutAndPaste.h" +#include "BaseClassList.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferParams.h" @@ -30,7 +31,6 @@ #include "LyXFunc.h" #include "LyXRC.h" #include "Text.h" -#include "TextClassList.h" #include "Paragraph.h" #include "paragraph_funcs.h" #include "ParagraphParameters.h" @@ -393,7 +393,7 @@ docstring grabAndEraseSelection(Cursor & cur) void switchBetweenClasses(TextClassPtr const & oldone, - TextClassPtr const & newone, InsetText & in, ErrorList & errorlist) + TextClassPtr const & newone, InsetText & in, ErrorList & errorlist) { errorlist.clear(); @@ -702,8 +702,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, PitPosPair ppp; boost::tie(ppp, endpit) = - pasteSelectionHelper(cur, parlist, - textclass, errorList); + pasteSelectionHelper(cur, parlist, textclass, errorList); updateLabels(cur.buffer()); cur.clearSelection(); text->setCursor(cur, ppp.first, ppp.second); @@ -765,7 +764,7 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs) } -void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList, +void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, Clipboard::GraphicsType preferedType) { BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType));