Paste non-text data as BLOB

mgrojo · mgrojo · commit 9475f31d6db3 · 2023-08-04T20:24:37.000+02:00
Ideally, if we are copying internally, we should preserve the data type of the original cell(s), but with this workaround, at least we are not inserting binary data as if it were text. See related issue #3307
diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp
@@ -5,6 +5,7 @@
 #include "Settings.h"
 #include "sqlitedb.h"
 #include "CondFormat.h"
+#include "Data.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -739,7 +740,7 @@ void ExtendedTableWidget::paste()
         img.save(&buffer, "PNG");       // We're always converting the image format to PNG here. TODO: Is that correct?
         buffer.close();
 
-        m->setData(indices.first(), ba);
+        m->setTypedData(indices.first(), /* isBlob = */ !isTextOnly(ba), ba);
         return;
     }
 
@@ -785,7 +786,7 @@ void ExtendedTableWidget::paste()
         for(int row=firstRow;row<firstRow+selectedRows;row++)
         {
             for(int column=firstColumn;column<firstColumn+selectedColumns;column++)
-                m->setData(m->index(row, column), bArrdata);
+                m->setTypedData(m->index(row, column), !isTextOnly(bArrdata), bArrdata);
         }
         return;
     }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include "Settings.h"`
`6`	`6`	`#include "sqlitedb.h"`
`7`	`7`	`#include "CondFormat.h"`
	`8`	`+#include "Data.h"`
`8`	`9`
`9`	`10`	`#include <QApplication>`
`10`	`11`	`#include <QClipboard>`
`@@ -739,7 +740,7 @@ void ExtendedTableWidget::paste()`
`739`	`740`	`img.save(&buffer, "PNG"); // We're always converting the image format to PNG here. TODO: Is that correct?`
`740`	`741`	`buffer.close();`
`741`	`742`
`742`		`- m->setData(indices.first(), ba);`
	`743`	`+ m->setTypedData(indices.first(), /* isBlob = */ !isTextOnly(ba), ba);`
`743`	`744`	`return;`
`744`	`745`	`}`
`745`	`746`
`@@ -785,7 +786,7 @@ void ExtendedTableWidget::paste()`
`785`	`786`	`for(int row=firstRow;row<firstRow+selectedRows;row++)`
`786`	`787`	`{`
`787`	`788`	`for(int column=firstColumn;column<firstColumn+selectedColumns;column++)`
`788`		`- m->setData(m->index(row, column), bArrdata);`
	`789`	`+ m->setTypedData(m->index(row, column), !isTextOnly(bArrdata), bArrdata);`
`789`	`790`	`}`
`790`	`791`	`return;`
`791`	`792`	`}`