Kaydet (Commit) acf49090 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Avoid "Text Import" dialog if invoking Paste() from OLE Automation

Excel does not show such a dialog in that case either. At least not in
the customer use case.

Possibly we could try to be clever and sniff the string to see if it
seems to use defaults, like TABs as separators, and if not, then show
the dialog?

Change-Id: Ib12b628eee25273aa489dbbd86004167ca105c0b
üst 538f7d66
......@@ -43,6 +43,7 @@
#include <vcl/transfer.hxx>
#include <vcl/graph.hxx>
#include <comphelper/automationinvokedzone.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/storagehelper.hxx>
......@@ -334,9 +335,10 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
else if ((nFormatId == SotClipboardFormatId::STRING || nFormatId == SotClipboardFormatId::STRING_TSVC)
&& aDataHelper.GetString( nFormatId, *pStrBuffer ))
{
// Do CSV dialog if more than one line.
// Do CSV dialog if more than one line. But not if invoked from Automation.
sal_Int32 nDelim = pStrBuffer->indexOf('\n');
if (nDelim >= 0 && nDelim != pStrBuffer->getLength () - 1)
if (!comphelper::Automation::AutomationInvokedZone::isActive()
&& nDelim >= 0 && nDelim != pStrBuffer->getLength () - 1)
{
vcl::Window* pParent = GetActiveWin();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment