diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:59:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 15:59:45 +0000 |
| commit | ad4a03ff5e4a789ec5d5523fe8e399b7baec9e36 (patch) | |
| tree | 81ee72d5c5bbb166f365f17d482ea33d196d559a /sfx2/source | |
| parent | f023a1b3e28d32d7360f9f8bb5db3434ebd40577 (diff) | |
INTEGRATION: CWS fwkpostbeta02 (1.113.2); FILE MERGED
2005/02/11 10:56:33 mba 1.113.2.1: #i42433#: handle document revision through a UNO API
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index a36ad55834ac..2d896d795bb0 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filedlghelper.cxx,v $ * - * $Revision: 1.114 $ + * $Revision: 1.115 $ * - * last change: $Author: vg $ $Date: 2005-02-16 18:22:13 $ + * last change: $Author: vg $ $Date: 2005-02-21 16:59:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -791,21 +791,14 @@ void FileDialogHelper_Impl::updateVersions() if ( !xStorage.is() ) throw uno::RuntimeException(); - SfxVersionTableDtor* pVerTable = SfxMedium::GetVersionList( xStorage ); + uno::Sequence < util::RevisionTag > xVersions = SfxMedium::GetVersionList( xStorage ); - if ( pVerTable ) - { - SvStringsDtor* pVersions = pVerTable->GetVersions(); - - aEntries.realloc( pVersions->Count() + 1 ); - aEntries[0] = OUString( String ( SfxResId( STR_SFX_FILEDLG_ACTUALVERSION ) ) ); + aEntries.realloc( xVersions.getLength() + 1 ); + aEntries[0] = OUString( String ( SfxResId( STR_SFX_FILEDLG_ACTUALVERSION ) ) ); - for ( USHORT i = 0; i < pVersions->Count(); i++ ) - aEntries[ i + 1 ] = OUString( *(pVersions->GetObject(i)) ); + for ( sal_Int32 i=0; i<xVersions.getLength(); i++ ) + aEntries[ i + 1 ] = xVersions[i].Identifier; - delete pVersions; - delete pVerTable; - } // TODO/LATER: not sure that this information must be shown in future ( binfilter? ) //REMOVE else //REMOVE { @@ -1455,8 +1448,9 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, SfxItemSet *& rpSet, String& rFilter ) { - // rpSet is in/out parameter, usually just a media-descriptor that - // can be changed by dialog + // rFilter is a pure output parameter, it shouldn't be used for anything else + // changing this would surely break code + // rpSet is in/out parameter, usually just a media-descriptor that can be changed by dialog Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); |