Kaydet (Commit) 5325c5b2 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Michael Meeks

getFiles refactoring: kde4 part

before:
getFiles retrieves all files with their url
getSelectedFiles just returns getFiles result

after:
getSelectedFiles retrieves all files with their url
getFiles uses getSelectedFiles and truncates to 1 entry if necessary

See http://nabble.documentfoundation.org/Dev-f1639786.html for discussion

Conflicts:
	vcl/unx/kde4/KDE4FilePicker.cxx

Change-Id: I56a0e2bc877f93e28f08d5ebaafd1826a92cef8b
Reviewed-on: https://gerrit.libreoffice.org/17025Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst adfa89b5
......@@ -333,15 +333,9 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
SalYieldMutexReleaser release;
return Q_EMIT getFilesSignal();
}
KUrl::List urls = _dialog->selectedUrls();
uno::Sequence< OUString > seq( urls.size());
// multiselection doesn't really work
// so just retrieve the first url
uno::Sequence< OUString > seq = getSelectedFiles();
if (seq.getLength() > 1)
seq.realloc(1);
if (seq.getLength() == 1)
seq[0] = toOUString(urls.front().url());
return seq;
}
......@@ -352,8 +346,12 @@ uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
SalYieldMutexReleaser release;
return Q_EMIT getSelectedFilesSignal();
}
return getFiles();
KUrl::List urls = _dialog->selectedUrls();
uno::Sequence< OUString > seq( urls.size());
int i = 0;
foreach( const KUrl& url, urls )
seq[ i++ ]= toOUString( url.url());
return seq;
}
void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment