From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Mon, 10 Jan 2011 16:11:35 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from svx
---
svx/source/unodraw/unopool.cxx | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
(limited to 'svx/source/unodraw/unopool.cxx')
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 17c32389e311..fd682129b184 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -124,22 +124,22 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
}
default:
{
- const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
+ const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
- BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+ sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( eMapUnit == SFX_MAPUNIT_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
// DVO, OD 10.10.2003 #i18732#
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- pPool->GetDefaultItem( pPool->GetWhich( (USHORT)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
+ pPool->GetDefaultItem( pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
}
}
// check for needed metric translation
- const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+ const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
{
SvxUnoConvertToMM( eMapUnit, rValue );
@@ -159,7 +159,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
{
uno::Any aValue( rValue );
- const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+ const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
{
SvxUnoConvertFromMM( eMapUnit, aValue );
@@ -193,7 +193,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
default:
{
::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
- BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+ sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( !pPool || (pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM) )
nMemberId &= (~CONVERT_TWIPS);
@@ -308,7 +308,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
// OD 10.10.2003 #i18732#
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+ const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
if ( pPool && pPool != mpDefaultsPool )
{
// OD 13.10.2003 #i18732# - use method <ResetPoolDefaultItem(..)>
@@ -326,7 +326,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
// using probably incompatible item pool <mpDefaultsPool>
uno::Any aAny;
SfxItemPool* pPool = getModelPool( sal_True );
- const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+ const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich );
pItem->QueryValue( aAny, pEntry->mnMemberId );
@@ -409,11 +409,11 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName
uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
const OUString * pArray = aSNL.getConstArray();
- for( INT32 i = 0; i < aSNL.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException )
--
cgit