diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:27:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:27:26 +0000 |
| commit | a9b34fea3aa9ffacf0c738564f4ab01c5cd7aaff (patch) | |
| tree | 7c35adc1161125c818edae7c815a8b8f2a2eb852 /vcl/os2 | |
| parent | 44f781ab31636648dce103e5f7b8d5ed83a63936 (diff) | |
INTEGRATION: CWS os2port03 (1.6.116); FILE MERGED
2008/07/16 13:38:54 obr 1.6.116.2: RESYNC: (1.6-1.7); FILE MERGED
2008/04/15 14:42:28 ydario 1.6.116.1: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
Diffstat (limited to 'vcl/os2')
| -rw-r--r-- | vcl/os2/source/app/salinst.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index 38dbcfb4a39d..4d0c5168bef3 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salinst.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -789,7 +789,8 @@ void Os2SalInstance::DestroyFrame( SalFrame* pFrame ) // ----------------------------------------------------------------------- SalObject* Os2SalInstance::CreateObject( SalFrame* pParent, - SystemWindowData* /*pWindowData*/ ) // SystemWindowData meaningless on Windows + SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows + BOOL /*bShow*/ ) { // Um auf Main-Thread umzuschalten return (SalObject*)WinSendMsg( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (MPARAM)pParent ); |