diff options
Diffstat (limited to 'chart2/source/controller/dialogs')
10 files changed, 55 insertions, 55 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 58b28cd88c81..7b91f73dd2d7 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -87,24 +87,24 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit bool ChartTypeParameter::mapsToSameService( const ChartTypeParameter& rParameter ) const { - return this->mapsToSimilarService( rParameter, 0 ); + return mapsToSimilarService( rParameter, 0 ); } bool ChartTypeParameter::mapsToSimilarService( const ChartTypeParameter& rParameter, sal_Int32 nTheHigherTheLess ) const { sal_Int32 nMax=7; if(nTheHigherTheLess>nMax) return true; - if( this->bXAxisWithValues!=rParameter.bXAxisWithValues ) + if( bXAxisWithValues!=rParameter.bXAxisWithValues ) return nTheHigherTheLess>nMax-1; - if( this->b3DLook!=rParameter.b3DLook ) + if( b3DLook!=rParameter.b3DLook ) return nTheHigherTheLess>nMax-2; - if( this->eStackMode!=rParameter.eStackMode ) + if( eStackMode!=rParameter.eStackMode ) return nTheHigherTheLess>nMax-3; - if( this->nSubTypeIndex!=rParameter.nSubTypeIndex ) + if( nSubTypeIndex!=rParameter.nSubTypeIndex ) return nTheHigherTheLess>nMax-4; - if( this->bSymbols!=rParameter.bSymbols ) + if( bSymbols!=rParameter.bSymbols ) return nTheHigherTheLess>nMax-5; - if( this->bLines!=rParameter.bLines ) + if( bLines!=rParameter.bLines ) return nTheHigherTheLess>nMax-6; return true; } @@ -124,7 +124,7 @@ Image ChartTypeDialogController::getImage() } bool ChartTypeDialogController::isSubType( const OUString& rServiceName ) { - const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap(); + const tTemplateServiceChartTypeParameterMap& rTemplateMap = getTemplateMap(); tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName )); return aIt != rTemplateMap.end(); } @@ -133,7 +133,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( , const uno::Reference< beans::XPropertySet >& xTemplateProps ) { ChartTypeParameter aRet; - const tTemplateServiceChartTypeParameterMap& rTemplateMap = this->getTemplateMap(); + const tTemplateServiceChartTypeParameterMap& rTemplateMap = getTemplateMap(); tTemplateServiceChartTypeParameterMap::const_iterator aIt( rTemplateMap.find( rServiceName )); if( aIt != rTemplateMap.end()) aRet = (*aIt).second; @@ -275,7 +275,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { uno::Reference< XChartTypeTemplate > xTemplate(nullptr); - OUString aServiceName( this->getServiceNameForParameter( rParameter ) ); + OUString aServiceName( getServiceNameForParameter( rParameter ) ); if(!aServiceName.isEmpty()) { xTemplate.set( xTemplateManager->createInstance( aServiceName ), uno::UNO_QUERY ); @@ -315,7 +315,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla try { - this->setTemplateProperties( xTemplateProps ); + setTemplateProperties( xTemplateProps ); } catch( const uno::Exception & ex ) { @@ -331,7 +331,7 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame , const uno::Reference< XChartDocument >& xChartModel ) { uno::Reference< lang::XMultiServiceFactory > xTemplateManager( xChartModel->getChartTypeManager(), uno::UNO_QUERY ); - uno::Reference< XChartTypeTemplate > xTemplate( this->getCurrentTemplate( rParameter, xTemplateManager ) ); + uno::Reference< XChartTypeTemplate > xTemplate( getCurrentTemplate( rParameter, xTemplateManager ) ); if(xTemplate.is()) { uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY); diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index bff4b4f2c6d6..b9ef8f7c6129 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -1275,13 +1275,13 @@ void DataBrowser::RenewSeriesHeaders() void DataBrowser::ImplAdjustHeaderControls() { - sal_uInt16 nColCount = this->GetColumnCount(); - sal_uInt32 nCurrentPos = this->GetPosPixel().getX(); - sal_uInt32 nMaxPos = nCurrentPos + this->GetOutputSizePixel().getWidth(); + sal_uInt16 nColCount = GetColumnCount(); + sal_uInt32 nCurrentPos = GetPosPixel().getX(); + sal_uInt32 nMaxPos = nCurrentPos + GetOutputSizePixel().getWidth(); sal_uInt32 nStartPos = nCurrentPos; // width of header column - nCurrentPos += this->GetColumnWidth( 0 ); + nCurrentPos += GetColumnWidth( 0 ); Dialog* pDialog = GetParentDialog(); vcl::Window* pWin = pDialog->get<VclContainer>("columns"); @@ -1301,7 +1301,7 @@ void DataBrowser::ImplAdjustHeaderControls() if( (*aIt)->GetStartColumn() == i ) nStartPos = nCurrentPos; - nCurrentPos += (this->GetColumnWidth( i )); + nCurrentPos += (GetColumnWidth( i )); if( (*aIt)->GetEndColumn() == i ) { diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index 892c9a46003d..52ed6c38f767 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -47,11 +47,11 @@ void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChar //get possibilities uno::Sequence< sal_Bool > aAxisPossibilityList; AxisHelper::getAxisOrGridPossibilities( aAxisPossibilityList, xDiagram ); - this->aPossibilityList[2]=aAxisPossibilityList[0];//x axis title - this->aPossibilityList[3]=aAxisPossibilityList[1];//y axis title - this->aPossibilityList[4]=aAxisPossibilityList[2];//z axis title - this->aPossibilityList[5]=aAxisPossibilityList[3];//secondary x axis title - this->aPossibilityList[6]=aAxisPossibilityList[4];//secondary y axis title + aPossibilityList[2]=aAxisPossibilityList[0];//x axis title + aPossibilityList[3]=aAxisPossibilityList[1];//y axis title + aPossibilityList[4]=aAxisPossibilityList[2];//z axis title + aPossibilityList[5]=aAxisPossibilityList[3];//secondary x axis title + aPossibilityList[6]=aAxisPossibilityList[4];//secondary y axis title //find out which title exists and get their text //main title: @@ -61,8 +61,8 @@ void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChar { uno::Reference< XTitle > xTitle = TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nTitleIndex ), xChartModel ); - this->aExistenceList[nTitleIndex] = xTitle.is(); - this->aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle ); + aExistenceList[nTitleIndex] = xTitle.is(); + aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle ); } } @@ -76,12 +76,12 @@ bool TitleDialogData::writeDifferenceToModel( nN < static_cast< sal_Int32 >( TitleHelper::NORMAL_TITLE_END ); nN++) { - if( !pOldState || ( pOldState->aExistenceList[nN] != this->aExistenceList[nN] ) ) + if( !pOldState || ( pOldState->aExistenceList[nN] != aExistenceList[nN] ) ) { - if(this->aExistenceList[nN]) + if(aExistenceList[nN]) { TitleHelper::createTitle( - static_cast< TitleHelper::eTitleType >( nN ), this->aTextList[nN], xChartModel, xContext, + static_cast< TitleHelper::eTitleType >( nN ), aTextList[nN], xChartModel, xContext, apReferenceSizeProvider.get() ); bChanged = true; } @@ -91,14 +91,14 @@ bool TitleDialogData::writeDifferenceToModel( bChanged = true; } } - else if( !pOldState || ( pOldState->aTextList[nN] != this->aTextList[nN] ) ) + else if( !pOldState || ( pOldState->aTextList[nN] != aTextList[nN] ) ) { //change content uno::Reference< XTitle > xTitle( TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ) ); if(xTitle.is()) { - TitleHelper::setCompleteString( this->aTextList[nN], xTitle, xContext ); + TitleHelper::setCompleteString( aTextList[nN], xTitle, xContext ); bChanged = true; } } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 180af39f4b56..97f7d6030208 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -58,7 +58,7 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame: m_pDialogModel.reset(new DialogModel(m_xChartModel, m_xComponentContext)); defaultButton(WizardButtonFlags::FINISH); - this->setTitleBase(SchResId(STR_DLG_CHART_WIZARD)); + setTitleBase(SchResId(STR_DLG_CHART_WIZARD)); WizardPath aPath = { STATE_CHARTTYPE, @@ -69,13 +69,13 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const uno::Reference<frame: declarePath(PATH_FULL, aPath); - this->SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP); - this->SetRoadmapInteractive(true); + SetRoadmapHelpId(HID_SCH_WIZARD_ROADMAP); + SetRoadmapInteractive(true); Size aAdditionalRoadmapSize(LogicToPixel(Size(85, 0), MapUnit::MapAppFont)); Size aSize(LogicToPixel(Size(CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT), MapUnit::MapAppFont)); aSize.Width() += aAdditionalRoadmapSize.Width(); - this->SetSizePixel(aSize); + SetSizePixel(aSize); if (!m_pDialogModel->getModel().isDataFromSpreadsheet()) { diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 5cf894f2313c..38873290091e 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -52,7 +52,7 @@ InsertErrorBarsDialog::InsertErrorBarsDialog( { ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X; - this->SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) ); + SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) ); m_apErrorBarResources->SetChartDocumentForRangeChoosing( xChartDocument ); } diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 07d8e5564dde..1a48ef5125ca 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -338,7 +338,7 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier ); m_pNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter(); - this->SetText( pDialogParameter->getLocalizedName() ); + SetText( pDialogParameter->getLocalizedName() ); SvtCJKOptions aCJKOptions; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index f691d7cc5f68..7f9d4fe106c6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, lcl_selectColor( *m_pLB_AmbientLight, lcl_getAmbientColor( m_xSceneProperties )); - this->updatePreview(); + updatePreview(); } void ThreeD_SceneIllumination_TabPage::applyLightSourceToModel( sal_uInt32 nLightNumber ) @@ -449,7 +449,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, SvxColorListBox&, r applyLightSourceToModel( nL ); } } - this->updatePreview(); + updatePreview(); } IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) @@ -495,7 +495,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, { lcl_selectColor( *m_pLB_LightSource, pInfo->aLightSource.nDiffuseColor ); } - this->updatePreview(); + updatePreview(); } void ThreeD_SceneIllumination_TabPage::updatePreview() diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 7228effb0e49..795571f6e569 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -334,7 +334,7 @@ SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent ) get(m_pFT_SplineOrder, "PolynomialsLabel"); get(m_pMF_SplineOrder, "PolynomialsSpinButton"); - this->SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ); + SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ); m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) ); } @@ -692,7 +692,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent m_pFT_ChooseType->SetStyle(m_pFT_ChooseType->GetStyle() | WB_NOLABEL); } - this->SetText( SchResId(STR_PAGE_CHARTTYPE) ); + SetText( SchResId(STR_PAGE_CHARTTYPE) ); m_pMainTypeList->SetStyle(m_pMainTypeList->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK ); m_pMainTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) ); @@ -817,7 +817,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ ) return; m_nChangingCalls++; - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); if( m_pCurrentMainType ) { m_pCurrentMainType->adjustParameterToSubType( aParameter ); @@ -838,7 +838,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ ) ASSERT_EXCEPTION(ex); } //the controls have to be enabled/disabled accordingly - this->fillAllControls( aParameter ); + fillAllControls( aParameter ); m_nChangingCalls--; } @@ -857,9 +857,9 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) { if( m_pCurrentMainType ) { - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); m_pCurrentMainType->adjustParameterToSubType( aParameter ); - this->fillAllControls( aParameter, false ); + fillAllControls( aParameter, false ); commitToModel( aParameter ); } } @@ -871,7 +871,7 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void) void ChartTypeTabPage::selectMainType() { - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); if( m_pCurrentMainType ) { @@ -879,10 +879,10 @@ void ChartTypeTabPage::selectMainType() m_pCurrentMainType->hideExtraControls(); } - m_pCurrentMainType = this->getSelectedMainType(); + m_pCurrentMainType = getSelectedMainType(); if( m_pCurrentMainType ) { - this->showAllControls(*m_pCurrentMainType); + showAllControls(*m_pCurrentMainType); m_pCurrentMainType->adjustParameterToMainType( aParameter ); commitToModel( aParameter ); @@ -902,8 +902,8 @@ void ChartTypeTabPage::selectMainType() ASSERT_EXCEPTION(ex); } - this->fillAllControls( aParameter ); - uno::Reference< beans::XPropertySet > xTemplateProps( this->getCurrentTemplate(), uno::UNO_QUERY ); + fillAllControls( aParameter ); + uno::Reference< beans::XPropertySet > xTemplateProps( getCurrentTemplate(), uno::UNO_QUERY ); m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps); } } @@ -967,10 +967,10 @@ void ChartTypeTabPage::initializePage() bFound = true; m_pMainTypeList->SelectEntryPos( nM ); - this->showAllControls( **aIter ); + showAllControls( **aIter ); uno::Reference< beans::XPropertySet > xTemplateProps( aTemplate.first, uno::UNO_QUERY ); ChartTypeParameter aParameter = (*aIter)->getChartTypeParameterForService( aServiceName, xTemplateProps ); - m_pCurrentMainType = this->getSelectedMainType(); + m_pCurrentMainType = getSelectedMainType(); //set ThreeDLookScheme aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( xDiagram ); @@ -987,7 +987,7 @@ void ChartTypeTabPage::initializePage() ASSERT_EXCEPTION(ex); } - this->fillAllControls( aParameter ); + fillAllControls( aParameter ); if( m_pCurrentMainType ) m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps); break; @@ -1015,7 +1015,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeTabPage::getCurrentTemplate() cons { if( m_pCurrentMainType && m_xChartModel.is() ) { - ChartTypeParameter aParameter( this->getCurrentParamter() ); + ChartTypeParameter aParameter( getCurrentParamter() ); m_pCurrentMainType->adjustParameterToSubType( aParameter ); uno::Reference< lang::XMultiServiceFactory > xTemplateManager( m_xChartModel->getChartTypeManager(), uno::UNO_QUERY ); return m_pCurrentMainType->getCurrentTemplate( aParameter, xTemplateManager ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 14d99d672ce3..627b96aae979 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -219,7 +219,7 @@ DataSourceTabPage::DataSourceTabPage( m_pFT_CAPTION->Show(!bHideDescription); m_aFixedTextRange = m_pFT_RANGE->GetText(); - this->SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ); + SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) ); // set handlers m_pLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl )); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 6879b87c34fb..c4ec2b3f24f1 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -96,7 +96,7 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent m_pFT_Caption->Show(!bHideDescription); - this->SetText( m_pFTTitle->GetText());// OH:remove later with dialog + SetText( m_pFTTitle->GetText());// OH:remove later with dialog // set defaults as long as DetectArguments does not work m_pRB_Columns->Check(); |