summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/source/ui/view/viewfun5.cxx8
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 ))
{