diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:51:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:51:06 +0000 |
| commit | 64cba5820af733e9c7d86da32169c1d1c810a48c (patch) | |
| tree | 72bb90e115b08b220783743312c22f06701bb27b /sfx2/source/appl/appopen.cxx | |
| parent | 739214798c225d388806703e390f21467fea5823 (diff) | |
INTEGRATION: CWS fwk20 (1.96.8); FILE MERGED
2005/08/15 09:49:56 pb 1.96.8.1: fix: #i49802# security warning removed
Diffstat (limited to 'sfx2/source/appl/appopen.cxx')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 5e15eee180..55a82a60da 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.97 $ + * $Revision: 1.98 $ * - * last change: $Author: rt $ $Date: 2005-09-07 17:35:43 $ + * last change: $Author: hr $ $Date: 2005-09-23 15:51:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -398,7 +398,7 @@ ULONG CheckPasswd_Impl try { - ::comphelper::OStorageHelper::SetCommonStoragePassword( + ::comphelper::OStorageHelper::SetCommonStoragePassword( xStorage, pPasswordRequest->getPassword() ); } @@ -1204,7 +1204,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) osl::Directory aDir( aURL.Main ); sal_Bool bIsDir = ( aDir.open() == osl::Directory::E_None ); - if ( !bIsDir && !aExtendedSecurityOptions.IsSecureHyperlink( aURL.Complete )) +/*!!! pb: #i49802# no security warning any longer + if ( !bIsDir && !aExtendedSecurityOptions.IsSecureHyperlink( aURL.Complete ) ) { // Security check for local files depending on the extension vos::OGuard aGuard( Application::GetSolarMutex() ); @@ -1226,6 +1227,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if( aSecurityWarningBox.Execute() == RET_NO ) return; } +*/ } } else if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER ) |