diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-14 17:34:17 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-14 17:34:17 +0000 |
| commit | 697a77f6ec0a837e6b9b8bf26369c6af8ca8ffd0 (patch) | |
| tree | d62c2f7c000aaac8ff28e13fb2a1c9bc2c7deeef /sc/source/ui/unoobj/appluno.cxx | |
| parent | bd2ea8f871ca6dc02f09af5f55c5c5c6fd511a91 (diff) | |
fix misc merge issues breaking the build
Diffstat (limited to 'sc/source/ui/unoobj/appluno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/appluno.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index bdafcadfb4f3..49d88e2f2d26 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -698,8 +698,8 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( throw(uno::RuntimeException) { SolarMutexGuard aGuard; - sal_uInt16 nCount = (sal_uInt16) Min( aRecentFunctionIds.getLength(), (INT32) LRU_MAX ); - const INT32* pAry = aRecentFunctionIds.getConstArray(); + sal_uInt16 nCount = (sal_uInt16) Min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX ); + const sal_Int32* pAry = aRecentFunctionIds.getConstArray(); sal_uInt16* pFuncs = nCount ? new sal_uInt16[nCount] : NULL; for (sal_uInt16 i=0; i<nCount; i++) |