diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
| commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
| tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /extensions/source/plugin/base/xplugin.cxx | |
| parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
| parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'extensions/source/plugin/base/xplugin.cxx')
| -rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 1eac4dd9c983..38039f4fa7f9 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -86,7 +86,7 @@ void PluginDisposer::onShot() { if( m_pPlugin->isDisposable() ) { - ULONG nEvent; + sal_uLong nEvent; Application::PostUserEvent( nEvent, LINK( m_pPlugin, XPlugin_Impl, secondLevelDispose ), (void*)m_pPlugin ); } } @@ -1020,7 +1020,7 @@ void PluginInputStream::load() aUrl.SetSmartProtocol( INET_PROT_FILE ); aUrl.SetSmartURL( String( getStream()->url, - ::sal::static_int_cast< USHORT, size_t >( strlen( getStream()->url ) ), + ::sal::static_int_cast< sal_uInt16, size_t >( strlen( getStream()->url ) ), RTL_TEXTENCODING_MS_1252 ) ); try @@ -1065,8 +1065,8 @@ void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw() if( m_nMode == -1 || !m_pPlugin->getPluginComm() ) return; - UINT32 nPos = m_aFileStream.Tell(); - UINT32 nBytes = 0; + sal_uInt32 nPos = m_aFileStream.Tell(); + sal_uInt32 nBytes = 0; while( m_nMode != NP_ASFILEONLY && m_nWritePos < nPos && (nBytes = m_pPlugin->getPluginComm()-> NPP_WriteReady( |