diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-16 10:45:01 +0100 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-03-16 16:18:14 -0400 |
| commit | 76f3a63432e70d017760a2087652a1abc9b126d3 (patch) | |
| tree | d48327db918838e9764f8bbeeb1e0c37abcbc9d7 /sc | |
| parent | a3ace305bcbd0bf04badddff8ef6273287f30556 (diff) | |
don't paste content if user cancels html import, fdo#47393
Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index eae13290a649..cdf373ae68c9 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -322,9 +322,15 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, aOptions.SetDetectSpecialNumber(pDlg->IsDateConversionSet()); 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) - bRet = aObj.ImportStream( *xStream, String(), nFormatId ); } else if (nFormatId == FORMAT_STRING && aDataHelper.GetString( nFormatId, aStr )) { |