summaryrefslogtreecommitdiffstats
path: root/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.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/ErrorBarItemConverter.cxx
parentTypo. (diff)
parentmasterfix DEV300: #i10000# usage of L10N build_type (diff)
downloadcore-12343c15568dcc2c9209d8ca41fda2263122448f.tar.gz
core-12343c15568dcc2c9209d8ca41fda2263122448f.zip
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx')
-rw-r--r--chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 072768c13658..59a24c238544 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -134,7 +134,7 @@ bool ErrorBarItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
return ItemConverter::ApplyItemSet( rItemSet ) || bResult;
}
-const USHORT * ErrorBarItemConverter::GetWhichPairs() const
+const sal_uInt16 * ErrorBarItemConverter::GetWhichPairs() const
{
// must span all used items!
return nErrorBarWhichPairs;
@@ -148,7 +148,7 @@ bool ErrorBarItemConverter::GetItemProperty(
}
bool ErrorBarItemConverter::ApplySpecialItem(
- USHORT nWhichId, const SfxItemSet & rItemSet )
+ sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
throw( uno::Exception )
{
bool bChanged = false;
@@ -343,7 +343,7 @@ bool ErrorBarItemConverter::ApplySpecialItem(
}
void ErrorBarItemConverter::FillSpecialItem(
- USHORT nWhichId, SfxItemSet & rOutItemSet ) const
+ sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
throw( uno::Exception )
{
switch( nWhichId )