diff options
Diffstat (limited to 'chart2/source/controller')
12 files changed, 64 insertions, 64 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index b60a52a38558..ddba251a56d3 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -187,12 +187,12 @@ void DataEditor::UpdateData() m_xBrwData->SetDataFromModel( m_xChartDoc, m_xContext ); } -sal_Bool DataEditor::Close() +bool DataEditor::Close() { if( ApplyChangesToModel() ) return ModalDialog::Close(); else - return sal_True; + return true; } bool DataEditor::ApplyChangesToModel() diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index caf17e60a67e..ca29b4d13700 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -77,14 +77,14 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueW void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId, CheckBox& rCheckbox ) { - rCheckbox.EnableTriState( sal_False ); + rCheckbox.EnableTriState( false ); const SfxPoolItem *pPoolItem = NULL; if( rInAttrs.GetItemState(nWhichId, true, &pPoolItem) == SFX_ITEM_SET ) rCheckbox.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() ); else { - rCheckbox.EnableTriState( sal_True ); + rCheckbox.EnableTriState( true ); rCheckbox.SetState( STATE_DONTKNOW ); } } @@ -237,7 +237,7 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton ) IMPL_LINK( DataLabelResources, CheckHdl, CheckBox*, pBox ) { if( pBox ) - pBox->EnableTriState( sal_False ); + pBox->EnableTriState( false ); EnableControls(); return 0; } diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index ec3c63a282f0..7c25681bf7df 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -139,7 +139,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa m_pRbRange->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen )); m_pLbFunction->SetSelectHdl( LINK( this, ErrorBarResources, CategoryChosen )); - m_pCbSyncPosNeg->Check( sal_False ); + m_pCbSyncPosNeg->Check( false ); m_pCbSyncPosNeg->SetToggleHdl( LINK( this, ErrorBarResources, SynchronizePosAndNeg )); m_pMfPositive->SetModifyHdl( LINK( this, ErrorBarResources, PosValueChanged )); @@ -522,10 +522,10 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs) } else { - m_pRbNone->Check( sal_False ); - m_pRbConst->Check( sal_False ); - m_pRbPercent->Check( sal_False ); - m_pRbFunction->Check( sal_False ); + m_pRbNone->Check( false ); + m_pRbConst->Check( false ); + m_pRbPercent->Check( false ); + m_pRbFunction->Check( false ); } // parameters @@ -576,9 +576,9 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs) } else { - m_pRbBoth->Check( sal_False ); - m_pRbPositive->Check( sal_False ); - m_pRbNegative->Check( sal_False ); + m_pRbBoth->Check( false ); + m_pRbPositive->Check( false ); + m_pRbNegative->Check( false ); } // ranges diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 12d4b620aa85..3302233c094e 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -188,16 +188,16 @@ void LegendPositionResources::initFromItemSet( const SfxItemSet& rInAttrs ) switch( nLegendPosition ) { case chart2::LegendPosition_LINE_START: - m_pRbtLeft->Check(sal_True); + m_pRbtLeft->Check(true); break; case chart2::LegendPosition_PAGE_START: - m_pRbtTop->Check(sal_True); + m_pRbtTop->Check(true); break; case chart2::LegendPosition_LINE_END: - m_pRbtRight->Check(sal_True); + m_pRbtRight->Check(true); break; case chart2::LegendPosition_PAGE_END: - m_pRbtBottom->Check(sal_True); + m_pRbtBottom->Check(true); break; default: break; diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 108ae3bab42a..ae02ba08e4bd 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -178,12 +178,12 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SET_INTERCEPT, true, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { - m_pCB_SetIntercept->EnableTriState( sal_True ); + m_pCB_SetIntercept->EnableTriState( true ); m_pCB_SetIntercept->SetState( STATE_DONTKNOW ); } else { - m_pCB_SetIntercept->EnableTriState( sal_False ); + m_pCB_SetIntercept->EnableTriState( false ); if( aState == SFX_ITEM_SET ) m_pCB_SetIntercept->Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue()); } @@ -191,12 +191,12 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_EQUATION, true, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { - m_pCB_ShowEquation->EnableTriState( sal_True ); + m_pCB_ShowEquation->EnableTriState( true ); m_pCB_ShowEquation->SetState( STATE_DONTKNOW ); } else { - m_pCB_ShowEquation->EnableTriState( sal_False ); + m_pCB_ShowEquation->EnableTriState( false ); if( aState == SFX_ITEM_SET ) m_pCB_ShowEquation->Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue()); } @@ -204,12 +204,12 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SHOW_COEFF, true, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { - m_pCB_ShowCorrelationCoeff->EnableTriState( sal_True ); + m_pCB_ShowCorrelationCoeff->EnableTriState( true ); m_pCB_ShowCorrelationCoeff->SetState( STATE_DONTKNOW ); } else { - m_pCB_ShowCorrelationCoeff->EnableTriState( sal_False ); + m_pCB_ShowCorrelationCoeff->EnableTriState( false ); if( aState == SFX_ITEM_SET ) m_pCB_ShowCorrelationCoeff->Check( static_cast< const SfxBoolItem * >( pPoolItem )->GetValue()); } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 7bc3a6463483..abb672f58a4f 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -113,9 +113,9 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( m_pCB_Shading->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectShading ) ); m_pCB_ObjectLines->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) ); - m_pCB_RoundedEdge->EnableTriState( sal_True ); - m_pCB_Shading->EnableTriState( sal_True ); - m_pCB_ObjectLines->EnableTriState( sal_True ); + m_pCB_RoundedEdge->EnableTriState( true ); + m_pCB_Shading->EnableTriState( true ); + m_pCB_ObjectLines->EnableTriState( true ); initControlsFromModel(); } @@ -204,50 +204,50 @@ void ThreeD_SceneAppearance_TabPage::initControlsFromModel() if(aProps.m_aShadeMode == drawing::ShadeMode_FLAT) { - m_pCB_Shading->EnableTriState( sal_False ); - m_pCB_Shading->Check(sal_False); + m_pCB_Shading->EnableTriState( false ); + m_pCB_Shading->Check(false); } else if(aProps.m_aShadeMode == drawing::ShadeMode_SMOOTH) { - m_pCB_Shading->EnableTriState( sal_False ); - m_pCB_Shading->Check(sal_True); + m_pCB_Shading->EnableTriState( false ); + m_pCB_Shading->Check(true); } else { - m_pCB_Shading->EnableTriState( sal_True ); + m_pCB_Shading->EnableTriState( true ); m_pCB_Shading->SetState( STATE_DONTKNOW ); } if(aProps.m_nObjectLines == 0) { - m_pCB_ObjectLines->EnableTriState( sal_False ); - m_pCB_ObjectLines->Check(sal_False); + m_pCB_ObjectLines->EnableTriState( false ); + m_pCB_ObjectLines->Check(false); } else if(aProps.m_nObjectLines==1) { - m_pCB_ObjectLines->EnableTriState( sal_False ); - m_pCB_ObjectLines->Check(sal_True); + m_pCB_ObjectLines->EnableTriState( false ); + m_pCB_ObjectLines->Check(true); } else { - m_pCB_ObjectLines->EnableTriState( sal_True ); + m_pCB_ObjectLines->EnableTriState( true ); m_pCB_ObjectLines->SetState( STATE_DONTKNOW ); } if(aProps.m_nRoundedEdges >= 5) { - m_pCB_RoundedEdge->EnableTriState( sal_False ); - m_pCB_RoundedEdge->Check(sal_True); + m_pCB_RoundedEdge->EnableTriState( false ); + m_pCB_RoundedEdge->Check(true); } else if(aProps.m_nRoundedEdges<0) { - m_pCB_RoundedEdge->EnableTriState( sal_False ); + m_pCB_RoundedEdge->EnableTriState( false ); m_pCB_RoundedEdge->SetState( STATE_DONTKNOW ); } else { - m_pCB_RoundedEdge->EnableTriState( sal_True ); - m_pCB_RoundedEdge->Check(sal_False); + m_pCB_RoundedEdge->EnableTriState( true ); + m_pCB_RoundedEdge->Check(false); } m_pCB_RoundedEdge->Enable( !m_pCB_ObjectLines->IsChecked() ); @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading) if( !m_bUpdateOtherControls ) return 0; - m_pCB_Shading->EnableTriState( sal_False ); + m_pCB_Shading->EnableTriState( false ); applyShadeModeToModel(); updateScheme(); return 0; @@ -327,15 +327,15 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check if( pCheckBox == m_pCB_ObjectLines ) { - m_pCB_ObjectLines->EnableTriState( sal_False ); + m_pCB_ObjectLines->EnableTriState( false ); m_bUpdateOtherControls = false; m_pCB_RoundedEdge->Enable( !m_pCB_ObjectLines->IsChecked() ); if(!m_pCB_RoundedEdge->IsEnabled()) - m_pCB_RoundedEdge->Check(sal_False); + m_pCB_RoundedEdge->Check(false); m_bUpdateOtherControls = true; } else - m_pCB_RoundedEdge->EnableTriState( sal_False ); + m_pCB_RoundedEdge->EnableTriState( false ); applyRoundedEdgeAndObjectLinesToModel(); updateScheme(); return 0; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index f6619c07c063..3389bf869af4 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -67,7 +67,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn m_pOrientHlp->Enable( true ); - m_pCbStacked->EnableTriState( sal_False ); + m_pCbStacked->EnableTriState( false ); m_pOrientHlp->AddDependentWindow( *m_pFlOrient ); m_pOrientHlp->AddDependentWindow( *m_pFtRotate, STATE_CHECK ); @@ -146,12 +146,12 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) SfxItemState aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { - m_pCbShowDescription->EnableTriState( sal_True ); + m_pCbShowDescription->EnableTriState( true ); m_pCbShowDescription->SetState( STATE_DONTKNOW ); } else { - m_pCbShowDescription->EnableTriState( sal_False ); + m_pCbShowDescription->EnableTriState( false ); sal_Bool bCheck = sal_False; if( aState == SFX_ITEM_SET ) bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); @@ -194,12 +194,12 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { - m_pCbTextOverlap->EnableTriState( sal_True ); + m_pCbTextOverlap->EnableTriState( true ); m_pCbTextOverlap->SetState( STATE_DONTKNOW ); } else { - m_pCbTextOverlap->EnableTriState( sal_False ); + m_pCbTextOverlap->EnableTriState( false ); sal_Bool bCheck = sal_False; if( aState == SFX_ITEM_SET ) bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); @@ -213,12 +213,12 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem ); if( aState == SFX_ITEM_DONTCARE ) { - m_pCbTextBreak->EnableTriState( sal_True ); + m_pCbTextBreak->EnableTriState( true ); m_pCbTextBreak->SetState( STATE_DONTKNOW ); } else { - m_pCbTextBreak->EnableTriState( sal_False ); + m_pCbTextBreak->EnableTriState( false ); sal_Bool bCheck = sal_False; if( aState == SFX_ITEM_SET ) bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue(); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 571b26070510..720e70d9037e 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -36,7 +36,7 @@ namespace PushButton& rChooserButton, bool bShow) { - if( rChooserButton.IsVisible() != (sal_Bool) bShow ) + if( rChooserButton.IsVisible() != bShow ) { rChooserButton.Show( bShow ); } diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 010b6e7dea14..43bdad7a2796 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -120,15 +120,15 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) { const SfxPoolItem *pPoolItem = NULL; - m_pRbtAxis1->Check(sal_True); - m_pRbtAxis2->Check(sal_False); + m_pRbtAxis1->Check(true); + m_pRbtAxis2->Check(false); if (rInAttrs.GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET) { long nVal=((const SfxInt32Item*)pPoolItem)->GetValue(); if(nVal==CHART_AXIS_SECONDARY_Y) { - m_pRbtAxis2->Check(sal_True); - m_pRbtAxis1->Check(sal_False); + m_pRbtAxis2->Check(true); + m_pRbtAxis1->Check(false); } } @@ -193,11 +193,11 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) long nVal=((const SfxInt32Item*)pPoolItem)->GetValue(); if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP) - m_pRB_DontPaint->Check(sal_True); + m_pRB_DontPaint->Check(true); else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO) - m_pRB_AssumeZero->Check(sal_True); + m_pRB_AssumeZero->Check(true); else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE) - m_pRB_ContinueLine->Check(sal_True); + m_pRB_ContinueLine->Check(true); } else { diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 08823d6efa83..8e94ae18276f 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -46,7 +46,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, m_pCtrlDial->SetText(m_pFtABCD->GetText()); m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked); - m_pCbStacked->EnableTriState( sal_False ); + m_pCbStacked->EnableTriState( false ); m_pOrientHlp->Enable( true ); m_pOrientHlp->AddDependentWindow( *m_pFtRotate, STATE_CHECK ); diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index cff710741412..347977a8871a 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -50,7 +50,7 @@ public: virtual ~DataEditor(); // Dialog - virtual sal_Bool Close(); + virtual bool Close(); void SetReadOnly( bool bReadOnly ); bool ApplyChangesToModel(); diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index c56489f000fb..917d69e8ae74 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -52,9 +52,9 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, adjustHighContrastMode(); // chart does not depend on exact pixel painting => enable antialiased drawing SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW | GetAntialiasing() ); - EnableRTL( sal_False ); + EnableRTL( false ); if( pParent ) - pParent->EnableRTL( sal_False );// #i96215# necessary for a correct position of the context menu in rtl mode + pParent->EnableRTL( false );// #i96215# necessary for a correct position of the context menu in rtl mode } ChartWindow::~ChartWindow() |