diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:01:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:01:53 +0000 |
| commit | e0bbf8f970707fd8dff52a2768dc07143794611d (patch) | |
| tree | bbdd43997bb309003faa864db5011186df7cb3f0 /toolkit | |
| parent | 32cedb1e4de76fe52f5c3b7e9523f039927b7786 (diff) | |
INTEGRATION: CWS warnings01 (1.45.20); FILE MERGED
2006/05/23 22:46:43 sb 1.45.20.2: RESYNC: (1.45-1.46); FILE MERGED
2005/11/11 16:47:33 pl 1.45.20.1: #i55991# removed warnings
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index af2e044bb64a..44596c7fad0e 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclxtoolkit.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: rt $ $Date: 2006-05-04 08:24:03 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:01:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -400,6 +400,8 @@ static ComponentInfo __FAR_DATA aComponentInfos [] = { "workwindow", WINDOW_WORKWINDOW } }; +extern "C" +{ static int #if defined( WNT ) __cdecl @@ -412,6 +414,7 @@ _Optlink return( strcmp( ((ComponentInfo*)pFirst)->pName, ((ComponentInfo*)pSecond)->pName ) ); } +} sal_uInt16 ImplGetComponentType( const String& rServiceName ) { @@ -494,6 +497,8 @@ struct ToolkitThreadData } }; +extern "C" +{ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) { ToolkitThreadData * pTTD = (ToolkitThreadData *)pArgs; @@ -539,7 +544,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) } delete pTTD; } - +} // contructor, which might initialize VCL VCLXToolkit::VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ): @@ -686,7 +691,7 @@ void SAL_CALL VCLXToolkit::disposing() if ( hSvToolsLib ) { ::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM( "CreateWindow" ) ); - fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getSymbol( hSvToolsLib, aFunctionName.pData ); + fnSvtCreateWindow = (FN_SvtCreateWindow)osl_getFunctionSymbol( hSvToolsLib, aFunctionName.pData ); } } // ask the SvTool creation function @@ -1127,7 +1132,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, } // ::com::sun::star::awt::XSystemChildFactory -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 nSystemType ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType ) throw(::com::sun::star::uno::RuntimeException) { Window* pChildWindow = NULL; if ( nSystemType == SYSTEM_DEPENDENT_TYPE ) @@ -1428,7 +1433,7 @@ void SAL_CALL VCLXToolkit::removeFocusListener( // virtual void SAL_CALL VCLXToolkit::fireFocusGained( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const & source) + ::com::sun::star::uno::XInterface > const &) throw (::com::sun::star::uno::RuntimeException) { } @@ -1436,7 +1441,7 @@ void SAL_CALL VCLXToolkit::fireFocusGained( // virtual void SAL_CALL VCLXToolkit::fireFocusLost( ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > const & source) + ::com::sun::star::uno::XInterface > const &) throw (::com::sun::star::uno::RuntimeException) { } |