diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-25 21:47:16 +0200 |
| commit | 4c8fba36e0b8955ecb49293e6218829ad7cd40a9 (patch) | |
| tree | d24e9d1b546873c85d4f5aaef4b719a315692ca3 /fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | |
| parent | e3441919174583045e0b7c8110b2a2d4119b66d1 (diff) | |
| parent | 5228b9163b7c889a62b553e543fea51800099f7a (diff) | |
merge commit
Diffstat (limited to 'fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx')
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 088f0e0326..2b9bda83b8 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -781,7 +781,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest) // Note further: we must react different if dialog is in execute or not .-( ComPtr< IShellItem > iItem; ComPtr< IShellItemArray > iItems; - HRESULT hResult; + HRESULT hResult = E_FAIL; if (iOpen.is()) { @@ -804,7 +804,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest) } if (FAILED(hResult)) - return; + return; // convert and pack results TStringList lFiles; @@ -917,7 +917,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest) } - HRESULT hResult; + HRESULT hResult = E_FAIL; try { // show dialog and wait for user decision |