diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 16:03:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 16:03:40 +0000 |
| commit | 14f4eb278fd81739dc5c591edfd9ad0eba0f5c02 (patch) | |
| tree | f78d94c9683f4f8903ca6969783108f02fbd4d6d /fpicker/source | |
| parent | 3700e51c87a893ed0289074bd343d9d6c1d4e54e (diff) | |
INTEGRATION: CWS hro02 (1.11.34); FILE MERGED
2006/02/06 15:12:20 hro 1.11.34.1: #122828# #122884# #124842# Initialize OLE/COM in every STA thread
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/win32/folderpicker/MtaFop.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 814aa01742..240607df52 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MtaFop.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:49:54 $ + * last change: $Author: rt $ $Date: 2006-02-09 17:03:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -796,7 +796,14 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) OSL_ASSERT( pInst ); - return pInst->run( ); + HRESULT hr = OleInitialize( NULL ); + + unsigned int result = pInst->run( ); + + if ( SUCCEEDED( hr ) ) + OleUninitialize(); + + return result; } //--------------------------------------------------- |