From 2ba4d305871115cbc710663c865af29beafa40bc Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Fri, 29 Jan 2010 12:19:10 -0500 Subject: koheicsvimport: #i108754# Make sure that the html options dialog won't get launched on export. BTW, with this change, the character set dialog gets launched on html export instead.... :-/ --- sc/source/ui/unoobj/filtuno.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 90c86bca0cfb..96b3d13322be 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -186,7 +186,9 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) delete pDlg; delete pInStream; } - else if ( aFilterString == ScDocShell::GetWebQueryFilterName() || aFilterString == ScDocShell::GetHtmlFilterName() ) + else if ( !bExport && + (aFilterString == ScDocShell::GetWebQueryFilterName() || + aFilterString == ScDocShell::GetHtmlFilterName()) ) { // HTML import. ::std::auto_ptr pDlg( -- cgit