summaryrefslogtreecommitdiff
path: root/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-03-10 16:55:21 -0500
committerKohei Yoshida <kyoshida@novell.com>2011-03-10 20:21:13 -0500
commit12343c15568dcc2c9209d8ca41fda2263122448f (patch)
tree3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
parent99745dbcbb25b61437914c9782475d0b67a4b0bd (diff)
parentce6308e4fad2281241bf4ca78280eba29f744d43 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx')
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 9ba75dbbe6ea..46d5269793de 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -84,7 +84,7 @@ AllAxisItemConverter::~AllAxisItemConverter()
{
}
-const USHORT * AllAxisItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllAxisItemConverter::GetWhichPairs() const
{
// must span all used items!
return nAllAxisWhichPairs;
@@ -114,7 +114,7 @@ AllGridItemConverter::~AllGridItemConverter()
{
}
-const USHORT * AllGridItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllGridItemConverter::GetWhichPairs() const
{
// must span all used items!
return nGridWhichPairs;
@@ -162,7 +162,7 @@ AllDataLabelItemConverter::~AllDataLabelItemConverter()
{
}
-const USHORT * AllDataLabelItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllDataLabelItemConverter::GetWhichPairs() const
{
// must span all used items!
return nDataLabelWhichPairs;
@@ -196,7 +196,7 @@ AllTitleItemConverter::~AllTitleItemConverter()
{
}
-const USHORT * AllTitleItemConverter::GetWhichPairs() const
+const sal_uInt16 * AllTitleItemConverter::GetWhichPairs() const
{
// must span all used items!
return nTitleWhichPairs;
@@ -224,7 +224,7 @@ AllSeriesStatisticsConverter::AllSeriesStatisticsConverter(
AllSeriesStatisticsConverter::~AllSeriesStatisticsConverter()
{}
-const USHORT * AllSeriesStatisticsConverter::GetWhichPairs() const
+const sal_uInt16 * AllSeriesStatisticsConverter::GetWhichPairs() const
{
// must span all used items!
return nStatWhichPairs;