diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 15:30:09 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-06 15:30:09 +0000 |
| commit | 6ab9136e04486755b9fc4fc2d760aaa51b7a37a8 (patch) | |
| tree | 17157472f8feed420ee9f40f554aa50b19b59d0a /fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | |
| parent | e49c1096e69954440772760c56167da5892d6cd3 (diff) | |
INTEGRATION: CWS mingwport13 (1.3.6); FILE MERGED
2008/05/07 09:56:14 vg 1.3.6.1: #i88772# MinGW fixes for DEV300
Diffstat (limited to 'fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 480ee56ebab1..e82d21e2e6e1 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VistaFilePickerEventHandler.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -148,7 +148,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* pDialog) if ( FAILED(hr) ) return ::rtl::OUString(); - ::rtl::OUString sURL = ::rtl::OUString(pStr); + ::rtl::OUString sURL = ::rtl::OUString(reinterpret_cast<sal_Unicode*>(pStr)); CoTaskMemFree (pStr); return sURL; } @@ -163,8 +163,13 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) TFileOpenDialog iOpen ; TFileDialogCustomize iCustomize; +#ifdef __MINGW32__ + iDialog->QueryInterface(IID_IFileOpenDialog, (void**)(&iOpen)); + iDialog->QueryInterface(IID_IFileDialogCustomize, (void**)(&iCustomize)); +#else iDialog.query(&iOpen ); iDialog.query(&iCustomize); +#endif // make sure version list match to the current selection always ... // at least an empty version list will be better then the wrong one .-) @@ -223,7 +228,7 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) for (::sal_Int32 i=0; i<lVersions.getLength(); ++i) { const css::util::RevisionTag& aTag = lVersions[i]; - iCustomize->AddControlItem(CONTROL_VERSIONLIST, i, aTag.Identifier); + iCustomize->AddControlItem(CONTROL_VERSIONLIST, i, reinterpret_cast<LPCTSTR>(aTag.Identifier.getStr())); } iCustomize->SetSelectedControlItem(CONTROL_VERSIONLIST, 0); } |