diff options
Diffstat (limited to 'chart2/source/controller/dialogs')
4 files changed, 10 insertions, 8 deletions
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 5dec3ea17d6c..0ee407795f0e 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -121,7 +121,7 @@ namespace rListBox.SelectEntry( rColor ); if( rListBox.GetSelectEntryCount() == 0 ) { - sal_uInt16 nPos = rListBox.InsertEntry( rColor, lcl_makeColorName( rColor ) ); + const sal_Int32 nPos = rListBox.InsertEntry( rColor, lcl_makeColorName( rColor ) ); rListBox.SelectEntryPos( nPos ); } } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 97fba02ada42..62e6e35719b9 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -165,7 +165,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) for( sal_Int32 nN=0; nN<m_aCategories.getLength() && nN<nMaxCount; nN++ ) m_pED_CrossesAtCategory->InsertEntry( m_aCategories[nN] ); - sal_uInt16 nCount = m_pED_CrossesAtCategory->GetEntryCount(); + sal_Int32 nCount = m_pED_CrossesAtCategory->GetEntryCount(); if( nCount>30 ) nCount=30; m_pED_CrossesAtCategory->SetDropDownLineCount( nCount ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index b638ca467cad..59e5b9c06d35 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -39,8 +39,10 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -#define POS_3DSCHEME_SIMPLE 0 -#define POS_3DSCHEME_REALISTIC 1 +enum { + POS_3DSCHEME_SIMPLE = 0, + POS_3DSCHEME_REALISTIC = 1 +}; class Dim3DLookResourceGroup : public ChangingResource { @@ -93,7 +95,7 @@ void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.b3DLook = m_pCB_3DLook->IsChecked(); - sal_uInt16 nPos = m_pLB_Scheme->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_Scheme->GetSelectEntryPos(); if( POS_3DSCHEME_SIMPLE == nPos ) rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple; else if( POS_3DSCHEME_REALISTIC == nPos ) @@ -600,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void ChartTypeParameter aOldParameter; getSplinePropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_SMOOTH == m_pLB_LineType->GetSelectEntryPos() ); - sal_uInt16 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH); if( RET_OK == getSplinePropertiesDialog().Execute() ) { @@ -620,7 +622,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, voi ChartTypeParameter aOldParameter; getSteppedPropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_STEPPED == m_pLB_LineType->GetSelectEntryPos() ); - sal_uInt16 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED); if( RET_OK == getSteppedPropertiesDialog().Execute() ) { diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 0b9e69e647cf..42639c3213b8 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -260,7 +260,7 @@ enum AxisTypeListBoxEntry IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl) { - sal_uInt16 nPos = m_pLB_AxisType->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos(); if( nPos==TYPE_DATE ) m_nAxisType = chart2::AxisType::DATE; else |