[CWS autorecovery] somewhat separated the 'switch view shell on SFX level' from the 'load new document on UNO level' case

1 files changed, 5 insertions, 5 deletions

diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index cde8265a1842..a8c6e9ae5f03 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -565,11 +565,6 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
             // the latter.
         }
 
-        // create a frame
-        SfxFrame* pTargetFrame = SfxFrame::Create( _rTargetFrame );
-        ENSURE_OR_THROW( pTargetFrame, "could not create an SfxFrame" );
-        wFrame = pTargetFrame;
-
         // get the SfxObjectShell (still needed at the moment)
         SfxObjectShellLock xDoc = impl_findObjectShell( xModel );
         ENSURE_OR_THROW( xDoc.Is(), "no SfxObjectShell for the given model" );
@@ -584,6 +579,11 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
             // code at the very end of this method cares for closing the XModel, which should also close the
             // ObjectShell.
 
+        // create a frame
+        SfxFrame* pTargetFrame = SfxFrame::Create( _rTargetFrame );
+        ENSURE_OR_THROW( pTargetFrame, "could not create an SfxFrame" );
+        wFrame = pTargetFrame;
+
         // insert the document into the frame
         if ( !impl_plugDocIntoFrame( aDescriptor, *pTargetFrame, *xDoc ) )
             throw RuntimeException();