[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/xml/xmlimp.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 7269df74824bdea31b9d42d1e2d77b77e702b3ab
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Oct 28 17:11:00 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Oct 28 19:51:00 2023 +0200

    ofz#63646 avoid Timeout when document fails to load
    
    Change-Id: I84db71486c42b74bd2bf7ff2c5469938802ee113
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158592
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index c84a3a3a3392..55415f12a6f4 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1847,12 +1847,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool 
TestPDFExportFODT(SvStream &rStream)
     uno::Reference<document::XFilter> xFODTFilter(xInterface, 
uno::UNO_QUERY_THROW);
     bool ret = xFODTFilter->filter(aArgs);
 
-    css::uno::Reference<css::frame::XController2> 
xController(xModel->createDefaultViewController(xTargetFrame), UNO_SET_THROW);
-
-    utl::ConnectFrameControllerModel(xTargetFrame, xController, xModel);
-
     if (ret)
     {
+        css::uno::Reference<css::frame::XController2> 
xController(xModel->createDefaultViewController(xTargetFrame), UNO_SET_THROW);
+        utl::ConnectFrameControllerModel(xTargetFrame, xController, xModel);
+
         utl::TempFileNamed aTempFile;
         aTempFile.EnableKillingFile();