sc/qa/unit/subsequent_export-test.cxx | 4 ++++ sc/source/filter/oox/workbookfragment.cxx | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit 922714c21c1c58792542e512869ada3e2a267afc Author: Kohei Yoshida <[email protected]> Date: Tue Dec 4 18:39:43 2012 -0500 More adjustment of file load code in the unit test. And remove the try catch block, which shouldn't really be necessary there. Change-Id: I91db12203332b31b208b107db810c33705a57f0b diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 8d4eb82..c7930b4 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -200,8 +200,10 @@ ScDocShellRef ScExportTest::saveAndReload(ScDocShell* pShell, const rtl::OUStrin pFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocShRef = new ScDocShell; + xDocShRef->GetDocument()->EnableUserInteraction(false); SfxMedium* pSrcMed = new SfxMedium(aTempFile.GetURL(), STREAM_STD_READ); pSrcMed->SetFilter(pFilter); + pSrcMed->UseInteractionHandler(false); if (!xDocShRef->DoLoad(pSrcMed)) { xDocShRef->DoClose(); @@ -240,8 +242,10 @@ ScDocShellRef ScExportTest::loadDocument(const rtl::OUString& rFileName, sal_Int pFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ScDocShellRef xDocShRef = new ScDocShell; + xDocShRef->GetDocument()->EnableUserInteraction(false); SfxMedium* pSrcMed = new SfxMedium(aFileName, STREAM_STD_READ); pSrcMed->SetFilter(pFilter); + pSrcMed->UseInteractionHandler(false); if (!xDocShRef->DoLoad(pSrcMed)) { xDocShRef->DoClose(); diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index c5d4b30..896f648 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -28,7 +28,6 @@ #include "oox/helper/propertyset.hxx" #include "oox/ole/olestorage.hxx" #include "vcl/msgbox.hxx" -#include <vcl/svapp.hxx> #include "biffinputstream.hxx" #include "chartsheetfragment.hxx" @@ -331,11 +330,7 @@ void WorkbookFragment::finalizeImport() pDocSh->GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS)); - try - { - bHardRecalc = aBox.Execute() == RET_YES; - } - catch (Application::DialogCancelledException const&) {/* ignore */} + bHardRecalc = aBox.Execute() == RET_YES; } if (bHardRecalc) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
