diff -cNr old/chart2/source/controller/dialogs/makefile.mk new/chart2/source/controller/dialogs/makefile.mk *** old/chart2/source/controller/dialogs/makefile.mk Tue Jul 3 21:38:40 2007 --- new/chart2/source/controller/dialogs/makefile.mk Thu Aug 30 17:13:40 2007 *************** *** 97,103 **** $(SLO)$/dlg_ChartType.obj \ $(SLO)$/RangeSelectionButton.obj \ $(SLO)$/RangeSelectionHelper.obj \ ! $(SLO)$/RangeSelectionListener.obj # --- Resources --------------------------------------------------------------- --- 97,104 ---- $(SLO)$/dlg_ChartType.obj \ $(SLO)$/RangeSelectionButton.obj \ $(SLO)$/RangeSelectionHelper.obj \ ! $(SLO)$/RangeSelectionListener.obj \ ! $(SLO)$/tp_AnyRefEdt.obj # --- Resources --------------------------------------------------------------- diff -cNr old/chart2/source/controller/dialogs/tp_DataSource.cxx new/chart2/source/controller/dialogs/tp_DataSource.cxx *** old/chart2/source/controller/dialogs/tp_DataSource.cxx Wed May 23 01:44:54 2007 --- new/chart2/source/controller/dialogs/tp_DataSource.cxx Thu Aug 30 17:15:18 2007 *************** *** 341,346 **** --- 341,349 ---- m_aLB_ROLE.SetSelectionMode( SINGLE_SELECTION ); m_aLB_ROLE.SetSelectHdl( LINK( this, DataSourceTabPage, RoleSelectionChangedHdl )); + m_aEDT_RANGE.SetKeyInputHdl( LINK( this, DataSourceTabPage, MainRangeButtonClickedHdl )); + m_aEDT_CATEGORIES.SetKeyInputHdl( LINK( this, DataSourceTabPage, CategoriesRangeButtonClickedHdl )); + m_aIMB_RANGE_MAIN.SetClickHdl( LINK( this, DataSourceTabPage, MainRangeButtonClickedHdl )); m_aIMB_RANGE_CAT.SetClickHdl( LINK( this, DataSourceTabPage, CategoriesRangeButtonClickedHdl )); diff -cNr old/chart2/source/controller/dialogs/tp_DataSource.hxx new/chart2/source/controller/dialogs/tp_DataSource.hxx *** old/chart2/source/controller/dialogs/tp_DataSource.hxx Wed May 23 01:45:12 2007 --- new/chart2/source/controller/dialogs/tp_DataSource.hxx Thu Aug 30 17:17:10 2007 *************** *** 90,95 **** --- 90,96 ---- #include "RangeSelectionListener.hxx" #include "RangeSelectionButton.hxx" + #include "tp_AnyRefEdt.hxx" namespace com { namespace sun { namespace star { namespace chart2 { *************** *** 181,192 **** FixedText m_aFT_ROLE; SvTabListBox m_aLB_ROLE; FixedText m_aFT_RANGE; ! Edit m_aEDT_RANGE; RangeSelectionButton m_aIMB_RANGE_MAIN; FixedText m_aFT_CATEGORIES; FixedText m_aFT_DATALABELS;//used for xy charts ! Edit m_aEDT_CATEGORIES; RangeSelectionButton m_aIMB_RANGE_CAT; ::rtl::OUString m_aFixedTextRange; --- 182,193 ---- FixedText m_aFT_ROLE; SvTabListBox m_aLB_ROLE; FixedText m_aFT_RANGE; ! Chart2RefEdt m_aEDT_RANGE; RangeSelectionButton m_aIMB_RANGE_MAIN; FixedText m_aFT_CATEGORIES; FixedText m_aFT_DATALABELS;//used for xy charts ! Chart2RefEdt m_aEDT_CATEGORIES; RangeSelectionButton m_aIMB_RANGE_CAT; ::rtl::OUString m_aFixedTextRange; diff -cNr old/chart2/source/controller/dialogs/tp_RangeChooser.cxx new/chart2/source/controller/dialogs/tp_RangeChooser.cxx *** old/chart2/source/controller/dialogs/tp_RangeChooser.cxx Wed May 23 01:47:44 2007 --- new/chart2/source/controller/dialogs/tp_RangeChooser.cxx Thu Aug 30 17:18:26 2007 *************** *** 173,178 **** --- 173,179 ---- // button here, and in the worst case nothing happens when it is pressed. // Not nice, but I see no better solution for the moment. m_aIB_Range.SetClickHdl( LINK( this, RangeChooserTabPage, ChooseRangeHdl )); + m_aED_Range.SetKeyInputHdl( LINK( this, RangeChooserTabPage, ChooseRangeHdl )); // #i75179# enable setting the background to a different color m_aED_Range.SetStyle( m_aED_Range.GetStyle() | WB_FORCECTRLBACKGROUND ); diff -cNr old/chart2/source/controller/dialogs/tp_RangeChooser.hxx new/chart2/source/controller/dialogs/tp_RangeChooser.hxx *** old/chart2/source/controller/dialogs/tp_RangeChooser.hxx Wed May 23 01:48:02 2007 --- new/chart2/source/controller/dialogs/tp_RangeChooser.hxx Thu Aug 30 17:17:44 2007 *************** *** 39,44 **** --- 39,45 ---- #include "RangeSelectionListener.hxx" #include "RangeSelectionButton.hxx" #include "TabPageNotifiable.hxx" + #include "tp_AnyRefEdt.hxx" #include #include *************** *** 109,115 **** FixedText m_aFT_Caption; FixedText m_aFT_Range; ! Edit m_aED_Range; RangeSelectionButton m_aIB_Range; RadioButton m_aRB_Rows; --- 110,116 ---- FixedText m_aFT_Caption; FixedText m_aFT_Range; ! Chart2RefEdt m_aED_Range; RangeSelectionButton m_aIB_Range; RadioButton m_aRB_Rows;