diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-01-29 12:19:10 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-01-29 12:19:10 -0500 |
| commit | 2ba4d305871115cbc710663c865af29beafa40bc (patch) | |
| tree | e8bd5f4e3ee9bf7ce803c991aa9e46b706495a29 | |
| parent | a381cd8160f05c527bdea880aabc3aea0ab1c6c9 (diff) | |
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.... :-/
| -rw-r--r-- | sc/source/ui/unoobj/filtuno.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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<AbstractScTextImportOptionsDlg> pDlg( |