diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:51:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-10-04 19:51:25 +0000 |
| commit | 9a259ba2f8a7548db5a6ae249a548c00c6e9267c (patch) | |
| tree | 8229ded03005ea12cb6c58d51670171f9154b659 /sfx2/source/dialog/mailmodel.cxx | |
| parent | 3cadf5418d12f1568e90a8467d5291a5dcf77264 (diff) | |
INTEGRATION: CWS mav09 (1.24.46); FILE MERGED
2004/07/07 17:18:50 mav 1.24.46.2: RESYNC: (1.24-1.25); FILE MERGED
2004/03/11 10:15:23 mav 1.24.46.1: #115904# move GUISaveAs out of SfxDocShell
Diffstat (limited to 'sfx2/source/dialog/mailmodel.cxx')
| -rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 1ec369b91f57..e1ff47378fa3 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmodel.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2004-06-17 15:56:23 $ + * last change: $Author: kz $ $Date: 2004-10-04 20:51:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,7 +261,6 @@ SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocument( String& rFileName if ( xDocShell.Is() && xDocShell->GetMedium() ) { // save old settings - BOOL bOldDidDangerousSave = xDocShell->Get_Impl()->bDidDangerousSave; BOOL bModified = xDocShell->IsModified(); // prepare for mail export SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher(); @@ -344,8 +343,6 @@ SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocument( String& rFileName // restore old settings if ( !bModified && xDocShell->IsEnableSetModified() ) xDocShell->SetModified( FALSE ); - if ( !bOldDidDangerousSave ) - xDocShell->Get_Impl()->bDidDangerousSave = sal_False; eRet = bRet ? SAVE_SUCCESSFULL : SAVE_ERROR; } @@ -362,7 +359,6 @@ SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName if ( xDocShell.Is() && xDocShell->GetMedium() ) { // save old settings - BOOL bOldDidDangerousSave = xDocShell->Get_Impl()->bDidDangerousSave; BOOL bModified = xDocShell->IsModified(); // prepare for mail export SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher(); @@ -431,8 +427,6 @@ SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName // restore old settings if ( !bModified && xDocShell->IsEnableSetModified() ) xDocShell->SetModified( FALSE ); - if ( !bOldDidDangerousSave ) - xDocShell->Get_Impl()->bDidDangerousSave = sal_False; } return eRet; |