diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:53 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:53 +0100 |
| commit | e8216218859b2a01a4e9b7f6ff07d79c06d8f444 (patch) | |
| tree | 8bad69041e6324593f25224f01bcb15aea0876e4 /extensions | |
| parent | 227745b536e12358db1d92369ca5321ac53f44ef (diff) | |
| parent | 7f9327e90e1e04325ad091f1e20995da4cb2e929 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
package/source/zippackage/ZipPackageFolder.cxx
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/ole/unoobjw.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/sysplug.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 336a3a62b225..fe1ff488c154 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -929,7 +929,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT * // try to write back out parameter if (outIndex.getLength() > 0) { - const INT16* pOutIndex = outIndex.getConstArray(); + const sal_Int16* pOutIndex = outIndex.getConstArray(); const Any* pOutParams = outParams.getConstArray(); for (sal_Int32 i = 0; i < outIndex.getLength(); i++) diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index dac8a24a52c3..018f7cf53f27 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -117,7 +117,7 @@ UnxPluginComm::~UnxPluginComm() int status = 16777216; pid_t nExit = waitpid( m_nCommPID, &status, WUNTRACED ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", nExit, m_nCommPID, WEXITSTATUS(status) ); + fprintf( stderr, "child %d (plugin app child %d) exited with status %d\n", (int)nExit, (int)m_nCommPID, (int)WEXITSTATUS(status) ); #else (void)nExit; #endif |