summaryrefslogtreecommitdiff
path: root/svx/source/dialog/rulritem.cxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /svx/source/dialog/rulritem.cxx
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
Diffstat (limited to 'svx/source/dialog/rulritem.cxx')
-rw-r--r--svx/source/dialog/rulritem.cxx98
1 files changed, 49 insertions, 49 deletions
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 331c38d6bdd6..fa6936e7581e 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -63,7 +63,7 @@ String SvxLongLRSpaceItem::GetValueText() const
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
-sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -77,7 +77,7 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
rVal <<= aLeftRightMargin;
- return TRUE;
+ return sal_True;
}
case MID_LEFT: nVal = lLeft; break;
@@ -89,11 +89,11 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
nVal = TWIP_TO_MM100( nVal );
rVal <<= nVal;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -150,7 +150,7 @@ SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const
//------------------------------------------------------------------------
-SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, USHORT nId)
+SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId)
: SfxPoolItem(nId),
lLeft(lL),
lRight(lR)
@@ -189,7 +189,7 @@ String SvxLongULSpaceItem::GetValueText() const
return String();
}
-sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -203,7 +203,7 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
aUpperLowerMargin.Upper = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
aUpperLowerMargin.Lower = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
rVal <<= aUpperLowerMargin;
- return TRUE;
+ return sal_True;
}
case MID_UPPER: nVal = lLeft; break;
@@ -215,11 +215,11 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
nVal = TWIP_TO_MM100( nVal );
rVal <<= nVal;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -275,7 +275,7 @@ SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const
//------------------------------------------------------------------------
-SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, USHORT nId)
+SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId)
: SfxPoolItem(nId),
lLeft(lL),
lRight(lR)
@@ -307,7 +307,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
}
-sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -322,7 +322,7 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
aPagePosSize.Width = lWidth;
aPagePosSize.Height = lHeight;
rVal <<= aPagePosSize;
- return TRUE;
+ return sal_True;
}
case MID_X: nVal = aPos.X(); break;
@@ -334,10 +334,10 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
}
rVal <<= nVal;
- return TRUE;
+ return sal_True;
}
-sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
@@ -432,7 +432,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem()
void SvxColumnItem::DeleteAndDestroyColumns()
{
- for( USHORT i = aColumns.Count(); i>0; )
+ for( sal_uInt16 i = aColumns.Count(); i>0; )
{
SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i];
aColumns.Remove( i );
@@ -450,19 +450,19 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
nRight != ((const SvxColumnItem&)rCmp).nRight ||
bTable != ((const SvxColumnItem&)rCmp).bTable ||
Count() != ((const SvxColumnItem&)rCmp).Count())
- return FALSE;
+ return sal_False;
- const USHORT nCount = ((const SvxColumnItem&)rCmp).Count();
- for(USHORT i = 0; i < nCount;++i) {
+ const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
+ for(sal_uInt16 i = 0; i < nCount;++i) {
#if OSL_DEBUG_LEVEL > 1
SvxColumnDescription *p1, *p2;
p1 = (SvxColumnDescription *)aColumns[i];
p2 = (SvxColumnDescription *)((const SvxColumnItem&)rCmp).aColumns[i];
#endif
if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
@@ -494,30 +494,30 @@ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool * ) const
//------------------------------------------------------------------------
-SvxColumnItem::SvxColumnItem( USHORT nAct ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
SfxPoolItem( SID_RULER_BORDERS ),
nLeft ( 0 ),
nRight ( 0 ),
nActColumn ( nAct ),
- bTable ( FALSE ),
- bOrtho (TRUE )
+ bTable ( sal_False ),
+ bOrtho (sal_True )
{
}
//------------------------------------------------------------------------
-SvxColumnItem::SvxColumnItem( USHORT nActCol, USHORT left, USHORT right ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) :
SfxPoolItem( SID_RULER_BORDERS ),
nLeft ( left ),
nRight ( right ),
nActColumn ( nActCol ),
- bTable ( TRUE ),
- bOrtho ( TRUE )
+ bTable ( sal_True ),
+ bOrtho ( sal_True )
{
}
@@ -527,7 +527,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
SfxPoolItem( rCopy ),
- aColumns ( (BYTE)rCopy.Count() ),
+ aColumns ( (sal_uInt8)rCopy.Count() ),
nLeft ( rCopy.nLeft ),
nRight ( rCopy.nRight ),
nActColumn( rCopy.nActColumn ),
@@ -535,9 +535,9 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
bOrtho ( rCopy.bOrtho )
{
- const USHORT nCount = rCopy.Count();
+ const sal_uInt16 nCount = rCopy.Count();
- for ( USHORT i = 0; i < nCount; ++i )
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
Append( rCopy[i] );
}
@@ -557,37 +557,37 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy)
bTable = rCopy.bTable;
nActColumn = rCopy.nActColumn;
DeleteAndDestroyColumns();
- const USHORT nCount = rCopy.Count();
- for(USHORT i = 0; i < nCount;++i)
+ const sal_uInt16 nCount = rCopy.Count();
+ for(sal_uInt16 i = 0; i < nCount;++i)
Insert(rCopy[i], i);
return *this;
}
//------------------------------------------------------------------------
-BOOL SvxColumnItem::CalcOrtho() const
+sal_Bool SvxColumnItem::CalcOrtho() const
{
- const USHORT nCount = Count();
+ const sal_uInt16 nCount = Count();
DBG_ASSERT(nCount >= 2, "keine Spalten");
if(nCount < 2)
- return FALSE;
+ return sal_False;
long nColWidth = (*this)[0].GetWidth();
- for(USHORT i = 1; i < nCount; ++i) {
+ for(sal_uInt16 i = 1; i < nCount; ++i) {
if( (*this)[i].GetWidth() != nColWidth)
- return FALSE;
+ return sal_False;
}
//!! Breite Trenner
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
long SvxColumnItem::GetVisibleRight() const
{
- USHORT nIdx = 0;
+ sal_uInt16 nIdx = 0;
- for ( USHORT i = 0; i < nActColumn; ++i )
+ for ( sal_uInt16 i = 0; i < nActColumn; ++i )
{
if ( (*this)[i].bVisible )
++nIdx;
@@ -595,7 +595,7 @@ long SvxColumnItem::GetVisibleRight() const
return (*this)[nIdx].nEnd;
}
-sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -615,7 +615,7 @@ sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
return sal_True;
}
-sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Int32 nVal = 0;
@@ -627,9 +627,9 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
}
case MID_RIGHT: rVal >>= nRight; break;
case MID_LEFT: rVal >>= nLeft; break;
- case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break;
- case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break;
- case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break;
+ case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break;
+ case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break;
+ case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break;
default: DBG_ERROR("Wrong MemberId!"); return sal_False;
}
@@ -678,7 +678,7 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const
//------------------------------------------------------------------------
SvxObjectItem::SvxObjectItem( long nSX, long nEX,
- long nSY, long nEY, BOOL limits ) :
+ long nSY, long nEY, sal_Bool limits ) :
SfxPoolItem( SID_RULER_OBJECT ),
@@ -706,7 +706,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
{
}
-sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -721,13 +721,13 @@ sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
return sal_False;
}
- return TRUE;
+ return sal_True;
}
-sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
switch ( nMemberId )
{
case MID_START_X : bRet = (rVal >>= nStartX); break;
generated by cgit (git 2.34.1) at 2025-03-24 21:43:47 +0000