diff options
| author | Dirk Völzke <dv@openoffice.org> | 2001-06-22 06:41:36 +0000 |
|---|---|---|
| committer | Dirk Völzke <dv@openoffice.org> | 2001-06-22 06:41:36 +0000 |
| commit | ededda01be8d57a3e1376bc2ef403d7fb650f1c4 (patch) | |
| tree | 094fb739bcf5984793ddd1d4bf138593e2bf203d /sfx2 | |
| parent | 7a57da5d8dcf6e3c79b5be00df5a8e606fe64076 (diff) | |
#84092# execute() should clear parameters first before returning
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 7e5d8a8f91ff..f3f4376c4680 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filedlghelper.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: dv $ $Date: 2001-06-21 12:21:14 $ + * last change: $Author: dv $ $Date: 2001-06-22 07:41:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -388,7 +388,8 @@ void FileDialogHelper_Impl::updateVersions() if ( aObj.GetProtocol() == INET_PROT_FILE ) { - SfxMedium aMed( aObj.GetMainURL(), SFX_STREAM_READONLY_MAKECOPY, TRUE ); + SfxMedium aMed( aObj.GetMainURL( INetURLObject::NO_DECODE ), + SFX_STREAM_READONLY_MAKECOPY, TRUE ); const SfxVersionTableDtor* pVerTable = aMed.GetVersionList(); if ( pVerTable ) @@ -654,15 +655,12 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, SfxItemSet *& rpSet, String& rFilter ) { - Reference< XFilterManager > xFltMgr( mxFileDlg, UNO_QUERY ); - - if ( ! mxFileDlg.is() || !xFltMgr.is() ) - return ERRCODE_ABORT; - rpSet = NULL; rpURLList = NULL; - if ( ! mxFileDlg.is() ) + Reference< XFilterManager > xFltMgr( mxFileDlg, UNO_QUERY ); + + if ( ! mxFileDlg.is() || !xFltMgr.is() ) return ERRCODE_ABORT; if ( maCurFilter.getLength() ) @@ -1264,7 +1262,7 @@ void FileDialogHelper::SetDisplayDirectory( const String& rPath ) INetURLObject aURL( rPath, INET_PROT_FILE ); if ( INET_PROT_NOT_VALID != aURL.GetProtocol() ) - mpImp->setPath( aURL.GetMainURL() ); + mpImp->setPath( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); } // ------------------------------------------------------------------------ |