summaryrefslogtreecommitdiff
path: root/svx/source/items/chrtitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/items/chrtitem.cxx')
-rwxr-xr-x[-rw-r--r--]svx/source/items/chrtitem.cxx116
1 files changed, 41 insertions, 75 deletions
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 6c471c6bad53..5c0203e1674d 100644..100755
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -43,7 +43,7 @@
#include <float.h>
#include <rtl/math.hxx>
-#include "chrtitem.hxx"
+#include "svx/chrtitem.hxx"
using namespace ::rtl;
using namespace ::com::sun::star;
@@ -51,7 +51,6 @@ using namespace ::com::sun::star;
TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0));
TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem);
-TYPEINIT1(SvxChartLegendPosItem, SfxEnumItem);
TYPEINIT1(SvxChartTextOrderItem, SfxEnumItem);
TYPEINIT1(SvxChartTextOrientItem, SfxEnumItem);
TYPEINIT1(SvxChartIndicateItem, SfxEnumItem);
@@ -65,14 +64,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)
{
}
@@ -86,7 +85,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());
}
@@ -98,14 +97,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)
{
}
@@ -119,59 +118,26 @@ 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());
}
/*************************************************************************
|*
-|* SvxChartLegendPosItem
-|*
-*************************************************************************/
-
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvxChartLegendPos eLegendPos,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eLegendPos)
-{
-}
-
-// -----------------------------------------------------------------------
-
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, USHORT nId) :
- SfxEnumItem(nId, rIn)
-{
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const
-{
- return new SvxChartLegendPosItem(*this);
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
-{
- return new SvxChartLegendPosItem(rIn, Which());
-}
-
-/*************************************************************************
-|*
|* SvxChartTextOrderItem
|*
*************************************************************************/
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)
{
}
@@ -185,14 +151,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());
}
// -----------------------------------------------------------------------
-bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+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;
@@ -217,7 +183,7 @@ bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /
// -----------------------------------------------------------------------
-bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+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;
@@ -246,7 +212,7 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
return false;
}
- SetValue( (USHORT)eOrder );
+ SetValue( (sal_uInt16)eOrder );
return true;
}
@@ -258,14 +224,14 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
*************************************************************************/
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)
{
}
@@ -279,7 +245,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());
}
@@ -290,7 +256,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)
{
@@ -298,7 +264,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
// -----------------------------------------------------------------------
-SvxDoubleItem::SvxDoubleItem(SvStream& rIn, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) :
SfxPoolItem(nId)
{
rIn >> fVal;
@@ -354,7 +320,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;
@@ -363,7 +329,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;
@@ -394,14 +360,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
// -----------------------------------------------------------------------
-bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= fVal;
return true;
}
// -----------------------------------------------------------------------
-bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
return rVal >>= fVal;
}
@@ -415,14 +381,14 @@ 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)
{
}
@@ -436,14 +402,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
@@ -457,14 +423,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)
{
}
@@ -478,14 +444,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
@@ -499,14 +465,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)
{
}
@@ -520,14 +486,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
generated by cgit (git 2.34.1) at 2024-07-19 08:32:57 +0000