diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 12:03:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 12:03:15 +0000 |
| commit | 0b6353334eccf2e62ad6a40b127dcf14d843b357 (patch) | |
| tree | 68e68f9d09948bd09685e7b29392be3aebd92b47 /sfx2 | |
| parent | 32932405dcf0a6010800a92d22f6a7c3c58cac8d (diff) | |
INTEGRATION: CWS swwarnings (1.2.6); FILE MERGED
2007/08/21 11:19:46 tl 1.2.6.3: RESYNC: (1.3-1.4); FILE MERGED
2007/05/29 19:45:16 os 1.2.6.2: RESYNC: (1.2-1.3); FILE MERGED
2007/04/17 07:51:30 tl 1.2.6.1: #i69287# warning-free code
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/childwin.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index 595feefc6bd4..61ea7d68df53 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -4,9 +4,9 @@ * * $RCSfile: childwin.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2007-07-18 09:00:44 $ + * last change: $Author: hr $ $Date: 2007-09-27 13:03:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -291,13 +291,16 @@ public: SfxChildWindowContext* __EXPORT Class::CreateImpl( Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ - SfxChildWindowContext *pContext = new Class(pParent,ShellClass::GetInterfaceId(),pBindings,pInfo);\ + SfxChildWindowContext *pContext = new Class(pParent, \ + /* cast is safe here! */static_cast< USHORT >(ShellClass::GetInterfaceId()), \ + pBindings,pInfo); \ return pContext; \ } \ void Class::RegisterChildWindowContext(SfxModule* pMod) \ { \ SfxChildWinContextFactory *pFact = new SfxChildWinContextFactory( \ - Class::CreateImpl, ShellClass::GetInterfaceId() ); \ + Class::CreateImpl, \ + /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()) ); \ SfxChildWindowContext::RegisterChildWindowContext(pMod, MyID, pFact); \ } |