diff options
author | Olivier Hallot <olivier.hallot@edx.srv.br> | 2013-11-20 19:00:31 -0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 08:14:51 -0600 |
commit | 7589bf4a620c348d93c3f39fa6bc35d77158f34b (patch) | |
tree | 4dd854b52b13f6fb6cea9e3d33ed37d5e1d9fb66 /chart2/source/controller/dialogs/tp_AxisPositions.cxx | |
parent | longparas: these are really xub_StrLens (diff) | |
download | core-7589bf4a620c348d93c3f39fa6bc35d77158f34b.tar.gz core-7589bf4a620c348d93c3f39fa6bc35d77158f34b.zip |
Convert axis position tab page to widget UI
Change-Id: I76da8002013bdda3d12544aabda84360a2e39929
Obs: Many widget were not implemented and were left for future development
Reviewed-on: https://gerrit.libreoffice.org/6737
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller/dialogs/tp_AxisPositions.cxx')
-rw-r--r-- | chart2/source/controller/dialogs/tp_AxisPositions.cxx | 320 |
1 files changed, 87 insertions, 233 deletions
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 46b7f7ce458f..5aa1ebeb3747 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -50,161 +50,47 @@ using namespace ::com::sun::star; namespace chart { -namespace -{ -void lcl_newXPos( Control& rControl, long nXPos ) -{ - Point aPos( rControl.GetPosPixel() ); - aPos.X() = nXPos; - rControl.SetPosPixel(aPos); -} - -void lcl_shiftY( Control& rControl, long nYDiff ) -{ - Point aPos( rControl.GetPosPixel() ); - aPos.Y() += nYDiff; - rControl.SetPosPixel(aPos); -} - -} - AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rInAttrs) - : SfxTabPage(pWindow, SchResId(TP_AXIS_POSITIONS), rInAttrs) - - , m_aFL_AxisLine(this,SchResId(FL_AXIS_LINE)) - , m_aFT_CrossesAt(this,SchResId(FT_CROSSES_OTHER_AXIS_AT)) - , m_aLB_CrossesAt(this,SchResId(LB_CROSSES_OTHER_AXIS_AT)) - , m_aED_CrossesAt(this,SchResId(EDT_CROSSES_OTHER_AXIS_AT)) - , m_aED_CrossesAtCategory(this,SchResId(EDT_CROSSES_OTHER_AXIS_AT_CATEGORY)) - , m_aCB_AxisBetweenCategories(this, SchResId(CB_AXIS_BETWEEN_CATEGORIES)) - - , m_aFL_Labels(this,SchResId(FL_LABELS)) - , m_aFT_PlaceLabels( this, SchResId( FT_PLACE_LABELS ) ) - , m_aLB_PlaceLabels( this, SchResId( LB_PLACE_LABELS ) ) - , m_aFT_LabelDistance( this, SchResId( FT_AXIS_LABEL_DISTANCE ) ) - , m_aED_LabelDistance( this, SchResId( EDT_AXIS_LABEL_DISTANCE ) ) - - , m_aFL_Ticks(this,SchResId(FL_TICKS)) - , m_aFT_Major(this,SchResId(FT_MAJOR)) - , m_aCB_TicksInner(this,SchResId(CB_TICKS_INNER)) - , m_aCB_TicksOuter(this,SchResId(CB_TICKS_OUTER)) - , m_aFT_Minor(this,SchResId(FT_MINOR)) - , m_aCB_MinorInner(this,SchResId(CB_MINOR_INNER)) - , m_aCB_MinorOuter(this,SchResId(CB_MINOR_OUTER)) - - , m_aFL_Vertical(this,SchResId(FL_VERTICAL)) - , m_aFT_PlaceTicks(this,SchResId(FT_PLACE_TICKS)) - , m_aLB_PlaceTicks(this,SchResId(LB_PLACE_TICKS)) - - , m_aFL_Grids(this,SchResId(FL_GRIDS)) - , m_aCB_MajorGrid(this,SchResId(CB_MAJOR_GRID)) - , m_aPB_MajorGrid(this,SchResId(PB_MAJOR_GRID)) - , m_aCB_MinorGrid(this,SchResId(CB_MINOR_GRID)) - , m_aPB_MinorGrid(this,SchResId(PB_MINOR_GRID)) - + : SfxTabPage(pWindow + ,"tp_AxisPositions" + ,"modules/schart/ui/tp_AxisPositions.ui" + , rInAttrs) , m_pNumFormatter(NULL) , m_bCrossingAxisIsCategoryAxis(false) , m_aCategories() { - FreeResource(); - SetExchangeSupport(); + get(m_pFL_AxisLine, "FL_AXIS_LINE"); + get(m_pLB_CrossesAt,"LB_CROSSES_OTHER_AXIS_AT"); + get(m_pED_CrossesAt,"EDT_CROSSES_OTHER_AXIS_AT"); + get(m_pED_CrossesAtCategory, "EDT_CROSSES_OTHER_AXIS_AT_CATEGORY"); + get(m_pCB_AxisBetweenCategories, "CB_AXIS_BETWEEN_CATEGORIES"); - const long nDialogWidth = GetSizePixel().Width(); - const long nDistance = LogicToPixel( Size(RSC_SP_CTRL_X, 0), MapMode(MAP_APPFONT) ).Width(); + get(m_pFL_Labels, "FL_LABELS"); + get(m_pLB_PlaceLabels,"LB_PLACE_LABELS"); + get(m_pED_LabelDistance,"EDT_AXIS_LABEL_DISTANCE"); - //axis line controls - { - if( m_aFT_CrossesAt.CalcMinimumSize().Width() < m_aFT_CrossesAt.GetSizePixel().Width() ) - { - m_aFT_CrossesAt.SetSizePixel(m_aFT_CrossesAt.CalcMinimumSize()); - long nXPos = m_aFT_CrossesAt.GetPosPixel().X() + m_aFT_CrossesAt.GetSizePixel().Width() + nDistance; - lcl_newXPos( m_aLB_CrossesAt, nXPos ); - - nXPos += m_aLB_CrossesAt.GetSizePixel().Width() + nDistance; - lcl_newXPos( m_aED_CrossesAt, nXPos ); - lcl_newXPos( m_aED_CrossesAtCategory, nXPos ); - } - } - - long nFixTextHeight = m_aFT_PlaceLabels.GetSizePixel().Height(); - long nLabelPlacementWidth = m_aFT_PlaceLabels.CalcMinimumSize().Width(); - long nMarkPlacementWidth = m_aFT_PlaceTicks.CalcMinimumSize().Width(); + get(m_pCB_TicksInner, "CB_TICKS_INNER"); + get(m_pCB_TicksOuter, "CB_TICKS_OUTER"); + get(m_pCB_MinorInner, "CB_MINOR_INNER"); + get(m_pCB_MinorOuter, "CB_MINOR_OUTER"); - long nWidth_0 = ::std::max( m_aFT_Major.CalcMinimumSize().Width(), m_aFT_Minor.CalcMinimumSize().Width() ); - nWidth_0 = ::std::max( nWidth_0, nLabelPlacementWidth ); - nWidth_0 = ::std::max( nWidth_0, nMarkPlacementWidth ); - nLabelPlacementWidth = nMarkPlacementWidth = nWidth_0; + get(m_pBxPlaceTicks, "boxPLACE_TICKS"); + get(m_pLB_PlaceTicks, "LB_PLACE_TICKS"); - //label placement - { - m_aFT_PlaceLabels.SetSizePixel( Size( nLabelPlacementWidth, nFixTextHeight ) ); - long nXPos = m_aFT_PlaceLabels.GetPosPixel().X() + nLabelPlacementWidth + nDistance; - lcl_newXPos( m_aLB_PlaceLabels, nXPos ); - m_aLB_PlaceLabels.SetSizePixel(m_aLB_PlaceLabels.CalcMinimumSize()); - } + // these are not used/implemented +// get(m_pCB_MajorGrid, "CB_MAJOR_GRID"); +// get(m_pPB_MajorGrid, "PB_MAJOR_GRID"); +// get(m_pCB_MinorGrid, "CB_MINOR_GRID"); +// get(m_pPB_MinorGrid, "PB_MINOR_GRID"); - //tickmark placement - { - m_aFT_PlaceTicks.SetSizePixel( Size( nMarkPlacementWidth, nFixTextHeight ) ); - long nXPos = m_aFT_PlaceTicks.GetPosPixel().X() + nMarkPlacementWidth + nDistance; - lcl_newXPos( m_aLB_PlaceTicks, nXPos ); - m_aLB_PlaceTicks.SetSizePixel( m_aLB_PlaceTicks.CalcMinimumSize() ); - } - //tickmark controls - { - long nWidth_1 = ::std::max( m_aCB_TicksInner.CalcMinimumSize().Width(), m_aCB_MinorInner.CalcMinimumSize().Width() ); - long nWidth_2 = ::std::max( m_aCB_TicksOuter.CalcMinimumSize().Width(), m_aCB_MinorOuter.CalcMinimumSize().Width() ); + m_pLB_CrossesAt->SetSelectHdl( LINK( this, AxisPositionsTabPage, CrossesAtSelectHdl ) ); + m_pLB_CrossesAt->SetDropDownLineCount( m_pLB_CrossesAt->GetEntryCount() ); - long nLeftSpace = nDialogWidth - nWidth_0 - nWidth_1 - nWidth_2 - 3*nDistance; + m_pLB_PlaceLabels->SetSelectHdl( LINK( this, AxisPositionsTabPage, PlaceLabelsSelectHdl ) ); + m_pLB_PlaceLabels->SetDropDownLineCount( m_pLB_PlaceLabels->GetEntryCount() ); + m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() ); - if(nLeftSpace>=0) - { - m_aFT_Major.SetSizePixel(m_aFT_Major.CalcMinimumSize()); - m_aFT_Minor.SetSizePixel(m_aFT_Minor.CalcMinimumSize()); - - m_aCB_TicksInner.SetSizePixel( m_aCB_TicksInner.CalcMinimumSize() ); - m_aCB_MinorInner.SetSizePixel( m_aCB_MinorInner.CalcMinimumSize() ); - - m_aCB_TicksOuter.SetSizePixel( m_aCB_TicksOuter.CalcMinimumSize() ); - m_aCB_MinorOuter.SetSizePixel( m_aCB_MinorOuter.CalcMinimumSize() ); - - long nXPos = m_aFT_Major.GetPosPixel().X() + nWidth_0 + nDistance; - lcl_newXPos( m_aCB_TicksInner, nXPos ); - lcl_newXPos( m_aCB_MinorInner, nXPos ); - - nXPos += nWidth_1 + nDistance; - lcl_newXPos( m_aCB_TicksOuter, nXPos ); - lcl_newXPos( m_aCB_MinorOuter, nXPos ); - - nXPos += nWidth_2 + nDistance; - lcl_newXPos( m_aFL_Vertical, nXPos ); - } - } - - //right alignement of listboxes: - { - long nLabelRightBorder = m_aLB_PlaceLabels.GetPosPixel().X() + m_aLB_PlaceLabels.GetSizePixel().Width(); - long nTickmarksRightBorder = m_aLB_PlaceTicks.GetPosPixel().X() + m_aLB_PlaceTicks.GetSizePixel().Width(); - - long nNewRightBorder = ::std::max( m_aLB_CrossesAt.GetPosPixel().X() + m_aLB_CrossesAt.GetSizePixel().Width(), nLabelRightBorder); - nNewRightBorder = ::std::max( nTickmarksRightBorder, nNewRightBorder ); - - long nListBoxHeight = m_aLB_PlaceLabels.GetSizePixel().Height(); - m_aLB_PlaceLabels.SetSizePixel( Size( m_aLB_PlaceLabels.GetSizePixel().Width()+nNewRightBorder-nLabelRightBorder, nListBoxHeight ) ); - m_aLB_PlaceTicks.SetSizePixel( Size( m_aLB_PlaceTicks.GetSizePixel().Width()+nNewRightBorder-nTickmarksRightBorder, nListBoxHeight ) ); - } - - m_aLB_CrossesAt.SetSelectHdl( LINK( this, AxisPositionsTabPage, CrossesAtSelectHdl ) ); - m_aLB_CrossesAt.SetDropDownLineCount( m_aLB_CrossesAt.GetEntryCount() ); - - m_aLB_PlaceLabels.SetSelectHdl( LINK( this, AxisPositionsTabPage, PlaceLabelsSelectHdl ) ); - m_aLB_PlaceLabels.SetDropDownLineCount( m_aLB_PlaceLabels.GetEntryCount() ); - m_aLB_PlaceTicks.SetDropDownLineCount( m_aLB_PlaceTicks.GetEntryCount() ); - m_aCB_TicksInner.SetAccessibleRelationLabeledBy(&m_aFT_Major); - m_aCB_TicksOuter.SetAccessibleRelationLabeledBy(&m_aFT_Major); - m_aCB_MinorInner.SetAccessibleRelationLabeledBy(&m_aFT_Minor); - m_aCB_MinorOuter.SetAccessibleRelationLabeledBy(&m_aFT_Minor); } SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs) @@ -215,18 +101,18 @@ SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutA sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) { // axis line - sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos(); + sal_uInt16 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 )); if( 2==nPos ) { - double fCrossover = m_aED_CrossesAt.GetValue(); + double fCrossover = m_pED_CrossesAt->GetValue(); if( m_bCrossingAxisIsCategoryAxis ) - fCrossover = m_aED_CrossesAtCategory.GetSelectEntryPos()+1; + fCrossover = m_pED_CrossesAtCategory->GetSelectEntryPos()+1; rOutAttrs.Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE)); } // labels - sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos(); + sal_uInt16 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); if( nLabelPos != LISTBOX_ENTRY_NOTFOUND ) rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos )); @@ -234,19 +120,19 @@ sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) long nTicks=0; long nMinorTicks=0; - if(m_aCB_MinorInner.IsChecked()) + if(m_pCB_MinorInner->IsChecked()) nMinorTicks|=CHAXIS_MARK_INNER; - if(m_aCB_MinorOuter.IsChecked()) + if(m_pCB_MinorOuter->IsChecked()) nMinorTicks|=CHAXIS_MARK_OUTER; - if(m_aCB_TicksInner.IsChecked()) + if(m_pCB_TicksInner->IsChecked()) nTicks|=CHAXIS_MARK_INNER; - if(m_aCB_TicksOuter.IsChecked()) + if(m_pCB_TicksOuter->IsChecked()) nTicks|=CHAXIS_MARK_OUTER; rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks)); rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks)); - sal_uInt16 nMarkPos = m_aLB_PlaceTicks.GetSelectEntryPos(); + sal_uInt16 nMarkPos = m_pLB_PlaceTicks->GetSelectEntryPos(); if( nMarkPos != LISTBOX_ENTRY_NOTFOUND ) rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos )); @@ -256,26 +142,26 @@ sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) { //init and enable controls - m_aED_CrossesAt.Show( !m_bCrossingAxisIsCategoryAxis ); - m_aED_CrossesAtCategory.Show( m_bCrossingAxisIsCategoryAxis ); + m_pED_CrossesAt->Show( !m_bCrossingAxisIsCategoryAxis ); + m_pED_CrossesAtCategory->Show( m_bCrossingAxisIsCategoryAxis ); const sal_Int32 nMaxCount = LISTBOX_ENTRY_NOTFOUND; if( m_bCrossingAxisIsCategoryAxis ) { for( sal_Int32 nN=0; nN<m_aCategories.getLength() && nN<nMaxCount; nN++ ) - m_aED_CrossesAtCategory.InsertEntry( m_aCategories[nN] ); + m_pED_CrossesAtCategory->InsertEntry( m_aCategories[nN] ); - sal_uInt16 nCount = m_aED_CrossesAtCategory.GetEntryCount(); + sal_uInt16 nCount = m_pED_CrossesAtCategory->GetEntryCount(); if( nCount>30 ) nCount=30; - m_aED_CrossesAtCategory.SetDropDownLineCount( nCount ); + m_pED_CrossesAtCategory->SetDropDownLineCount( nCount ); } - if( m_aLB_CrossesAt.GetEntryCount() > 3 ) + if( m_pLB_CrossesAt->GetEntryCount() > 3 ) { if( m_bCrossingAxisIsCategoryAxis ) - m_aLB_CrossesAt.RemoveEntry(2); + m_pLB_CrossesAt->RemoveEntry(2); else - m_aLB_CrossesAt.RemoveEntry(3); + m_pLB_CrossesAt->RemoveEntry(3); } //fill controls @@ -295,8 +181,8 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) else nPos--; - if( nPos < m_aLB_CrossesAt.GetEntryCount() ) - m_aLB_CrossesAt.SelectEntryPos( nPos ); + if( nPos < m_pLB_CrossesAt->GetEntryCount() ) + m_pLB_CrossesAt->SelectEntryPos( nPos ); CrossesAtSelectHdl( (void*)0 ); if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,sal_True, &pPoolItem)== SFX_ITEM_SET || bZero ) @@ -305,31 +191,31 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) if( !bZero ) fCrossover = (((const SvxDoubleItem*)pPoolItem)->GetValue()); if( m_bCrossingAxisIsCategoryAxis ) - m_aED_CrossesAtCategory.SelectEntryPos( static_cast<sal_uInt16>(::rtl::math::round(fCrossover-1.0)) ); + m_pED_CrossesAtCategory->SelectEntryPos( static_cast<sal_uInt16>(::rtl::math::round(fCrossover-1.0)) ); else - m_aED_CrossesAt.SetValue(fCrossover); + m_pED_CrossesAt->SetValue(fCrossover); } else { - m_aED_CrossesAtCategory.SetNoSelection(); - m_aED_CrossesAt.SetTextValue(OUString()); + m_pED_CrossesAtCategory->SetNoSelection(); + m_pED_CrossesAt->SetTextValue(""); } } else { - m_aLB_CrossesAt.SetNoSelection(); - m_aED_CrossesAt.Enable( sal_False ); + m_pLB_CrossesAt->SetNoSelection(); + m_pED_CrossesAt->Enable( sal_False ); } // Labels if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, sal_False, &pPoolItem ) == SFX_ITEM_SET ) { sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); - if( nPos < m_aLB_PlaceLabels.GetEntryCount() ) - m_aLB_PlaceLabels.SelectEntryPos( nPos ); + if( nPos < m_pLB_PlaceLabels->GetEntryCount() ) + m_pLB_PlaceLabels->SelectEntryPos( nPos ); } else - m_aLB_PlaceLabels.SetNoSelection(); + m_pLB_PlaceLabels->SetNoSelection(); PlaceLabelsSelectHdl( (void*)0 ); // Tick marks @@ -339,68 +225,37 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,sal_True, &pPoolItem)== SFX_ITEM_SET) nMinorTicks=((const SfxInt32Item*)pPoolItem)->GetValue(); - m_aCB_TicksInner.Check(sal_Bool(nTicks&CHAXIS_MARK_INNER)); - m_aCB_TicksOuter.Check(sal_Bool(nTicks&CHAXIS_MARK_OUTER)); - m_aCB_MinorInner.Check(sal_Bool(nMinorTicks&CHAXIS_MARK_INNER)); - m_aCB_MinorOuter.Check(sal_Bool(nMinorTicks&CHAXIS_MARK_OUTER)); + m_pCB_TicksInner->Check(sal_Bool(nTicks&CHAXIS_MARK_INNER)); + m_pCB_TicksOuter->Check(sal_Bool(nTicks&CHAXIS_MARK_OUTER)); + m_pCB_MinorInner->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_INNER)); + m_pCB_MinorOuter->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_OUTER)); // Tick position if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, sal_False, &pPoolItem ) == SFX_ITEM_SET ) { sal_uInt16 nPos = (sal_uInt16)static_cast< const SfxInt32Item * >( pPoolItem )->GetValue(); - if( nPos < m_aLB_PlaceTicks.GetEntryCount() ) - m_aLB_PlaceTicks.SelectEntryPos( nPos ); + if( nPos < m_pLB_PlaceTicks->GetEntryCount() ) + m_pLB_PlaceTicks->SelectEntryPos( nPos ); } else - m_aLB_PlaceTicks.SetNoSelection(); + m_pLB_PlaceTicks->SetNoSelection(); if( !m_bSupportAxisPositioning ) { - m_aFL_AxisLine.Show(false); - m_aFT_CrossesAt.Show(false); - m_aLB_CrossesAt.Show(false); - m_aED_CrossesAt.Show(false); - m_aED_CrossesAtCategory.Show(false); - m_aCB_AxisBetweenCategories.Show(false); - - m_aFL_Labels.Show(false); - m_aFT_PlaceLabels.Show(false); - m_aLB_PlaceLabels.Show(false); - m_aFT_LabelDistance.Show(false); - m_aED_LabelDistance.Show(false); - - m_aFL_Vertical.Show(false); - m_aFT_PlaceTicks.Show(false); - m_aLB_PlaceTicks.Show(false); - - long nYDiff = m_aFL_AxisLine.GetPosPixel().Y() - m_aFL_Ticks.GetPosPixel().Y(); - lcl_shiftY( m_aFL_Ticks, nYDiff ); - lcl_shiftY( m_aFT_Major, nYDiff ); - lcl_shiftY( m_aCB_TicksInner, nYDiff ); - lcl_shiftY( m_aCB_TicksOuter, nYDiff ); - - lcl_shiftY( m_aFT_Minor, nYDiff ); - lcl_shiftY( m_aCB_MinorInner, nYDiff ); - lcl_shiftY( m_aCB_MinorOuter, nYDiff ); + m_pFL_AxisLine->Show(false); + + m_pFL_Labels->Show(false); + + m_pBxPlaceTicks->Show(false); } else if( !AxisHelper::isAxisPositioningEnabled() ) { - m_aFL_AxisLine.Enable(false); - m_aFT_CrossesAt.Enable(false); - m_aLB_CrossesAt.Enable(false); - m_aED_CrossesAt.Enable(false); - m_aED_CrossesAtCategory.Enable(false); - m_aCB_AxisBetweenCategories.Enable(false); - - m_aFL_Labels.Enable(false); - m_aFT_PlaceLabels.Enable(false); - m_aLB_PlaceLabels.Enable(false); - m_aFT_LabelDistance.Enable(false); - m_aED_LabelDistance.Enable(false); - - m_aFL_Vertical.Enable(false); - m_aFT_PlaceTicks.Enable(false); - m_aLB_PlaceTicks.Enable(false); + + m_pFL_AxisLine->Enable(false); + + m_pFL_Labels->Enable(false); + + m_pBxPlaceTicks->Enable(false); //todo: maybe set a special help id to all those controls } @@ -417,14 +272,14 @@ int AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet) void AxisPositionsTabPage::SetNumFormatter( SvNumberFormatter* pFormatter ) { m_pNumFormatter = pFormatter; - m_aED_CrossesAt.SetFormatter( m_pNumFormatter ); - m_aED_CrossesAt.UseInputStringForFormatting(); + m_pED_CrossesAt->SetFormatter( m_pNumFormatter ); + m_pED_CrossesAt->UseInputStringForFormatting(); const SfxPoolItem *pPoolItem = NULL; if( GetItemSet().GetItemState( SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, sal_True, &pPoolItem ) == SFX_ITEM_SET ) { sal_uLong nFmt = (sal_uLong)((const SfxInt32Item*)pPoolItem)->GetValue(); - m_aED_CrossesAt.SetFormatKey( nFmt ); + m_pED_CrossesAt->SetFormatKey( nFmt ); } } @@ -445,14 +300,14 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl) { - sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos(); - m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); - m_aED_CrossesAtCategory.Show( (2==nPos) && m_bCrossingAxisIsCategoryAxis ); + sal_uInt16 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); + m_pED_CrossesAt->Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); + m_pED_CrossesAtCategory->Show( (2==nPos) && m_bCrossingAxisIsCategoryAxis ); - if( m_aED_CrossesAt.GetText().isEmpty() ) - m_aED_CrossesAt.SetValue(0.0); - if( 0 == m_aED_CrossesAtCategory.GetSelectEntryCount() ) - m_aED_CrossesAtCategory.SelectEntryPos(0); + if( m_pED_CrossesAt->GetText().isEmpty() ) + m_pED_CrossesAt->SetValue(0.0); + if( 0 == m_pED_CrossesAtCategory->GetSelectEntryCount() ) + m_pED_CrossesAtCategory->SelectEntryPos(0); PlaceLabelsSelectHdl( (void*)0 ); return 0; @@ -460,17 +315,16 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl) IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl) { - sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos(); + sal_uInt16 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); bool bEnableTickmarkPlacement = (nLabelPos>1); if( bEnableTickmarkPlacement ) { - sal_uInt16 nAxisPos = m_aLB_CrossesAt.GetSelectEntryPos(); + sal_uInt16 nAxisPos = m_pLB_CrossesAt->GetSelectEntryPos(); if( nLabelPos-2 == nAxisPos ) bEnableTickmarkPlacement=false; } - m_aFT_PlaceTicks.Enable(bEnableTickmarkPlacement); - m_aLB_PlaceTicks.Enable(bEnableTickmarkPlacement); + m_pBxPlaceTicks->Enable(bEnableTickmarkPlacement); return 0; } |