diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:36:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:36:52 +0000 |
| commit | 9f0e9492d6780b8d4453c508dec566a6b4ed709a (patch) | |
| tree | 3a9d84730be2a0319bfa0c366c0fb14c72c56acf /sfx2 | |
| parent | d03864ef96af43d1bab0b33ef90f55a68e8cd31d (diff) | |
INTEGRATION: CWS recovery04 (1.83.36); FILE MERGED
2004/10/15 03:30:29 hro 1.83.36.2: RESYNC: (1.83-1.86); FILE MERGED
2004/07/23 13:54:22 hro 1.83.36.1: #i20882# Merging from recovery03
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 422868b99b54..a15778f95fe8 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.90 $ + * $Revision: 1.91 $ * - * last change: $Author: obo $ $Date: 2004-11-19 11:30:11 $ + * last change: $Author: rt $ $Date: 2004-11-26 14:36:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -478,7 +478,6 @@ SfxApplication::SfxApplication() pImp->pStbCtrlFac = 0; pImp->pViewFrames = 0; pImp->pObjShells = 0; - pImp->bAutoSaveNow = sal_False; pImp->pTemplateDlg = 0; pImp->pBasicLibContainer = 0; pImp->pDialogLibContainer = 0; @@ -487,7 +486,6 @@ SfxApplication::SfxApplication() pImp->pOfaResMgr = 0; pImp->pSimpleResManager = 0; pImp->nWarnLevel = 0; - pImp->pAutoSaveTimer = 0; pAppData_Impl = new SfxAppData_Impl( this ); pAppData_Impl->UpdateApplicationSettings( SvtMenuOptions().IsEntryHidingEnabled() ); @@ -815,13 +813,9 @@ short SfxApplication::QuerySave_Impl( SfxObjectShell& rDoc, sal_Bool bAutoSave ) SfxFrame *pFrame = SfxViewFrame::GetFirst(&rDoc)->GetFrame(); pFrame->Appear(); - WinBits nBits = WB_YES_NO_CANCEL; - nBits |= bAutoSave ? WB_DEF_YES : WB_DEF_NO; + WinBits nBits = WB_YES_NO_CANCEL | WB_DEF_NO; QueryBox aBox( &pFrame->GetWindow(), nBits, aMsg ); - if ( bAutoSave ) - aBox.SetText( String( SfxResId( STR_AUTOSAVE ) ) ); - return aBox.Execute(); } |