From 74e169dc119e7b3d5dbc1935e5c6c1c11d3ea2d4 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 13 Feb 2015 23:01:41 +0100 Subject: [PATCH] + open transaction when pasting clipboard into document --- src/Gui/MainWindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index fec5bc4ac..d52f7aa76 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1526,6 +1526,7 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData) App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc) doc = App::GetApplication().newDocument(); + doc->openTransaction("Paste"); Base::ByteArrayIStreambuf buf(res); std::istream in(0); in.rdbuf(&buf); @@ -1537,12 +1538,14 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData) if (gui) gui->addRootObjectsToGroup(newObj, grp.front()); } + doc->commitTransaction(); } else if (mimeData->hasFormat(QLatin1String("application/x-documentobject-file"))) { QByteArray res = mimeData->data(QLatin1String("application/x-documentobject-file")); App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc) doc = App::GetApplication().newDocument(); + doc->openTransaction("Paste"); Base::FileInfo fi((const char*)res); Base::ifstream str(fi, std::ios::in | std::ios::binary); MergeDocuments mimeView(doc); @@ -1554,6 +1557,7 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData) if (gui) gui->addRootObjectsToGroup(newObj, grp.front()); } + doc->commitTransaction(); } else if (mimeData->hasUrls()) { // load the files into the active document if there is one, otherwise let create one