[Libreoffice-commits] .: sc/source

[Markus Mohrhard]

 sc/source/ui/view/viewfun5.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit bd8be4eae82525434454cc3c7274f7a7a44158c0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Mar 16 10:45:01 2012 +0100

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

diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index fa305a5..2456402 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 ))
             {