diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-09 19:33:32 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-09 21:29:45 +0100 |
commit | 0dfa21409198b5ccea06bfe66ab12691dc6a7876 (patch) | |
tree | 371d2c6b9402fb0f2f526c78d122fb0e94f49125 /sfx2/source | |
parent | 432aec515c7cb330e98b78ee316ad97a9fbb2b4d (diff) |
Remove some dead code
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 75 | ||||
-rw-r--r-- | sfx2/source/view/orgmgr.cxx | 2 |
3 files changed, 0 insertions, 89 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 9d80e96c180f..6c56dbde01bf 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -196,14 +196,8 @@ void SfxApplication::EnterBasicCall() { DBG_TRACE( "SfxShellObject: BASIC-on-demand" ); - // das kann l"anger dauern, da Progress nicht geht, wenigstens Sanduhr -//(mba)/task SfxWaitCursor aWait; - // zuerst das BASIC laden GetBasic(); - - // Factories anmelden -// SbxBase::AddFactory( new SfxSbxObjectFactory_Impl ); } } @@ -228,7 +222,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) { SbxObject* pObject = SbxBase::CreateObject( pItem->GetValue() ); pObject->AddRef(); -//(mba) rReq.SetReturnValue( SfxObjectItem( 0, pObject ) ); rReq.Done(); } break; @@ -237,11 +230,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) case SID_DELETE_BASICOBJECT: { SFX_REQUEST_ARG(rReq, pItem, SfxObjectItem, nSID, sal_False); - if ( pItem ) - { -//(mba) SbxObject* pObject = pItem->GetObject(); -//(mba) pObject->ReleaseRef(); - } break; } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 4adfbbfd2ead..45e13deb1421 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -60,8 +60,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> - - #include <com/sun/star/script/provider/XScript.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> @@ -228,25 +226,6 @@ void SfxObjectShell::FlushDocInfo() sal_Int32 delay(xDocProps->getAutoloadSecs()); SetAutoLoad( INetURLObject(url), delay * 1000, (delay > 0) || url.getLength() ); -/* - // bitte beachten: - // 1. Titel in DocInfo aber nicht am Doc (nach HTML-Import) - // => auch am Doc setzen - // 2. Titel in DocInfo leer (Briefumschlagsdruck) - // => nicht am Doc setzen, da sonst "unbenanntX" daraus wird - String aDocInfoTitle = GetDocInfo().GetTitle(); - if ( aDocInfoTitle.Len() ) - SetTitle( aDocInfoTitle ); - else - { - pImp->aTitle.Erase(); - SetNamedVisibility_Impl(); - if ( GetMedium() ) - { - SfxShell::SetName( GetTitle(SFX_TITLE_APINAME) ); - Broadcast( SfxSimpleHint(SFX_HINT_TITLECHANGED) ); - } - }*/ } //------------------------------------------------------------------------- @@ -454,8 +433,6 @@ void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly ) if ( bWasRO != IsReadOnly() ) { Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); - //if ( pImp->pDocInfo ) - // pImp->pDocInfo->SetReadOnly( IsReadOnly() ); } } @@ -499,12 +476,10 @@ sal_Bool SfxObjectShell::IsInModalMode() const return pImp->bModalMode || pImp->bRunningMacro; } -//<!--Added by PengYunQuan for Validity Cell Range Picker sal_Bool SfxObjectShell::AcceptStateUpdate() const { return !IsInModalMode(); } -//-->Added by PengYunQuan for Validity Cell Range Picker //------------------------------------------------------------------------- @@ -829,9 +804,6 @@ void SfxObjectShell::SetTitle // Title setzen pImp->aTitle = rTitle; -// Wieso denn in der DocInfo? -// GetDocInfo().SetTitle( rTitle ); -// FlushDocInfo(); // Benachrichtigungen if ( GetMedium() ) @@ -908,19 +880,10 @@ String SfxObjectShell::GetTitle */ { -// if ( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) -// return String(); SfxMedium *pMed = GetMedium(); if ( IsLoading() ) return String(); -/* if ( !nMaxLength && pImp->pDocInfo ) - { - String aTitle = pImp->pDocInfo->GetTitle(); - if ( aTitle.Len() ) - return aTitle; - } */ - // Titel erzeugen? if ( SFX_TITLE_DETECT == nMaxLength && !pImp->aTitle.Len() ) { @@ -1061,8 +1024,6 @@ void SfxObjectShell::InvalidateName() { // Title neu erzeugen pImp->aTitle.Erase(); -// pImp->nVisualDocumentNumber = USHRT_MAX; - //GetTitle( SFX_TITLE_DETECT ); SetName( GetTitle( SFX_TITLE_APINAME ) ); // Benachrichtigungen @@ -1575,14 +1536,6 @@ void SfxObjectShell::CancelTransfers() AbortImport(); if( IsLoading() ) FinishedLoading( SFX_LOADED_ALL ); - -/* - SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this ); - while( pFrame ) - { - pFrame->CancelTransfers(); - pFrame = SfxViewFrame::GetNext( *pFrame, this ); - }*/ } } @@ -1899,32 +1852,6 @@ void SfxObjectShell::SetFlags( SfxObjectShellFlags eFlags ) pImp->eFlags = eFlags; } -/* -void SfxObjectShell::SetBaseURL( const String& rURL ) -{ - pImp->aBaseURL = rURL; - pImp->bNoBaseURL = FALSE; -} - -const String& SfxObjectShell::GetBaseURLForSaving() const -{ - if ( pImp->bNoBaseURL ) - return String(); - return GetBaseURL(); -} - -const String& SfxObjectShell::GetBaseURL() const -{ - if ( pImp->aBaseURL.Len() ) - return pImp->aBaseURL; - return pMedium->GetBaseURL(); -} - -void SfxObjectShell::SetEmptyBaseURL() -{ - pImp->bNoBaseURL = TRUE; -} -*/ String SfxObjectShell::QueryTitle( SfxTitleQuery eType ) const { String aRet; @@ -1989,7 +1916,6 @@ void SfxHeaderAttributes_Impl::SetAttribute( const SvKeyValue& rKV ) } else { -// DBG_ERROR( "Schlechtes ::com::sun::star::util::DateTime fuer Expired" ); pDoc->GetMedium()->SetExpired_Impl( Date( 1, 1, 1970 ) ); } } @@ -2089,7 +2015,6 @@ sal_Bool SfxObjectShell::IsSecure() return sal_False; if ( aOpt.IsSecureURL( aURL.GetMainURL( INetURLObject::NO_DECODE ), aReferer ) ) - //if ( SvtSecurityOptions().IsSecureURL( aURL.GetMainURL( INetURLObject::NO_DECODE ), aReferer ) ) { if ( GetMedium()->GetContent().is() ) { diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index 01822165f512..8138ffc31c60 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -291,7 +291,6 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell( USHORT nIdx ) // andernfalls Doc-Shell anlegen if ( !pEntry->aDocShell.Is() ) { -//(mba)/task SfxWaitCursor aWaitCursor; INetURLObject aFileObj( pEntry->aFileName ); BOOL bDum = FALSE; SfxApplication* pSfxApp = SFX_APP(); @@ -366,7 +365,6 @@ SfxObjectShellRef SfxOrganizeMgr::CreateObjectShell(USHORT nRegion, */ { -//(mba)/task SfxWaitCursor aWaitCursor; return pTemplates->CreateObjectShell(nRegion, nIdx); } |