summaryrefslogtreecommitdiff
path: root/svx/source/items/chrtitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/items/chrtitem.cxx')
-rw-r--r--svx/source/items/chrtitem.cxx88
1 files changed, 44 insertions, 44 deletions
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 474bf19f7bd6..114ce405bb69 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -66,14 +66,14 @@ TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0));
|*
*************************************************************************/
-SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, USHORT nId) :
- SfxEnumItem(nId, (USHORT)eStyle)
+SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eStyle)
{
}
// -----------------------------------------------------------------------
-SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, USHORT nId) :
+SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -87,7 +87,7 @@ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartStyleItem(rIn, Which());
}
@@ -99,14 +99,14 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
*************************************************************************/
SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr eDataDescr,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eDataDescr)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eDataDescr)
{
}
// -----------------------------------------------------------------------
-SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, USHORT nId) :
+SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -120,7 +120,7 @@ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartDataDescrItem(rIn, Which());
}
@@ -132,14 +132,14 @@ SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
*************************************************************************/
SvxChartLegendPosItem::SvxChartLegendPosItem(SvxChartLegendPos eLegendPos,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eLegendPos)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eLegendPos)
{
}
// -----------------------------------------------------------------------
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, USHORT nId) :
+SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -153,7 +153,7 @@ SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartLegendPosItem(rIn, Which());
}
@@ -165,14 +165,14 @@ SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
*************************************************************************/
SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrder)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrder)
{
}
// -----------------------------------------------------------------------
-SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -186,14 +186,14 @@ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartTextOrderItem(rIn, Which());
}
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -218,7 +218,7 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BY
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -247,7 +247,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
return sal_False;
}
- SetValue( (USHORT)eOrder );
+ SetValue( (sal_uInt16)eOrder );
return sal_True;
}
@@ -259,14 +259,14 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
*************************************************************************/
SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -280,7 +280,7 @@ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartTextOrientItem(rIn, Which());
}
@@ -291,7 +291,7 @@ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) cons
|*
*************************************************************************/
-SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
SfxPoolItem(nId),
fVal(fValue)
{
@@ -299,7 +299,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
// -----------------------------------------------------------------------
-SvxDoubleItem::SvxDoubleItem(SvStream& rIn, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) :
SfxPoolItem(nId)
{
rIn >> fVal;
@@ -355,7 +355,7 @@ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
+SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
{
double _fVal;
rIn >> _fVal;
@@ -364,7 +364,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
// -----------------------------------------------------------------------
-SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const
+SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const
{
rOut << fVal;
return rOut;
@@ -395,14 +395,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= fVal;
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
return rVal >>= fVal;
}
@@ -416,14 +416,14 @@ sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
*************************************************************************/
SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, USHORT nId) :
+SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -437,14 +437,14 @@ SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartKindErrorItem(rIn, Which());
}
// -----------------------------------------------------------------------
-USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
? USHRT_MAX
@@ -458,14 +458,14 @@ USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
*************************************************************************/
SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, USHORT nId) :
+SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -479,14 +479,14 @@ SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartIndicateItem(rIn, Which());
}
// -----------------------------------------------------------------------
-USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
? USHRT_MAX
@@ -500,14 +500,14 @@ USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
*************************************************************************/
SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, USHORT nId) :
+SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -521,14 +521,14 @@ SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartRegressItem(rIn, Which());
}
// -----------------------------------------------------------------------
-USHORT SvxChartRegressItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
? USHRT_MAX