[CWS autorecovery] #i65597# moved creation of new documents from application to loader

The loader was the only client of the respective application code, and needs to have better
control over the document creation process.
In the course of this move, some dead/duplicate/obsolete code has been removed.

1 files changed, 0 insertions, 186 deletions

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index adca56638c..f9af1c5add 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -514,65 +514,6 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
 
 //--------------------------------------------------------------------
 
-SfxObjectShellLock SfxApplication::NewDoc_Impl( const String& rFact, const SfxItemSet *pSet )
-{
-    SfxObjectShellLock xDoc;
-    String aFact( rFact );
-    String aPrefix = String::CreateFromAscii( "private:factory/" );
-    if ( aPrefix.Len() == aFact.Match( aPrefix ) )
-        aFact.Erase( 0, aPrefix.Len() );
-    USHORT nPos = aFact.Search( '?' );
-    String aParam;
-    if ( nPos != STRING_NOTFOUND )
-    {
-        aParam = aFact.Copy( nPos, aFact.Len() );
-        aFact.Erase( nPos, aFact.Len() );
-        aParam.Erase(0,1);
-    }
-
-    xDoc = SfxObjectShell::CreateObjectByFactoryName( aFact );
-    aParam = INetURLObject::decode( aParam, '%', INetURLObject::DECODE_WITH_CHARSET );
-    if( xDoc.Is() )
-        xDoc->DoInitNew_Impl( aParam );
-
-    if ( xDoc.Is() )
-    {
-        if ( pSet )
-        {
-            // TODO/LATER: Should the other arguments be transfered as well?
-            SFX_ITEMSET_ARG( pSet, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, FALSE);
-            if ( pDefaultPathItem )
-                xDoc->GetMedium()->GetItemSet()->Put( *pDefaultPathItem );
-            SFX_ITEMSET_ARG( pSet, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, FALSE);
-            if ( pDefaultNameItem )
-                xDoc->GetMedium()->GetItemSet()->Put( *pDefaultNameItem );
-            SFX_ITEMSET_ARG( pSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE, FALSE );
-            if ( pTitleItem )
-                xDoc->GetMedium()->GetItemSet()->Put( *pTitleItem );
-        }
-
-        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >  xModel ( xDoc->GetModel(), ::com::sun::star::uno::UNO_QUERY );
-        if ( xModel.is() )
-        {
-            SfxItemSet* pNew = xDoc->GetMedium()->GetItemSet()->Clone();
-            pNew->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL );
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
-            TransformItems( SID_OPENDOC, *pNew, aArgs );
-
-            sal_Int32 nLength = aArgs.getLength();
-            aArgs.realloc( nLength + 1 );
-
-            aArgs[nLength].Name = DEFINE_CONST_UNICODE("Title");
-            aArgs[nLength].Value <<= ::rtl::OUString( xDoc->GetTitle( SFX_TITLE_DETECT ) );
-
-            xModel->attachResource( ::rtl::OUString(), aArgs );
-            delete pNew;
-        }
-    }
-
-    return xDoc;
-}
-
 void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
@@ -606,133 +547,6 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
         rReq.SetReturnValue( SfxFrameItem( 0, pItem->GetFrame() ) );
 }
 
-const SfxPoolItem* SfxApplication::NewDocDirectExec_ImplOld( SfxRequest& rReq )
-{
-    DBG_MEMTEST();
-/*
-    SFX_REQUEST_ARG(rReq, pHidden, SfxBoolItem, SID_HIDDEN, FALSE);
-//(mba)/task
-
-    if ( !pHidden || !pHidden->GetValue() )
-        Application::GetAppWindow()->EnterWait();
-*/
-    SfxObjectShellLock xDoc;
-
-    // Factory-RegNo kann per Parameter angegeben sein
-    SfxErrorContext aEc(ERRCTX_SFX_NEWDOCDIRECT);
-    rReq.GetArgs(); // -Wall required??
-    String aFactory;
-    rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, TRUE ) );
-    SFX_REQUEST_ARG( rReq, pFactoryName, SfxStringItem, SID_NEWDOCDIRECT, FALSE );
-    if( pFactoryName )
-        aFactory = pFactoryName->GetValue();
-    else
-        aFactory = SvtModuleOptions().GetDefaultModuleName();
-
-    SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, FALSE);
-    if ( pFileFlagsItem )
-    {
-        // Werte auf einzelne Items verteilen
-        String aFileFlags = pFileFlagsItem->GetValue();
-        aFileFlags.ToUpperAscii();
-        if ( STRING_NOTFOUND != aFileFlags.Search( 0x0054 ) )               // T = 54h
-            rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, TRUE ) );
-        if ( STRING_NOTFOUND != aFileFlags.Search( 0x0048 ) )               // H = 48h
-            rReq.AppendItem( SfxBoolItem( SID_HIDDEN, TRUE ) );
-        if ( STRING_NOTFOUND != aFileFlags.Search( 0x0052 ) )               // R = 52h
-            rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, TRUE ) );
-        if ( STRING_NOTFOUND != aFileFlags.Search( 0x0042 ) )               // B = 42h
-            rReq.AppendItem( SfxBoolItem( SID_PREVIEW, TRUE ) );
-        if ( STRING_NOTFOUND != aFileFlags.Search( 0x0053 ) )               // S = 53h
-            rReq.AppendItem( SfxBoolItem( SID_SILENT, TRUE ) );
-    }
-
-    xDoc = NewDoc_Impl( aFactory, rReq.GetArgs() );
-    if ( xDoc.Is() )
-    {
-        SFX_REQUEST_ARG(rReq, pReadonly, SfxBoolItem, SID_DOC_READONLY, FALSE);
-        if ( pReadonly )
-            xDoc->GetMedium()->GetItemSet()->Put( *pReadonly );
-
-        SFX_REQUEST_ARG(rReq, pPreview, SfxBoolItem, SID_PREVIEW, FALSE);
-        if ( pPreview )
-            xDoc->GetMedium()->GetItemSet()->Put( *pPreview );
-
-        SFX_REQUEST_ARG(rReq, pSilent, SfxBoolItem, SID_SILENT, FALSE);
-        if ( pSilent )
-            xDoc->GetMedium()->GetItemSet()->Put( *pSilent );
-
-        SFX_REQUEST_ARG(rReq, pFlags, SfxStringItem, SID_OPTIONS, FALSE);
-        if ( pFlags )
-            xDoc->GetMedium()->GetItemSet()->Put( *pFlags );
-    }
-
-    // View erzeugen
-    if ( xDoc.Is() )
-    {
-        SFX_REQUEST_ARG(rReq, pHidden, SfxBoolItem, SID_HIDDEN, FALSE);
-        BOOL bHidden = FALSE;
-        if ( pHidden )
-        {
-            xDoc->GetMedium()->GetItemSet()->Put( *pHidden, SID_HIDDEN );
-            bHidden = pHidden->GetValue();
-        }
-
-        SFX_REQUEST_ARG(rReq, pViewId, SfxUInt16Item, SID_VIEW_ID, FALSE);
-        USHORT nViewId = 0;
-        if ( pViewId )
-        {
-            xDoc->GetMedium()->GetItemSet()->Put( *pViewId, SID_VIEW_ID );
-            nViewId = pViewId->GetValue();
-        }
-
-        xDoc->SetActivateEvent_Impl( SFX_EVENT_CREATEDOC );
-//		xDoc->Get_Impl()->nLoadedFlags = SFX_LOADED_ALL;
-        const SfxItemSet* pInternalArgs = rReq.GetInternalArgs_Impl();
-        if( pInternalArgs )
-            xDoc->GetMedium()->GetItemSet()->Put( *pInternalArgs );
-        SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE);
-
-        SfxFrame* pFrame = NULL;
-        if (pFrameItem)
-            pFrame = pFrameItem->GetFrame();
-        else
-            pFrame = (SfxFrame*)SfxTopFrame::Create(xDoc, nViewId, bHidden, pInternalArgs);
-        if ( pFrame )
-        {
-            if ( pFrame->GetCurrentDocument() == xDoc || pFrame->PrepareClose_Impl( TRUE, TRUE ) == TRUE )
-            {
-                if ( bHidden )
-                {
-                    xDoc->RestoreNoDelete();
-                    xDoc->OwnerLock( TRUE );
-                    xDoc->Get_Impl()->bHiddenLockedByAPI = TRUE;
-                }
-
-                if ( pFrame->GetCurrentDocument() != xDoc )
-                {
-                    SfxTopFrame* pTopFrame = dynamic_cast< SfxTopFrame* >( pFrame );
-                    OSL_ENSURE( pTopFrame, "An SfxFrame which is no SfxTopFrame?!" );
-                    if ( pTopFrame && pTopFrame->InsertDocument_Impl( *xDoc ) )
-                        rReq.SetReturnValue( SfxFrameItem( 0, pFrame ) );
-                    else
-                        xDoc->DoClose();
-                }
-            }
-            else
-                xDoc.Clear();
-        }
-    }
-
-    return rReq.GetReturnValue();
-
-//(mba)/task
-/*
-    if ( !pHidden || !pHidden->GetValue() )
-        Application::GetAppWindow()->LeaveWait();
- */
-}
-
 //--------------------------------------------------------------------
 
 void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )