diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 15:26:44 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-19 15:26:44 +0000 |
| commit | 118a3543fae309bd59944e2605b63e44b46876be (patch) | |
| tree | d2c0d05b4b9842ac97267b613b78558b8f1b9f7e /fpicker | |
| parent | 39e8cebfef462f760f879101acc4c35dea69ded8 (diff) | |
INTEGRATION: CWS as6 (1.27.10); FILE MERGED
2007/08/14 09:27:04 as 1.27.10.1: #i78850# make AutoExtension control obsolete; #i63263# improve multi selection mode
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index 5b48594315cc..cea939e337ff 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: WinFileOpenImpl.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: rt $ $Date: 2007-07-03 13:57:26 $ + * last change: $Author: ihi $ $Date: 2007-11-19 16:26:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,7 +112,7 @@ using namespace com::sun::star; using com::sun::star::ui::dialogs::FilePickerEvent; using com::sun::star::lang::IllegalArgumentException; -using com::sun::star::ui::dialogs::XFilePicker; +using com::sun::star::ui::dialogs::XFilePicker2; using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; @@ -196,7 +196,7 @@ void CWinFileOpenImpl::setDisplayDirectory(const rtl::OUString& aDirectory) ::osl::FileBase::getSystemPathFromFileURL(aDirectory,aSysDirectory)) throw IllegalArgumentException( rtl::OUString::createFromAscii("Invalid directory"), - static_cast<XFilePicker*>(m_FilePicker), 1); + static_cast<XFilePicker2*>(m_FilePicker), 1); // we ensure that there is a trailing '/' at the end of // he given file url, because the windows functions only @@ -267,7 +267,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException) else throw uno::RuntimeException( rtl::OUString::createFromAscii("Error executing dialog"), - static_cast<XFilePicker*>(m_FilePicker)); + static_cast<XFilePicker2*>(m_FilePicker)); return rc; } @@ -286,7 +286,7 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const rtl::OUString& aTitle, const if (!bRet) throw IllegalArgumentException( rtl::OUString::createFromAscii("filter already exists"), - static_cast<XFilePicker*>(m_FilePicker), 1); + static_cast<XFilePicker2*>(m_FilePicker), 1); // #95345# see MSDN OPENFILENAME // If nFilterIndex is zero and lpstrCustomFilter is NULL, @@ -311,7 +311,7 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const rtl::OUString& aTitle) if (filterPos < 0) throw IllegalArgumentException( rtl::OUString::createFromAscii("filter doesn't exist"), - static_cast<XFilePicker*>(m_FilePicker), 1); + static_cast<XFilePicker2*>(m_FilePicker), 1); // filter index of the base class starts with 1 CFileOpenDialog::setFilterIndex(filterPos + 1); |