diff options
Diffstat (limited to 'sfx2/source/doc/objserv.cxx')
| -rwxr-xr-x | sfx2/source/doc/objserv.cxx | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 9710836a3517..24d6309c4d95 100755 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -453,7 +453,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) aSet.Put( SfxStringItem( SID_EXPLORER_PROPS_START, aTitle ) ); aSet.Put( SfxStringItem( SID_BASEURL, GetMedium()->GetBaseURL() ) ); - // creating dialog is done via virtual method; application will add its own statistics page + // creating dialog is done via virtual method; application will + // add its own statistics page SfxDocumentInfoDialog *pDlg = CreateDocumentInfoDialog(0, aSet); if ( RET_OK == pDlg->Execute() ) { @@ -497,7 +498,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) return; } - //!! detaillierte Auswertung eines Fehlercodes + //!! detailed analysis of an error code SfxObjectShellRef xLock( this ); // the model can not be closed till the end of this method @@ -723,9 +724,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SfxViewFrame *pFrame = GetFrame(); if ( pFrame && pFrame->GetFrame().GetParentFrame() ) { - // Wenn SID_CLOSEDOC "uber Menue etc. ausgef"uhrt wird, das - // aktuelle Dokument aber in einem Frame liegt, soll eigentlich - // das FrameSetDocument geclosed werden + // If SID_CLOSEDOC is excecuted through menu and so on, but + // the current document is in a frame, then the + // FrameSetDocument should actually be closed. pFrame->GetTopViewFrame()->GetObjectShell()->ExecuteSlot( rReq ); rReq.Done(); return; @@ -738,8 +739,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { if ( pFrame->GetFrame().GetParentFrame() ) { - // Auf dieses Dokument existiert noch eine Sicht, die - // in einem FrameSet liegt; diese darf nat"urlich nicht + // In this document there still exists a view that is + // in a FrameSet , which of course may not be closed // geclosed werden bInFrameSet = sal_True; } @@ -751,7 +752,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( bInFrameSet ) { - // Alle Sichten, die nicht in einem FrameSet liegen, closen + // Close all views that are not in a FrameSet. pFrame = SfxViewFrame::GetFirst( this ); while ( pFrame ) { @@ -761,7 +762,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } } - // Parameter auswerten + // Evaluate Parameter SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, sal_False); SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, sal_False); if ( pSaveItem ) @@ -789,7 +790,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SetModified(sal_False); } - // Benutzer bricht ab? + // Cancelled by the user? if ( !PrepareClose( 2 ) ) { rReq.SetReturnValue( SfxBoolItem(0, sal_False) ); @@ -803,7 +804,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) rReq.SetReturnValue( SfxBoolItem(0, sal_True) ); rReq.Done(); - rReq.ReleaseArgs(); // da der Pool in Close zerst"ort wird + rReq.ReleaseArgs(); // because the pool is destroyed in Close DoClose(); return; } @@ -811,7 +812,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_DOCTEMPLATE: { - // speichern als Dokumentvorlagen + // save as document templates SfxDocumentTemplateDlg *pDlg = 0; SfxErrorContext aEc(ERRCTX_SFX_DOCTEMPLATE,GetTitle()); SfxDocumentTemplates *pTemplates = new SfxDocumentTemplates; @@ -875,7 +876,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) rReq.SetReturnValue( SfxBoolItem( 0, bOk ) ); if ( bOk ) { - // update the Organizer runtime cache from the template component if the cache has already been created + // update the Organizer runtime cache from the template + // component if the cache has already been created // TODO/LATER: get rid of this cache duplication SfxDocumentTemplates aTemplates; aTemplates.ReInitFromComponent(); @@ -890,7 +892,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } } - // Picklisten-Eintrag verhindern + // Prevent entry in the Pick-lists if ( rReq.IsAPI() ) GetMedium()->SetUpdatePickList( sal_False ); else if ( rReq.GetArgs() ) @@ -900,7 +902,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) GetMedium()->SetUpdatePickList( pPicklistItem->GetValue() ); } - // Ignore()-Zweige haben schon returnt + // Ignore()-branches have already returned rReq.Done(); } @@ -967,9 +969,10 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) SfxViewFrame *pFrame = GetFrame(); if ( pFrame && pFrame->GetFrame().GetParentFrame() ) { - // Wenn SID_CLOSEDOC "uber Menue etc. ausgef"uhrt wird, das - // aktuelle Dokument aber in einem Frame liegt, soll eigentlich - // das FrameSetDocument geclosed werden + + // If SID_CLOSEDOC is excecuted through menu and so on, but + // the current document is in a frame, then the + // FrameSetDocument should actually be closed. pDoc = pFrame->GetTopViewFrame()->GetObjectShell(); } @@ -1376,8 +1379,9 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) } else { - //When the document is modified then we must not show the digital signatures dialog - //If we have come here then the user denied to save. + // When the document is modified then we must not show the + // digital signatures dialog + // If we have come here then the user denied to save. if (!bHasSign) bNoSig = true; } |