diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 12:48:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 12:48:40 +0000 |
| commit | 136393415c91915a4fe8348b3bd3cdf4e7bae2e1 (patch) | |
| tree | 15314d96636c51ed95a407f5362ce8f40828a328 /sc/source/ui/docshell | |
| parent | 1247da90e1024a74633446d9dd095513ba554e23 (diff) | |
INTEGRATION: CWS dr34 (1.78.2); FILE MERGED
2005/02/25 13:51:35 dr 1.78.2.2: #i42858# do not warn multiple times
2005/02/25 12:41:41 dr 1.78.2.1: #i42858# do not warn multiple times
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 5416dbaf9460..71ed62a97831 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: vg $ $Date: 2005-03-23 13:04:31 $ + * last change: $Author: rt $ $Date: 2005-03-29 13:48:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1780,10 +1780,15 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) aDocument.SetExtDocOptions( pExtDocOpt = new ScExtDocOptions ); pViewShell->GetViewData()->WriteExtOptions( *pExtDocOpt ); - // if the imported document contained an encrypted - // password - determine if we should save without it. - if( pExtDocOpt && pExtDocOpt->GetDocSettings().mbEncrypted ) + /* #115980 #If the imported document contained an encrypted password - + determine if we should save without it. */ + ScExtDocSettings& rDocSett = pExtDocOpt->GetDocSettings(); + if( rDocSett.mbEncrypted ) + { bDoSave = ScWarnPassword::WarningOnPassword( rMed ); + // #i42858# warn only on time + rDocSett.mbEncrypted = false; + } } if( bDoSave ) |