1 files changed, 12 insertions, 10 deletions

diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 557de8492384..d18fe55d2951 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -152,7 +152,7 @@ static long lcl_pRoleListBoxTabs[] =
 void lcl_ShowChooserButton(
     ::chart::RangeSelectionButton & rChooserButton,
     Edit & rEditField,
-    BOOL bShow )
+    sal_Bool bShow )
 {
     if( rChooserButton.IsVisible() != bShow )
     {
@@ -170,8 +170,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
 {
     if( pDialog )
     {
-        pDialog->Show( bEnable ? FALSE : TRUE );
-        pDialog->SetModalInputMode( bEnable ? FALSE : TRUE );
+        pDialog->Show( bEnable ? sal_False : sal_True );
+        pDialog->SetModalInputMode( bEnable ? sal_False : sal_True );
     }
 }
 
@@ -312,7 +312,7 @@ DataSourceTabPage::DataSourceTabPage(
     // set handlers
     m_apLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl ));
 
-    m_aLB_ROLE.SetWindowBits( WB_HSCROLL | WB_CLIPCHILDREN );
+    m_aLB_ROLE.SetStyle( m_aLB_ROLE.GetStyle() | WB_HSCROLL | WB_CLIPCHILDREN );
     m_aLB_ROLE.SetSelectionMode( SINGLE_SELECTION );
     m_aLB_ROLE.SetSelectHdl( LINK( this, DataSourceTabPage, RoleSelectionChangedHdl ));
 
@@ -360,6 +360,8 @@ DataSourceTabPage::DataSourceTabPage(
     if( m_apLB_SERIES->First())
         m_apLB_SERIES->Select( m_apLB_SERIES->First());
     m_apLB_SERIES->GrabFocus();
+    m_aBTN_UP.SetAccessibleName(String(SchResId(STR_BUTTON_UP)));
+    m_aBTN_DOWN.SetAccessibleName(String(SchResId(STR_BUTTON_DOWN)));
 }
 
 DataSourceTabPage::~DataSourceTabPage()
@@ -460,7 +462,7 @@ void DataSourceTabPage::updateControlsFromDialogModel()
 
 void DataSourceTabPage::fillSeriesListBox()
 {
-    m_apLB_SERIES->SetUpdateMode( FALSE );
+    m_apLB_SERIES->SetUpdateMode( sal_False );
 
     Reference< XDataSeries > xSelected;
     SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected());
@@ -512,7 +514,7 @@ void DataSourceTabPage::fillSeriesListBox()
     if( bHasSelectedEntry && pSelectedEntry )
         m_apLB_SERIES->Select( pSelectedEntry );
 
-    m_apLB_SERIES->SetUpdateMode( TRUE );
+    m_apLB_SERIES->SetUpdateMode( sal_True );
 }
 
 void DataSourceTabPage::fillRoleListBox()
@@ -521,7 +523,7 @@ void DataSourceTabPage::fillRoleListBox()
     bool bHasSelectedEntry = (pSeriesEntry != 0);
 
     SvLBoxEntry * pRoleEntry =  m_aLB_ROLE.FirstSelected();
-    ULONG nRoleIndex = SAL_MAX_UINT32;
+    sal_uLong nRoleIndex = SAL_MAX_UINT32;
     if( pRoleEntry )
         nRoleIndex = m_aLB_ROLE.GetModel()->GetAbsPos( pRoleEntry );
 
@@ -534,7 +536,7 @@ void DataSourceTabPage::fillRoleListBox()
                 pSeriesEntry->m_xChartType ));
 
         // fill role list
-        m_aLB_ROLE.SetUpdateMode( FALSE );
+        m_aLB_ROLE.SetUpdateMode( sal_False );
         m_aLB_ROLE.Clear();
         m_aLB_ROLE.RemoveSelection();
 
@@ -552,7 +554,7 @@ void DataSourceTabPage::fillRoleListBox()
             m_aLB_ROLE.Select( m_aLB_ROLE.GetEntry( nRoleIndex ));
         }
 
-        m_aLB_ROLE.SetUpdateMode( TRUE );
+        m_aLB_ROLE.SetUpdateMode( sal_True );
     }
 }
 
@@ -579,7 +581,7 @@ void DataSourceTabPage::updateControlState()
 
     m_aFT_DATALABELS.Show(!bHasCategories);
     m_aFT_CATEGORIES.Show( bHasCategories);
-    BOOL bShowIB = bHasRangeChooser;
+    sal_Bool bShowIB = bHasRangeChooser;
     lcl_ShowChooserButton( m_aIMB_RANGE_CAT, m_aEDT_CATEGORIES, bShowIB );
 
     m_aFT_SERIES.Enable();