Kaydet (Commit) bd8be4ea authored tarafından Markus Mohrhard's avatar Markus Mohrhard

don't paste content if user cancels html import, fdo#47393

üst 3297ce2a
...@@ -323,9 +323,15 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, ...@@ -323,9 +323,15 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
aOptions.SetDetectSpecialNumber(pDlg->IsDateConversionSet()); aOptions.SetDetectSpecialNumber(pDlg->IsDateConversionSet());
aObj.SetExtOptions(aOptions); aObj.SetExtOptions(aOptions);
} }
else
{
// prevent error dialog for user cancel action
bRet = true;
}
} }
if(!bRet)
bRet = aObj.ImportStream( *xStream, String(), nFormatId );
// mba: clipboard always must contain absolute URLs (could be from alien source) // mba: clipboard always must contain absolute URLs (could be from alien source)
bRet = aObj.ImportStream( *xStream, String(), nFormatId );
} }
else if (nFormatId == FORMAT_STRING && aDataHelper.GetString( nFormatId, aStr )) else if (nFormatId == FORMAT_STRING && aDataHelper.GetString( nFormatId, aStr ))
{ {
......
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