diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-16 10:45:01 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-16 10:48:09 +0100 |
| commit | bd8be4eae82525434454cc3c7274f7a7a44158c0 (patch) | |
| tree | 6ec4fddb56fb61df1397102a05e7c658e6a0db7d | |
| parent | 3297ce2aa13efc6029983b716cec20ed7befda56 (diff) | |
don't paste content if user cancels html import, fdo#47393
| -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 fa305a570ab7..24564025b932 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -323,9 +323,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 )) { |