summaryrefslogtreecommitdiff
path: root/svx/source/items/algitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/items/algitem.cxx')
-rw-r--r--svx/source/items/algitem.cxx88
1 files changed, 44 insertions, 44 deletions
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 183db0e3a722..b5f399f2b88f 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -71,14 +71,14 @@ TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
// class SvxHorJustifyItem -----------------------------------------------
-SvxHorJustifyItem::SvxHorJustifyItem( const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)SVX_HOR_JUSTIFY_STANDARD )
+SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD )
{
}
SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
- const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eJustify )
+ const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)eJustify )
{
}
@@ -107,7 +107,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -151,7 +151,7 @@ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
-sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -178,7 +178,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break;
default: ; //prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
}
break;
case MID_HORJUST_ADJUST:
@@ -198,7 +198,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case style::ParagraphAdjust_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break;
case style::ParagraphAdjust_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break;
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
}
}
return sal_True;
@@ -206,7 +206,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
//------------------------------------------------------------------------
-XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const
+XubString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" );
return SVX_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal);
@@ -221,29 +221,29 @@ SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() );
}
//------------------------------------------------------------------------
-USHORT SvxHorJustifyItem::GetValueCount() const
+sal_uInt16 SvxHorJustifyItem::GetValueCount() const
{
return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1
}
// class SvxVerJustifyItem -----------------------------------------------
-SvxVerJustifyItem::SvxVerJustifyItem( const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)SVX_VER_JUSTIFY_STANDARD )
+SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)SVX_VER_JUSTIFY_STANDARD )
{
}
SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
- const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eJustify )
+ const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)eJustify )
{
}
@@ -273,7 +273,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -309,7 +309,7 @@ sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -329,7 +329,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case style::VerticalAlignment_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break;
default:;
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
break;
}
default:
@@ -352,7 +352,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case table::CellVertJustify_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break;
default: ; //prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
break;
}
}
@@ -362,7 +362,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
//------------------------------------------------------------------------
-XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const
+XubString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
return SVX_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal);
@@ -377,16 +377,16 @@ SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() );
}
//------------------------------------------------------------------------
-USHORT SvxVerJustifyItem::GetValueCount() const
+sal_uInt16 SvxVerJustifyItem::GetValueCount() const
{
return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1
}
@@ -394,12 +394,12 @@ USHORT SvxVerJustifyItem::GetValueCount() const
// class SvxOrientationItem ----------------------------------------------
SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
- const USHORT nId):
- SfxEnumItem( nId, (USHORT)eOrientation )
+ const sal_uInt16 nId):
+ SfxEnumItem( nId, (sal_uInt16)eOrientation )
{
}
-SvxOrientationItem::SvxOrientationItem( INT32 nRotation, BOOL bStacked, const USHORT nId ) :
+SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, const sal_uInt16 nId ) :
SfxEnumItem( nId )
{
SetFromRotation( nRotation, bStacked );
@@ -430,7 +430,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
table::CellOrientation eUno = table::CellOrientation_STANDARD;
switch ( (SvxCellOrientation)GetValue() )
@@ -444,7 +444,7 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) co
return sal_True;
}
-sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
table::CellOrientation eOrient;
if(!(rVal >>= eOrient))
@@ -463,13 +463,13 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
case table::CellOrientation_STACKED: eSvx = SVX_ORIENTATION_STACKED; break;
default: ; //prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
return sal_True;
}
//------------------------------------------------------------------------
-XubString SvxOrientationItem::GetValueText( USHORT nVal ) const
+XubString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" );
return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal);
@@ -484,30 +484,30 @@ SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() );
}
//------------------------------------------------------------------------
-USHORT SvxOrientationItem::GetValueCount() const
+sal_uInt16 SvxOrientationItem::GetValueCount() const
{
return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1
}
//------------------------------------------------------------------------
-BOOL SvxOrientationItem::IsStacked() const
+sal_Bool SvxOrientationItem::IsStacked() const
{
return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED;
}
-INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
+sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const
{
- INT32 nAngle = nStdAngle;
+ sal_Int32 nAngle = nStdAngle;
switch( static_cast< SvxCellOrientation >( GetValue() ) )
{
case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
@@ -517,7 +517,7 @@ INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
return nAngle;
}
-void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
+void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked )
{
if( bStacked )
{
@@ -533,7 +533,7 @@ void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
// class SvxMarginItem ---------------------------------------------------
-SvxMarginItem::SvxMarginItem( const USHORT nId ) :
+SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
@@ -550,7 +550,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
sal_Int16 nTop,
sal_Int16 nRight,
sal_Int16 nBottom,
- const USHORT nId ) :
+ const sal_uInt16 nId ) :
SfxPoolItem( nId ),
nLeftMargin ( nLeft ),
@@ -646,7 +646,7 @@ SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const
{
sal_Int16 nLeft;
sal_Int16 nTop;
@@ -661,7 +661,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
//------------------------------------------------------------------------
-SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
{
rStream << nLeftMargin;
rStream << nTopMargin;
@@ -673,7 +673,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -701,7 +701,7 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
generated by cgit (git 2.34.1) at 2024-07-13 06:28:02 +0000