[CWS autorecovery] even closer to an SFX document loader working in the proper order

1 files changed, 19 insertions, 13 deletions

diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index 089315d0c1c5..ea0b5992ee72 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -31,6 +31,9 @@
 #ifndef _SFX_FRMLOAD_HXX
 #define _SFX_FRMLOAD_HXX
 
+#include "sfx2/sfxuno.hxx"
+#include "sfx2/objsh.hxx"
+
 /** === begin UNO includes === **/
 #include <com/sun/star/frame/XLoadEventListener.hpp>
 #include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
@@ -58,8 +61,6 @@ class SfxFilter;
 class SfxFilterMatcher;
 class SfxTopFrame;
 
-#include <sfx2/sfxuno.hxx>
-
 class SfxFrameWeak;
 
 class SfxFrameLoader_Impl : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader, ::com::sun::star::lang::XServiceInfo >
@@ -101,23 +102,13 @@ private:
     sal_Bool            impl_createNewDoc(
                             const ::comphelper::NamedValueCollection& i_rDescriptor,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rxFrame,
-                            const ::rtl::OUString& _rFactoryName
+                            const ::rtl::OUString& i_rFactoryName
                         );
 
     void                impl_determineFilter(
                                   ::comphelper::NamedValueCollection& io_rDescriptor
                         );
 
-    SfxAllItemSet       impl_getInitialItemSet(
-                            const ::comphelper::NamedValueCollection& i_rDescriptor
-                        ) const;
-
-    sal_Bool            impl_loadExistingDocument(
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_rxDocument,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rxTargetFrame,
-                            const ::comphelper::NamedValueCollection& i_rDescriptor
-                        );
-
     sal_Bool            impl_cleanUp(
                             const sal_Bool i_bSuccess,
                             const SfxFrameWeak& i_wFrame
@@ -130,6 +121,21 @@ private:
     USHORT              impl_findSlotParam(
                             const ::rtl::OUString& i_rFactoryURL
                         );
+
+    SfxObjectShellLock  impl_findObjectShell(
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_rxDocument
+                        );
+
+    sal_Bool            impl_plugDocIntoFrame(
+                            const ::comphelper::NamedValueCollection& i_rDescriptor,
+                                  SfxTopFrame& i_rTargetFrame,
+                                  SfxObjectShell& i_rDocument
+                        );
+
+    void                impl_lockHiddenDocument(
+                                  SfxObjectShell& i_rDocument,
+                            const ::comphelper::NamedValueCollection& i_rDescriptor
+                        );
 };
 
 #endif