[Libreoffice-commits] core.git: basctl/source basic/source chart2/source comphelper/source compilerplugins/clang connectivity/source cui/source drawinglayer/source editeng/source filter/source forms/source fpicker/source framework/source hwpfilter/source i18npool/source idl/source include/canvas include/oox include/registry include/svtools mysqlc/source oox/source sax/source sax/test scripting/source sc/source sdext/source sd/source sfx2/source slideshow/source starmath/source svl/source svtools/source svx/source sw/inc sw/qa sw/source toolkit/source tools/source unoxml/source vcl/inc vcl/source vcl/unx writerperfect/inc writerperfect/source xmloff/source xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Aug 2 11:46:27 UTC 2017
basctl/source/basicide/layout.cxx | 2
basic/source/sbx/sbxarray.cxx | 2
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 10 -
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 6 -
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 8 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 24 ++--
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 16 +-
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 14 +-
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 18 +--
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 16 +-
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 18 +--
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 4
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 24 ++--
chart2/source/controller/dialogs/DataBrowser.cxx | 10 -
chart2/source/controller/dialogs/TitleDialogData.cxx | 24 ++--
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 8 -
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 2
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 6 -
chart2/source/controller/dialogs/tp_ChartType.cxx | 30 ++---
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 2
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 34 +++---
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 2
chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 4
chart2/source/controller/main/ChartController_Tools.cxx | 6 -
chart2/source/controller/main/ChartController_Window.cxx | 12 +-
chart2/source/controller/main/ChartWindow.cxx | 4
chart2/source/controller/main/DragMethod_PieSegment.cxx | 2
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 6 -
chart2/source/model/main/BaseCoordinateSystem.cxx | 2
chart2/source/model/main/ChartModel.cxx | 10 -
chart2/source/model/main/DataPoint.cxx | 2
chart2/source/model/main/DataSeries.cxx | 2
chart2/source/model/template/BarChartTypeTemplate.cxx | 2
chart2/source/model/template/CandleStickChartType.cxx | 2
chart2/source/model/template/ChartType.cxx | 2
chart2/source/model/template/PieChartTypeTemplate.cxx | 4
chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 4
chart2/source/tools/InternalDataProvider.cxx | 4
chart2/source/tools/LinearRegressionCurveCalculator.cxx | 4
chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 4
chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 4
chart2/source/tools/RegressionCurveCalculator.cxx | 2
chart2/source/tools/WrappedDefaultProperty.cxx | 6 -
chart2/source/tools/WrappedProperty.cxx | 20 +--
chart2/source/tools/WrappedPropertySet.cxx | 30 ++---
chart2/source/view/axes/Tickmarks.cxx | 4
chart2/source/view/axes/Tickmarks_Equidistant.cxx | 12 +-
chart2/source/view/axes/VAxisBase.cxx | 4
chart2/source/view/axes/VAxisProperties.cxx | 24 ++--
chart2/source/view/axes/VCartesianAxis.cxx | 8 -
chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 32 ++---
chart2/source/view/axes/VCartesianGrid.cxx | 6 -
chart2/source/view/axes/VCoordinateSystem.cxx | 8 -
chart2/source/view/axes/VPolarAngleAxis.cxx | 4
chart2/source/view/axes/VPolarCoordinateSystem.cxx | 34 +++---
chart2/source/view/axes/VPolarGrid.cxx | 10 -
chart2/source/view/charttypes/AreaChart.cxx | 12 +-
chart2/source/view/charttypes/BarChart.cxx | 6 -
chart2/source/view/charttypes/BubbleChart.cxx | 4
chart2/source/view/charttypes/CandleStickChart.cxx | 2
chart2/source/view/charttypes/NetChart.cxx | 8 -
chart2/source/view/charttypes/PieChart.cxx | 16 +-
chart2/source/view/charttypes/VSeriesPlotter.cxx | 32 ++---
chart2/source/view/main/DrawModelWrapper.cxx | 28 ++---
chart2/source/view/main/PlottingPositionHelper.cxx | 30 ++---
chart2/source/view/main/PolarLabelPositionHelper.cxx | 8 -
chart2/source/view/main/VDataSeries.cxx | 32 ++---
chart2/source/view/main/VLineProperties.cxx | 24 ++--
comphelper/source/eventattachermgr/eventattachermgr.cxx | 14 +-
comphelper/source/xml/attributelist.cxx | 6 -
compilerplugins/clang/plugin.hxx | 2
connectivity/source/drivers/postgresql/pq_driver.cxx | 2
connectivity/source/drivers/postgresql/pq_driver.hxx | 2
cui/source/customize/cfg.cxx | 4
cui/source/dialogs/hangulhanjadlg.cxx | 2
cui/source/options/cfgchart.cxx | 4
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 2
editeng/source/items/svxfont.cxx | 2
filter/source/config/cache/cacheitem.cxx | 12 +-
filter/source/msfilter/msdffimp.cxx | 8 -
filter/source/svg/svgwriter.cxx | 6 -
forms/source/component/RadioButton.cxx | 6 -
fpicker/source/aqua/SalAquaPicker.mm | 2
framework/source/dispatch/dispatchprovider.cxx | 2
framework/source/dispatch/mailtodispatcher.cxx | 2
framework/source/dispatch/popupmenudispatcher.cxx | 2
framework/source/dispatch/servicehandler.cxx | 2
framework/source/dispatch/systemexec.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
hwpfilter/source/hiodev.cxx | 2
i18npool/source/transliteration/transliterationImpl.cxx | 10 -
i18npool/source/transliteration/transliteration_Ignore.cxx | 6 -
i18npool/source/transliteration/transliteration_body.cxx | 2
i18npool/source/transliteration/transliteration_commonclass.cxx | 6 -
idl/source/prj/database.cxx | 2
include/canvas/propertysethelper.hxx | 8 -
include/oox/helper/containerhelper.hxx | 20 +--
include/registry/reader.hxx | 2
include/svtools/treelistbox.hxx | 4
mysqlc/source/mysqlc_connection.cxx | 2
oox/source/drawingml/chart/datasourcecontext.cxx | 2
oox/source/drawingml/shape.cxx | 8 -
sax/source/expatwrap/sax_expat.cxx | 4
sax/test/sax/testwriter.cxx | 6 -
sax/test/saxdemo.cxx | 6 -
sc/source/core/data/colorscale.cxx | 2
sc/source/core/data/dociter.cxx | 2
sc/source/core/data/formulacell.cxx | 4
sc/source/filter/oox/defnamesbuffer.cxx | 2
sc/source/ui/dbgui/scuiimoptdlg.cxx | 2
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6 -
sc/source/ui/unoobj/chart2uno.cxx | 2
sc/source/ui/unoobj/shapeuno.cxx | 4
sc/source/ui/vba/vbaworksheets.cxx | 2
sc/source/ui/view/viewfun2.cxx | 2
scripting/source/protocolhandler/scripthandler.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 56 +++++-----
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 4
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 2
sfx2/source/appl/appdispatchprovider.cxx | 2
sfx2/source/appl/macroloader.cxx | 2
sfx2/source/doc/Metadatable.cxx | 20 +--
sfx2/source/doc/objcont.cxx | 2
slideshow/source/engine/activities/activitybase.cxx | 2
slideshow/source/engine/eventqueue.cxx | 2
slideshow/source/engine/slide/layermanager.cxx | 2
slideshow/source/engine/slide/shapemanagerimpl.cxx | 4
slideshow/source/engine/slide/slideimpl.cxx | 2
slideshow/source/engine/slide/userpaintoverlay.cxx | 18 +--
slideshow/source/engine/transitions/slidechangebase.cxx | 2
slideshow/source/engine/waitsymbol.cxx | 2
starmath/source/cursor.cxx | 4
svl/source/items/itemprop.cxx | 2
svtools/source/contnr/treelistbox.cxx | 8 -
svtools/source/control/ruler.cxx | 2
svx/source/dialog/crashreportdlg.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/svdraw/svdotextdecomposition.cxx | 2
svx/source/svdraw/svdovirt.cxx | 2
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 4
sw/inc/calbck.hxx | 2
sw/inc/docary.hxx | 2
sw/qa/extras/uiwriter/uiwriter.cxx | 4
sw/source/core/crsr/bookmrk.cxx | 4
sw/source/core/crsr/pam.cxx | 2
sw/source/core/doc/docnew.cxx | 12 +-
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/inc/frame.hxx | 2
sw/source/core/layout/calcmove.cxx | 4
sw/source/core/layout/findfrm.cxx | 2
sw/source/core/layout/newfrm.cxx | 10 -
sw/source/core/layout/tabfrm.cxx | 4
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porrst.cxx | 2
sw/source/core/txtnode/fmtatr2.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 8 -
sw/source/core/unocore/unoport.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/filter/html/css1atr.cxx | 2
sw/source/ui/misc/glosbib.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/uibase/uiview/formatclipboard.cxx | 8 -
toolkit/source/awt/scrollabledialog.cxx | 2
tools/source/stream/stream.cxx | 4
unoxml/source/dom/document.cxx | 4
vcl/inc/unx/printergfx.hxx | 2
vcl/source/control/notebookbar.cxx | 2
vcl/source/window/window2.cxx | 2
vcl/unx/generic/print/genprnpsp.cxx | 2
writerperfect/inc/ImportFilter.hxx | 6 -
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 6 -
xmloff/source/core/xmluconv.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 6 -
xmloff/source/text/txtparae.cxx | 2
xmlsecurity/source/helper/xsecctl.cxx | 4
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 6 -
182 files changed, 634 insertions(+), 634 deletions(-)
New commits:
commit 3dcf6dfceee58360501396390d78c006351aef47
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Aug 2 12:57:55 2017 +0200
remove unnecessary use of 'this->'
Change-Id: I5c115389af7d24c18ddaf5fbec8c00f35017a5b4
Reviewed-on: https://gerrit.libreoffice.org/40671
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 9e92c2a247bb..f1805052ba41 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -97,7 +97,7 @@ void Layout::ArrangeWindows ()
if (bFirstSize)
{
bFirstSize = false;
- this->OnFirstSize(nWidth, nHeight); // virtual
+ OnFirstSize(nWidth, nHeight); // virtual
}
// sides
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index d09d3cf56eae..2900ef70ac22 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -532,7 +532,7 @@ SbxDimArray& SbxDimArray::operator=( const SbxDimArray& rArray )
{
SbxArray::operator=( static_cast<const SbxArray&>(rArray) );
m_vDimensions = rArray.m_vDimensions;
- this->mbHasFixedSize = rArray.mbHasFixedSize;
+ mbHasFixedSize = rArray.mbHasFixedSize;
}
return *this;
}
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 3dcbd4210a9f..53e21e9cce90 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -491,7 +491,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid()
// ____ XShape ____
awt::Point SAL_CALL AxisWrapper::getPosition()
{
- awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) );
+ awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( getAxis() ) );
return aResult;
}
@@ -502,7 +502,7 @@ void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ )
awt::Size SAL_CALL AxisWrapper::getSize()
{
- awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) );
+ awt::Size aSize( m_spChart2ModelContact->GetAxisSize( getAxis() ) );
return aSize;
}
@@ -581,7 +581,7 @@ void SAL_CALL AxisWrapper::removeEventListener(
//ReferenceSizePropertyProvider
void AxisWrapper::updateReferenceSize()
{
- Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getAxis(), uno::UNO_QUERY );
if( xProp.is() )
{
if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
@@ -592,7 +592,7 @@ void AxisWrapper::updateReferenceSize()
Any AxisWrapper::getReferenceSize()
{
Any aRet;
- Reference< beans::XPropertySet > xProp( this->getAxis(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getAxis(), uno::UNO_QUERY );
if( xProp.is() )
aRet = xProp->getPropertyValue("ReferencePageSize");
return aRet;
@@ -631,7 +631,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
// WrappedPropertySet
Reference< beans::XPropertySet > AxisWrapper::getInnerPropertySet()
{
- return Reference< beans::XPropertySet >( this->getAxis(), uno::UNO_QUERY );
+ return Reference< beans::XPropertySet >( getAxis(), uno::UNO_QUERY );
}
const Sequence< beans::Property >& AxisWrapper::getPropertySequence()
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 4770c8d1dbf6..e2febd960ea7 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -52,12 +52,12 @@ Chart2ModelContact::Chart2ModelContact(
Chart2ModelContact::~Chart2ModelContact()
{
- this->clear();
+ clear();
}
void Chart2ModelContact::setModel( const css::uno::Reference< css::frame::XModel >& xChartModel )
{
- this->clear();
+ clear();
m_xChartModel = xChartModel;
mpModel = dynamic_cast<ChartModel*>(xChartModel.get());
uno::Reference< lang::XMultiServiceFactory > xTableFactory( xChartModel, uno::UNO_QUERY );
@@ -95,7 +95,7 @@ Reference< chart2::XChartDocument > Chart2ModelContact::getChart2Document() cons
Reference< chart2::XDiagram > Chart2ModelContact::getChart2Diagram() const
{
- return ChartModelHelper::findDiagram( this->getChartModel() );
+ return ChartModelHelper::findDiagram( getChartModel() );
}
uno::Reference< lang::XUnoTunnel > const & Chart2ModelContact::getChartView() const
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index e1d872866b21..daa633e01eed 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -947,7 +947,7 @@ void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram )
uno::Reference< XDiagram > xDiagram( ChartDocumentWrapper::createInstance( rBaseDiagram ), uno::UNO_QUERY );
if( xDiagram.is() )
- this->setDiagram( xDiagram );
+ setDiagram( xDiagram );
}
void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAddIn )
@@ -979,7 +979,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const
{
// get additional non-chart shapes for XML export
uno::Reference< drawing::XShapes > xFoundShapes;
- uno::Reference< drawing::XDrawPage > xDrawPage( this->impl_getDrawPage() );
+ uno::Reference< drawing::XDrawPage > xDrawPage( impl_getDrawPage() );
uno::Reference< drawing::XShapes > xDrawPageShapes( xDrawPage, uno::UNO_QUERY );
if( !xDrawPageShapes.is() )
@@ -1036,7 +1036,7 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::
// ____ XDrawPageSupplier ____
uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage()
{
- return this->impl_getDrawPage();
+ return impl_getDrawPage();
}
uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const
@@ -1383,7 +1383,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
// this is a sort of dispose() from the new model,so release resources here
try
{
- this->dispose();
+ dispose();
}
catch (const uno::Exception& ex)
{
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 371249471359..52d59ff21b54 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -537,7 +537,7 @@ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Sour
bool DataSeriesPointWrapper::isSupportingAreaProperties()
{
- Reference< chart2::XDataSeries > xSeries( this->getDataSeries() );
+ Reference< chart2::XDataSeries > xSeries( getDataSeries() );
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) );
sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
@@ -565,7 +565,7 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties(
{
Reference< beans::XPropertySet > xPointProp;
- Reference< chart2::XDataSeries > xSeries( this->getDataSeries() );
+ Reference< chart2::XDataSeries > xSeries( getDataSeries() );
// may throw an IllegalArgumentException
if( xSeries.is() )
@@ -577,7 +577,7 @@ Reference< beans::XPropertySet > DataSeriesPointWrapper::getDataPointProperties(
//ReferenceSizePropertyProvider
void DataSeriesPointWrapper::updateReferenceSize()
{
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
{
if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
@@ -588,7 +588,7 @@ void DataSeriesPointWrapper::updateReferenceSize()
Any DataSeriesPointWrapper::getReferenceSize()
{
Any aRet;
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
aRet = xProp->getPropertyValue("ReferencePageSize");
return aRet;
@@ -794,16 +794,16 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert
switch(aNewValue)
{
case css::chart::ChartErrorCategory_CONSTANT_VALUE:
- aHigh = this->getPropertyValue("ConstantErrorHigh");
- aLow = this->getPropertyValue("ConstantErrorLow");
+ aHigh = getPropertyValue("ConstantErrorHigh");
+ aLow = getPropertyValue("ConstantErrorLow");
bSetHighAndLowValues = true;
break;
case css::chart::ChartErrorCategory_PERCENT:
- aHigh = aLow = this->getPropertyValue("PercentageError");
+ aHigh = aLow = getPropertyValue("PercentageError");
bSetHighAndLowValues = true;
break;
case css::chart::ChartErrorCategory_ERROR_MARGIN:
- aHigh = aLow = this->getPropertyValue("ErrorMargin");
+ aHigh = aLow = getPropertyValue("ErrorMargin");
bSetHighAndLowValues = true;
break;
default:
@@ -817,14 +817,14 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert
switch(aNewValue)
{
case css::chart::ChartErrorCategory_CONSTANT_VALUE:
- this->setPropertyValue("ConstantErrorHigh",aHigh);
- this->setPropertyValue("ConstantErrorLow",aLow);
+ setPropertyValue("ConstantErrorHigh",aHigh);
+ setPropertyValue("ConstantErrorLow",aLow);
break;
case css::chart::ChartErrorCategory_PERCENT:
- this->setPropertyValue("PercentageError",aHigh);
+ setPropertyValue("PercentageError",aHigh);
break;
case css::chart::ChartErrorCategory_ERROR_MARGIN:
- this->setPropertyValue("ErrorMargin",aHigh);
+ setPropertyValue("ErrorMargin",aHigh);
break;
default:
break;
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 67f3c256e549..d90aaa73f32c 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -727,7 +727,7 @@ awt::Point SAL_CALL DiagramWrapper::getPosition()
void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet() );
if( xProp.is() )
{
awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
@@ -757,7 +757,7 @@ awt::Size SAL_CALL DiagramWrapper::getSize()
void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet() );
if( xProp.is() )
{
awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
@@ -790,7 +790,7 @@ OUString SAL_CALL DiagramWrapper::getShapeType()
void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning()
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
- uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
{
xDiaProps->setPropertyValue( "RelativeSize", Any() );
@@ -799,7 +799,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning()
}
sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( )
{
- uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
{
Any aRelativeSize( xDiaProps->getPropertyValue( "RelativeSize" ) );
@@ -813,13 +813,13 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
- uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(true) );
}
sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning()
{
- uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
{
Any aRelativeSize( xDiaProps->getPropertyValue( "RelativeSize" ) );
@@ -841,7 +841,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
- uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(false) );
}
@@ -1487,7 +1487,7 @@ private: //member
WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: WrappedProperty("NumberOfLines",OUString())
, m_spChart2ModelContact( spChart2ModelContact )
- , m_aOuterValue( this->getPropertyDefault(nullptr) )
+ , m_aOuterValue( getPropertyDefault(nullptr) )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 9b20ac825035..5f763c67a272 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -84,7 +84,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
else
{
aRet = xInnerPropertySet->getPropertyValue( m_aInnerName );
- aRet = this->convertInnerToOuterValue( aRet );
+ aRet = convertInnerToOuterValue( aRet );
}
}
return aRet;
@@ -110,7 +110,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
return;
//set corresponding LegendPosition
- Any aInnerValue = this->convertOuterToInnerValue( rOuterValue );
+ Any aInnerValue = convertOuterToInnerValue( rOuterValue );
xInnerPropertySet->setPropertyValue( m_aInnerName, aInnerValue );
//correct LegendExpansion
@@ -282,7 +282,7 @@ awt::Point SAL_CALL LegendWrapper::getPosition()
void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
{
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet() );
if( xProp.is() )
{
awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
@@ -302,13 +302,13 @@ awt::Size SAL_CALL LegendWrapper::getSize()
void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize )
{
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet() );
if( xProp.is() )
{
awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
awt::Rectangle aPageRectangle( 0,0,aPageSize.Width,aPageSize.Height);
- awt::Point aPos( this->getPosition() );
+ awt::Point aPos( getPosition() );
awt::Rectangle aNewPositionAndSize(aPos.X,aPos.Y,aSize.Width,aSize.Height);
PositionAndSizeHelper::moveObject( OBJECTTYPE_LEGEND
@@ -347,7 +347,7 @@ void SAL_CALL LegendWrapper::removeEventListener(
//ReferenceSizePropertyProvider
void LegendWrapper::updateReferenceSize()
{
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
{
if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() )
@@ -358,7 +358,7 @@ void LegendWrapper::updateReferenceSize()
Any LegendWrapper::getReferenceSize()
{
Any aRet;
- Reference< beans::XPropertySet > xProp( this->getInnerPropertySet(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getInnerPropertySet(), uno::UNO_QUERY );
if( xProp.is() )
aRet = xProp->getPropertyValue( "ReferencePageSize" );
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index ecdffda68ad3..579252a64814 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -257,7 +257,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin
OUString aPropertyName( rNameSeq[nN] );
try
{
- this->setPropertyValue( aPropertyName, rValueSeq[nN] );
+ setPropertyValue( aPropertyName, rValueSeq[nN] );
}
catch( const beans::UnknownPropertyException& ex )
{
@@ -275,7 +275,7 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyValue( aPropertyName );
+ aRetSeq[nN] = getPropertyValue( aPropertyName );
}
}
return aRetSeq;
@@ -304,8 +304,8 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin
if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() )
return beans::PropertyState_DEFAULT_VALUE;
- uno::Any aDefault( this->getPropertyDefault( rPropertyName ) );
- uno::Any aValue( this->getPropertyValue( rPropertyName ) );
+ uno::Any aDefault( getPropertyDefault( rPropertyName ) );
+ uno::Any aValue( getPropertyValue( rPropertyName ) );
if( aDefault == aValue )
return beans::PropertyState_DEFAULT_VALUE;
@@ -321,14 +321,14 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyState( aPropertyName );
+ aRetSeq[nN] = getPropertyState( aPropertyName );
}
}
return aRetSeq;
}
void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName )
{
- this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
+ setPropertyValue( rPropertyName, getPropertyDefault(rPropertyName) );
}
uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName )
@@ -348,7 +348,7 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( )
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
{
OUString aPropertyName( rPropSeq[nN].Name );
- this->setPropertyToDefault( aPropertyName );
+ setPropertyToDefault( aPropertyName );
}
}
void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq )
@@ -356,7 +356,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OU
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- this->setPropertyToDefault( aPropertyName );
+ setPropertyToDefault( aPropertyName );
}
}
uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq )
@@ -368,7 +368,7 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyDefault( aPropertyName );
+ aRetSeq[nN] = getPropertyDefault( aPropertyName );
}
}
return aRetSeq;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 5c03301bb21c..bd4e44614e88 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -200,12 +200,12 @@ TitleWrapper::~TitleWrapper()
// ____ XShape ____
awt::Point SAL_CALL TitleWrapper::getPosition()
{
- return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() );
+ return m_spChart2ModelContact->GetTitlePosition( getTitleObject() );
}
void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
{
- Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xPropertySet( getInnerPropertySet() );
if(xPropertySet.is())
{
awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
@@ -220,7 +220,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
awt::Size SAL_CALL TitleWrapper::getSize()
{
- return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() );
+ return m_spChart2ModelContact->GetTitleSize( getTitleObject() );
}
void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ )
@@ -260,7 +260,7 @@ Reference< beans::XPropertySet > TitleWrapper::getFirstCharacterPropertySet()
{
Reference< beans::XPropertySet > xProp;
- Reference< chart2::XTitle > xTitle( this->getTitleObject() );
+ Reference< chart2::XTitle > xTitle( getTitleObject() );
if( xTitle.is())
{
Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText());
@@ -299,7 +299,7 @@ void TitleWrapper::setFastCharacterPropertyValue(
OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
- Reference< chart2::XTitle > xTitle( this->getTitleObject() );
+ Reference< chart2::XTitle > xTitle( getTitleObject() );
if( xTitle.is())
{
Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText());
@@ -426,7 +426,7 @@ void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPrope
//ReferenceSizePropertyProvider
void TitleWrapper::updateReferenceSize()
{
- Reference< beans::XPropertySet > xProp( this->getTitleObject(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getTitleObject(), uno::UNO_QUERY );
if( xProp.is() )
{
if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() )
@@ -437,7 +437,7 @@ void TitleWrapper::updateReferenceSize()
Any TitleWrapper::getReferenceSize()
{
Any aRet;
- Reference< beans::XPropertySet > xProp( this->getTitleObject(), uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xProp( getTitleObject(), uno::UNO_QUERY );
if( xProp.is() )
aRet = xProp->getPropertyValue( "ReferencePageSize" );
@@ -457,7 +457,7 @@ Reference< chart2::XTitle > TitleWrapper::getTitleObject()
Reference< beans::XPropertySet > TitleWrapper::getInnerPropertySet()
{
- return Reference< beans::XPropertySet >( this->getTitleObject(), uno::UNO_QUERY );
+ return Reference< beans::XPropertySet >( getTitleObject(), uno::UNO_QUERY );
}
const Sequence< beans::Property >& TitleWrapper::getPropertySequence()
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 256eb8c29461..ea7ea6e36a5c 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -233,7 +233,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString
OUString aPropertyName( rNameSeq[nN] );
try
{
- this->setPropertyValue( aPropertyName, rValueSeq[nN] );
+ setPropertyValue( aPropertyName, rValueSeq[nN] );
}
catch( const beans::UnknownPropertyException& ex )
{
@@ -251,7 +251,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyValue( aPropertyName );
+ aRetSeq[nN] = getPropertyValue( aPropertyName );
}
}
return aRetSeq;
@@ -272,8 +272,8 @@ void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence<
//XPropertyState
beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName )
{
- uno::Any aDefault( this->getPropertyDefault( rPropertyName ) );
- uno::Any aValue( this->getPropertyValue( rPropertyName ) );
+ uno::Any aDefault( getPropertyDefault( rPropertyName ) );
+ uno::Any aValue( getPropertyValue( rPropertyName ) );
if( aDefault == aValue )
return beans::PropertyState_DEFAULT_VALUE;
@@ -289,14 +289,14 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyState( aPropertyName );
+ aRetSeq[nN] = getPropertyState( aPropertyName );
}
}
return aRetSeq;
}
void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName )
{
- this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
+ setPropertyValue( rPropertyName, getPropertyDefault(rPropertyName) );
}
uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName )
@@ -316,7 +316,7 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( )
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
{
OUString aPropertyName( rPropSeq[nN].Name );
- this->setPropertyToDefault( aPropertyName );
+ setPropertyToDefault( aPropertyName );
}
}
void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq )
@@ -324,7 +324,7 @@ void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUS
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- this->setPropertyToDefault( aPropertyName );
+ setPropertyToDefault( aPropertyName );
}
}
uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq )
@@ -336,7 +336,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyDefault( aPropertyName );
+ aRetSeq[nN] = getPropertyDefault( aPropertyName );
}
}
return aRetSeq;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 2c34d58db293..125e5f48785e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -48,7 +48,7 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons
throw lang::IllegalArgumentException( "Property 'NumberFormat' requires value of type sal_Int32", nullptr, 0 );
if(xInnerPropertySet.is())
- xInnerPropertySet->setPropertyValue(getInnerName(), this->convertOuterToInnerValue(rOuterValue));
+ xInnerPropertySet->setPropertyValue(getInnerName(), convertOuterToInnerValue(rOuterValue));
}
Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 1336709da311..449b347057bf 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -67,7 +67,7 @@ public:
if (!xChartTypePropertySet.is())
continue;
- Any aSingleValue = this->convertInnerToOuterValue( xChartTypePropertySet->getPropertyValue(m_aOwnInnerName) );
+ Any aSingleValue = convertInnerToOuterValue( xChartTypePropertySet->getPropertyValue(m_aOwnInnerName) );
PROPERTYTYPE aCurValue = PROPERTYTYPE();
aSingleValue >>= aCurValue;
if( !bHasDetectableInnerValue )
@@ -116,7 +116,7 @@ public:
css::uno::Reference< css::beans::XPropertySet > xChartTypePropertySet( aChartTypes[nN], css::uno::UNO_QUERY );
if( xChartTypePropertySet.is() )
{
- xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::Any(aNewValue)));
+ xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,convertOuterToInnerValue(uno::Any(aNewValue)));
}
}
catch( uno::Exception & ex )
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();
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 1898a18797b3..0c1d2255e931 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -133,7 +133,7 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut)
void DrawViewWrapper::ReInit()
{
- OutputDevice* pOutDev = this->GetFirstOutputDevice();
+ OutputDevice* pOutDev = GetFirstOutputDevice();
Size aOutputSize(100,100);
if(pOutDev)
aOutputSize = pOutDev->GetOutputSize();
@@ -144,13 +144,13 @@ void DrawViewWrapper::ReInit()
mbGridVisible = false;
mbHlplVisible = false;
- this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
+ SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
//a correct work area is at least necessary for correct values in the position and size dialog
tools::Rectangle aRect(Point(0,0), aOutputSize);
- this->SetWorkArea(aRect);
+ SetWorkArea(aRect);
- this->ShowSdrPage(this->GetModel()->GetPage(0));
+ ShowSdrPage(GetModel()->GetPage(0));
}
DrawViewWrapper::~DrawViewWrapper()
@@ -161,7 +161,7 @@ DrawViewWrapper::~DrawViewWrapper()
SdrPageView* DrawViewWrapper::GetPageView() const
{
- SdrPageView* pSdrPageView = this->GetSdrPageView();
+ SdrPageView* pSdrPageView = GetSdrPageView();
return pSdrPageView;
};
@@ -226,9 +226,9 @@ void DrawViewWrapper::MarkObject( SdrObject* pObj )
if( m_pMarkHandleProvider )
bFrameDragSingles = m_pMarkHandleProvider->getFrameDragSingles();
- this->SetFrameDragSingles(bFrameDragSingles);//decide whether each single object should get handles
- this->SdrView::MarkObj( pObj, this->GetPageView() );
- this->showMarkHandles();
+ SetFrameDragSingles(bFrameDragSingles);//decide whether each single object should get handles
+ SdrView::MarkObj( pObj, GetPageView() );
+ showMarkHandles();
}
void DrawViewWrapper::setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider )
@@ -240,14 +240,14 @@ void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg
{
svtools::ColorConfig aColorConfig;
Color aFillColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
- this->SetApplicationBackgroundColor(aFillColor);
- this->E3dView::CompleteRedraw( pOut, rReg );
+ SetApplicationBackgroundColor(aFillColor);
+ E3dView::CompleteRedraw( pOut, rReg );
}
SdrObject* DrawViewWrapper::getSelectedObject() const
{
SdrObject* pObj(nullptr);
- const SdrMarkList& rMarkList = this->GetMarkedObjectList();
+ const SdrMarkList& rMarkList = GetMarkedObjectList();
if(rMarkList.GetMarkCount() == 1)
{
SdrMark* pMark = rMarkList.GetMark(0);
@@ -258,7 +258,7 @@ SdrObject* DrawViewWrapper::getSelectedObject() const
SdrObject* DrawViewWrapper::getTextEditObject() const
{
- SdrObject* pObj = this->getSelectedObject();
+ SdrObject* pObj = getSelectedObject();
SdrObject* pTextObj = nullptr;
if( pObj && pObj->HasTextEdit())
pTextObj = static_cast<SdrTextObj*>(pObj);
@@ -299,7 +299,7 @@ SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const
{
if(rName.isEmpty())
return nullptr;
- SdrPageView* pSdrPageView = this->GetPageView();
+ SdrPageView* pSdrPageView = GetPageView();
if( pSdrPageView )
{
return DrawModelWrapper::getNamedSdrObject( rName, pSdrPageView->GetObjList() );
@@ -320,14 +320,14 @@ bool DrawViewWrapper::IsObjectHit( SdrObject const * pObj, const Point& rPnt )
void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
//prevent wrong reselection of objects
- SdrModel* pSdrModel( this->GetModel() );
+ SdrModel* pSdrModel( GetModel() );
if( pSdrModel && pSdrModel->isLocked() )
return;
const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
//#i76053# do nothing when only changes on the hidden draw page were made ( e.g. when the symbols for the dialogs are created )
- SdrPageView* pSdrPageView = this->GetPageView();
+ SdrPageView* pSdrPageView = GetPageView();
if( pSdrHint && pSdrPageView )
{
if( pSdrPageView->GetPage() != pSdrHint->GetPage() )
@@ -343,7 +343,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
// #i79965# remember map mode
OSL_ASSERT( ! m_bRestoreMapMode );
- OutputDevice* pOutDev = this->GetFirstOutputDevice();
+ OutputDevice* pOutDev = GetFirstOutputDevice();
if( pOutDev )
{
m_aMapModeToRestore = pOutDev->GetMapMode();
@@ -356,7 +356,7 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
OSL_ASSERT( m_bRestoreMapMode );
if( m_bRestoreMapMode )
{
- OutputDevice* pOutDev = this->GetFirstOutputDevice();
+ OutputDevice* pOutDev = GetFirstOutputDevice();
if( pOutDev )
{
pOutDev->SetMapMode( m_aMapModeToRestore );
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 34d983605907..5b66bf5e018e 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -146,7 +146,7 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const
Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, const SfxItemSet* pSymbolShapeProperties ) const
{
- SdrObjList* pSymbolList = this->GetSymbolList();
+ SdrObjList* pSymbolList = GetSymbolList();
if( !pSymbolList->GetObjCount() )
return Graphic();
if(nStandardSymbol<0)
diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
index 9befc3810665..b8e284827136 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
@@ -47,7 +47,7 @@ void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
}
for( ; aIter != aEnd; ++aIter )
{
- SfxItemSet aSet = this->CreateEmptyItemSet();
+ SfxItemSet aSet = CreateEmptyItemSet();
(*aIter)->FillItemSet( aSet );
InvalidateUnequalItems( rOutItemSet, aSet );
}
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index ab8189642b36..2135ae701eee 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -48,7 +48,7 @@ using namespace ::com::sun::star;
void ChartController::executeDispatch_EditText( const Point* pMousePixel )
{
- this->StartTextEdit( pMousePixel );
+ StartTextEdit( pMousePixel );
}
void ChartController::StartTextEdit( const Point* pMousePixel )
@@ -154,7 +154,7 @@ void ChartController::executeDispatch_InsertSpecialCharacter()
return;
}
if( !m_pDrawViewWrapper->IsTextEdit() )
- this->StartTextEdit();
+ StartTextEdit();
SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE( pFact, "No dialog factory" );
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 68b85a0b65a8..36c6a569985e 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -334,7 +334,7 @@ void ChartController::impl_PasteGraphic(
// note: the XPropertySet of the model is the old API. Also the property
// "AdditionalShapes" that is used there.
uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY );
- DrawModelWrapper * pDrawModelWrapper( this->GetDrawModelWrapper());
+ DrawModelWrapper * pDrawModelWrapper( GetDrawModelWrapper());
if( ! (xGraphic.is() && xModelProp.is()))
return;
uno::Reference< lang::XMultiServiceFactory > xFact( pDrawModelWrapper->getShapeFactory());
@@ -377,7 +377,7 @@ void ChartController::impl_PasteGraphic(
void ChartController::impl_PasteShapes( SdrModel* pModel )
{
- DrawModelWrapper* pDrawModelWrapper( this->GetDrawModelWrapper() );
+ DrawModelWrapper* pDrawModelWrapper( GetDrawModelWrapper() );
if ( pDrawModelWrapper && m_pDrawViewWrapper )
{
Reference< drawing::XDrawPage > xDestPage( pDrawModelWrapper->getMainDrawPage() );
@@ -433,7 +433,7 @@ void ChartController::impl_PasteShapes( SdrModel* pModel )
void ChartController::impl_PasteStringAsTextShape( const OUString& rString, const awt::Point& rPosition )
{
- DrawModelWrapper* pDrawModelWrapper( this->GetDrawModelWrapper() );
+ DrawModelWrapper* pDrawModelWrapper( GetDrawModelWrapper() );
if ( pDrawModelWrapper && m_pDrawViewWrapper )
{
const Reference< lang::XMultiServiceFactory >& xShapeFactory( pDrawModelWrapper->getShapeFactory() );
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index dbbccd268591..c05c56af059d 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -524,7 +524,7 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl, Timer *, void)
if( !m_bWaitingForMouseUp && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() )
{
- this->impl_selectObjectAndNotiy();
+ impl_selectObjectAndNotiy();
SolarMutexGuard aGuard;
auto pChartWindow(GetChartWindow());
if( pChartWindow )
@@ -592,7 +592,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
}
else
{
- this->EndTextEdit();
+ EndTextEdit();
}
}
@@ -882,7 +882,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
if( !m_bWaitingForDoubleClick && m_aSelection.maybeSwitchSelectionAfterSingleClickWasEnsured() )
{
- this->impl_selectObjectAndNotiy();
+ impl_selectObjectAndNotiy();
}
}
else
@@ -1308,7 +1308,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
bReturn = true;
if( nCode == KEY_ESCAPE )
{
- this->EndTextEdit();
+ EndTextEdit();
}
}
}
@@ -1616,9 +1616,9 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
SolarMutexGuard aGuard;
if ( m_pDrawViewWrapper && m_pDrawViewWrapper->IsTextEdit() )
{
- this->EndTextEdit();
+ EndTextEdit();
}
- this->impl_selectObjectAndNotiy();
+ impl_selectObjectAndNotiy();
auto pChartWindow(GetChartWindow());
if ( pChartWindow )
{
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index c35cf55a067e..b03f10164b17 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -57,8 +57,8 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi
#endif
{
set_id("chart_window");
- this->SetHelpId( HID_SCH_WIN_DOCUMENT );
- this->SetMapMode( MapMode(MapUnit::Map100thMM) );
+ SetHelpId( HID_SCH_WIN_DOCUMENT );
+ SetMapMode( MapMode(MapUnit::Map100thMM) );
adjustHighContrastMode();
// chart does not depend on exact pixel painting => enable antialiased drawing
SetAntialiasing( AntialiasingFlags::EnableB2dDraw | GetAntialiasing() );
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 8271118a2e6f..4e831cfc4d5e 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -110,7 +110,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/)
try
{
- Reference< frame::XModel > xChartModel( this->getChartModel() );
+ Reference< frame::XModel > xChartModel( getChartModel() );
if( xChartModel.is() )
{
Reference< beans::XPropertySet > xPointProperties(
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 3dbfa1810cd4..3afb0008ad5c 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -73,7 +73,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
m_aWireframePolyPolygon = m_pScene->CreateWireframe();
- uno::Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram(this->getChartModel()) );
+ uno::Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram(getChartModel()) );
uno::Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY );
if( xDiagramProperties.is() )
{
@@ -161,12 +161,12 @@ bool DragMethod_RotateDiagram::EndSdrDrag(bool /*bCopy*/)
if(m_bRightAngledAxes)
ThreeDHelper::adaptRadAnglesForRightAngledAxes( fResultX, fResultY );
- ThreeDHelper::setRotationAngleToDiagram( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( this->getChartModel() ), uno::UNO_QUERY )
+ ThreeDHelper::setRotationAngleToDiagram( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( getChartModel() ), uno::UNO_QUERY )
, fResultX, fResultY, fResultZ );
}
else
{
- ThreeDHelper::setRotationToDiagram( ( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( this->getChartModel() ), uno::UNO_QUERY ) )
+ ThreeDHelper::setRotationToDiagram( ( uno::Reference< beans::XPropertySet >( ChartModelHelper::findDiagram( getChartModel() ), uno::UNO_QUERY ) )
, m_nInitialHorizontalAngleDegree+m_nAdditionalHorizontalAngleDegree, m_nInitialVerticalAngleDegree+m_nAdditionalVerticalAngleDegree );
}
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index f5d9c854b94f..f6043b0d5cdc 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -230,7 +230,7 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension(
OSL_ASSERT( m_aAllAxis.size() == static_cast< size_t >( getDimension()));
- if( nAxisIndex < 0 || nAxisIndex > this->getMaximumAxisIndexByDimension(nDimensionIndex) )
+ if( nAxisIndex < 0 || nAxisIndex > getMaximumAxisIndexByDimension(nDimensionIndex) )
throw lang::IndexOutOfBoundsException();
return m_aAllAxis[ nDimensionIndex ][nAxisIndex];
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index a73aa04f49ef..c0289c3af548 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -887,7 +887,7 @@ Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighli
{
if( ! m_xRangeHighlighter.is())
{
- uno::Reference< view::XSelectionSupplier > xSelSupp( this->getCurrentController(), uno::UNO_QUERY );
+ uno::Reference< view::XSelectionSupplier > xSelSupp( getCurrentController(), uno::UNO_QUERY );
if( xSelSupp.is() )
m_xRangeHighlighter.set( ChartModelHelper::createRangeHighlighter( xSelSupp ));
}
@@ -1036,7 +1036,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
//get view from old api wrapper
Reference< datatransfer::XTransferable > xTransferable(
- this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
+ createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
if( xTransferable.is() )
{
datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType,
@@ -1071,13 +1071,13 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor )
{
uno::Any aResult;
- if( this->isDataFlavorSupported( aFlavor ))
+ if( isDataFlavorSupported( aFlavor ))
{
try
{
//get view from old api wrapper
Reference< datatransfer::XTransferable > xTransferable(
- this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
+ createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
if( xTransferable.is() &&
xTransferable->isDataFlavorSupported( aFlavor ))
{
@@ -1289,7 +1289,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM
OUString SAL_CALL ChartModel::dump()
{
uno::Reference< qa::XDumper > xDumper(
- this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
+ createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY );
if (xDumper.is())
return xDumper->dump();
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index ec3e3cfe292d..b61911bc1eed 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -188,7 +188,7 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast(
{
uno::Any aOldValue;
Reference< util::XModifyBroadcaster > xBroadcaster;
- this->getFastPropertyValue( aOldValue, nHandle );
+ getFastPropertyValue( aOldValue, nHandle );
if( aOldValue.hasValue() &&
(aOldValue >>= xBroadcaster) &&
xBroadcaster.is())
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 6eebded278cb..0df608770e26 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -276,7 +276,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast(
{
uno::Any aOldValue;
Reference< util::XModifyBroadcaster > xBroadcaster;
- this->getFastPropertyValue( aOldValue, nHandle );
+ getFastPropertyValue( aOldValue, nHandle );
if( aOldValue.hasValue() &&
(aOldValue >>= xBroadcaster) &&
xBroadcaster.is())
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 85eb2d5c7724..cf176a1e153e 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -257,7 +257,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle(
{
//apply Geometry3D
uno::Any aAGeometry3D;
- this->getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D );
+ getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D );
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Geometry3D", aAGeometry3D );
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 32cae2fa556c..99f3de05a8e3 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -296,7 +296,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
{
uno::Any aOldValue;
Reference< util::XModifyBroadcaster > xBroadcaster;
- this->getFastPropertyValue( aOldValue, nHandle );
+ getFastPropertyValue( aOldValue, nHandle );
if( aOldValue.hasValue() &&
(aOldValue >>= xBroadcaster) &&
xBroadcaster.is())
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index a6b182c2497d..d3b9e2bfab86 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -178,7 +178,7 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData
m_bNotifyChanges = false;
try
{
- Sequence< Reference< chart2::XDataSeries > > aOldSeries( this->getDataSeries() );
+ Sequence< Reference< chart2::XDataSeries > > aOldSeries( getDataSeries() );
for( sal_Int32 nN=0; nN<aOldSeries.getLength(); ++nN )
ModifyListenerHelper::removeListener( aOldSeries[nN], m_xModifyEventForwarder );
m_aDataSeries.clear();
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 4cf0c415e207..9f7c559617db 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -459,11 +459,11 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
const OUString aOffsetPropName( "Offset" );
// get offset mode
chart2::PieChartOffsetMode ePieOffsetMode;
- this->getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode;
+ getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode;
// get default offset
double fDefaultOffset = 0.5;
- this->getFastPropertyValue( PROP_PIE_TEMPLATE_DEFAULT_OFFSET ) >>= fDefaultOffset;
+ getFastPropertyValue( PROP_PIE_TEMPLATE_DEFAULT_OFFSET ) >>= fDefaultOffset;
double fOffsetToSet = fDefaultOffset;
uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index d3c0cf84fbd9..fe5adbca6dc6 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -138,9 +138,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul
// optimize result
uno::Sequence< geometry::RealPoint2D > aResult( 2 );
aResult[0].X = min;
- aResult[0].Y = this->getCurveValue( min );
+ aResult[0].Y = getCurveValue( min );
aResult[1].X = max;
- aResult[1].Y = this->getCurveValue( max );
+ aResult[1].Y = getCurveValue( max );
return aResult;
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 439762471e26..cc6a7c31e49c 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -902,11 +902,11 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
sal_Int32 nLevelCount = lcl_getInnerLevelCount( aCategories );
if( nLevelCount == 1 )
{
- aResult = this->getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::number( 0 ) );
+ aResult = getDataByRangeRepresentation( lcl_aCategoriesLevelRangeNamePrefix + OUString::number( 0 ) );
}
else
{
- Sequence< OUString > aLabels = m_bDataInColumns ? this->getRowDescriptions() : this->getColumnDescriptions();
+ Sequence< OUString > aLabels = m_bDataInColumns ? getRowDescriptions() : getColumnDescriptions();
aResult.realloc( aLabels.getLength() );
transform( aLabels.begin(), aLabels.end(),
aResult.getArray(), CommonFunctors::makeAny< OUString >() );
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 7c6e5240d14e..d9b2b5e02983 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -62,9 +62,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator:
// optimize result
uno::Sequence< geometry::RealPoint2D > aResult( 2 );
aResult[0].X = min;
- aResult[0].Y = this->getCurveValue( min );
+ aResult[0].Y = getCurveValue( min );
aResult[1].X = max;
- aResult[1].Y = this->getCurveValue( max );
+ aResult[1].Y = getCurveValue( max );
return aResult;
}
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 8102c6afb8d7..4891d5766ef9 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -115,9 +115,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul
// optimize result
uno::Sequence< geometry::RealPoint2D > aResult( 2 );
aResult[0].X = min;
- aResult[0].Y = this->getCurveValue( min );
+ aResult[0].Y = getCurveValue( min );
aResult[1].X = max;
- aResult[1].Y = this->getCurveValue( max );
+ aResult[1].Y = getCurveValue( max );
return aResult;
}
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 92ae9ed8ef29..ea97330cce78 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -127,9 +127,9 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat
// optimize result
uno::Sequence< geometry::RealPoint2D > aResult( 2 );
aResult[0].X = min;
- aResult[0].Y = this->getCurveValue( min );
+ aResult[0].Y = getCurveValue( min );
aResult[1].X = max;
- aResult[1].Y = this->getCurveValue( max );
+ aResult[1].Y = getCurveValue( max );
return aResult;
}
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 4a1dc26a468d..836f74f04deb 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -161,7 +161,7 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa
if( bDoXScaling )
x = xInverseScaling->doScaling( x );
aResult[nP].X = x;
- aResult[nP].Y = this->getCurveValue( x );
+ aResult[nP].Y = getCurveValue( x );
}
return aResult;
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index ef74d61e9dee..cb87cfa23f62 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -42,7 +42,7 @@ void WrappedDefaultProperty::setPropertyToDefault(
{
Reference< beans::XPropertySet > xInnerPropSet( xInnerPropertyState, uno::UNO_QUERY );
if( xInnerPropSet.is())
- this->setPropertyValue( m_aOuterDefaultValue, xInnerPropSet );
+ setPropertyValue( m_aOuterDefaultValue, xInnerPropSet );
}
uno::Any WrappedDefaultProperty::getPropertyDefault(
@@ -58,8 +58,8 @@ beans::PropertyState WrappedDefaultProperty::getPropertyState(
try
{
Reference< beans::XPropertySet > xInnerProp( xInnerPropertyState, uno::UNO_QUERY_THROW );
- uno::Any aValue = this->getPropertyValue( xInnerProp );
- if( m_aOuterDefaultValue == this->convertInnerToOuterValue( aValue ))
+ uno::Any aValue = getPropertyValue( xInnerProp );
+ if( m_aOuterDefaultValue == convertInnerToOuterValue( aValue ))
aState = beans::PropertyState_DEFAULT_VALUE;
}
catch( const beans::UnknownPropertyException& ex )
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index 0b7c93c70dc6..d6ccf5895047 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -54,7 +54,7 @@ Any WrappedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
void WrappedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
{
if(xInnerPropertySet.is())
- xInnerPropertySet->setPropertyValue( this->getInnerName(), this->convertOuterToInnerValue( rOuterValue ) );
+ xInnerPropertySet->setPropertyValue( getInnerName(), convertOuterToInnerValue( rOuterValue ) );
}
Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
@@ -62,16 +62,16 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x
Any aRet;
if( xInnerPropertySet.is() )
{
- aRet = xInnerPropertySet->getPropertyValue( this->getInnerName() );
- aRet = this->convertInnerToOuterValue( aRet );
+ aRet = xInnerPropertySet->getPropertyValue( getInnerName() );
+ aRet = convertInnerToOuterValue( aRet );
}
return aRet;
}
void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
{
- if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() )
- xInnerPropertyState->setPropertyToDefault(this->getInnerName());
+ if( xInnerPropertyState.is() && !getInnerName().isEmpty() )
+ xInnerPropertyState->setPropertyToDefault(getInnerName());
else
{
Reference< beans::XPropertySet > xInnerProp( xInnerPropertyState, uno::UNO_QUERY );
@@ -84,8 +84,8 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState
Any aRet;
if( xInnerPropertyState.is() )
{
- aRet = xInnerPropertyState->getPropertyDefault( this->getInnerName() );
- aRet = this->convertInnerToOuterValue( aRet );
+ aRet = xInnerPropertyState->getPropertyDefault( getInnerName() );
+ aRet = convertInnerToOuterValue( aRet );
}
return aRet;
}
@@ -93,7 +93,7 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState
beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
{
beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE;
- OUString aInnerName( this->getInnerName() );
+ OUString aInnerName( getInnerName() );
if( xInnerPropertyState.is() && !aInnerName.isEmpty() )
aState = xInnerPropertyState->getPropertyState( aInnerName );
else
@@ -101,12 +101,12 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::
try
{
Reference< beans::XPropertySet > xInnerProp( xInnerPropertyState, uno::UNO_QUERY );
- uno::Any aValue = this->getPropertyValue( xInnerProp );
+ uno::Any aValue = getPropertyValue( xInnerProp );
if( !aValue.hasValue() )
aState = beans::PropertyState_DEFAULT_VALUE;
else
{
- uno::Any aDefault = this->getPropertyDefault( xInnerPropertyState );
+ uno::Any aDefault = getPropertyDefault( xInnerPropertyState );
if( aValue == aDefault )
aState = beans::PropertyState_DEFAULT_VALUE;
}
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 401b63e8f35b..75aea02f3d44 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -96,7 +96,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
const WrappedProperty* pWrappedProperty = getWrappedProperty( nHandle );
- Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() );
if( pWrappedProperty )
pWrappedProperty->setPropertyValue( rValue, xInnerPropertySet );
else if( xInnerPropertySet.is() )
@@ -142,7 +142,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
const WrappedProperty* pWrappedProperty = getWrappedProperty( nHandle );
- Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() );
if( pWrappedProperty )
aRet = pWrappedProperty->getPropertyValue( xInnerPropertySet );
else if( xInnerPropertySet.is() )
@@ -177,7 +177,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName
void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener )
{
- Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() );
if( xInnerPropertySet.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -189,7 +189,7 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr
}
void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener )
{
- Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() );
if( xInnerPropertySet.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -201,7 +201,7 @@ void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString&
}
void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener )
{
- Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() );
if( xInnerPropertySet.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -213,7 +213,7 @@ void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPr
}
void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener )
{
- Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
+ Reference< beans::XPropertySet > xInnerPropertySet( getInnerPropertySet() );
if( xInnerPropertySet.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -234,7 +234,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
OUString aPropertyName( rNameSeq[nN] );
try
{
- this->setPropertyValue( aPropertyName, rValueSeq[nN] );
+ setPropertyValue( aPropertyName, rValueSeq[nN] );
}
catch( const beans::UnknownPropertyException& ex )
{
@@ -258,7 +258,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
try
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyValue( aPropertyName );
+ aRetSeq[nN] = getPropertyValue( aPropertyName );
}
catch( const beans::UnknownPropertyException& ex )
{
@@ -293,7 +293,7 @@ beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUStri
{
beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
- Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
+ Reference< beans::XPropertyState > xInnerPropertyState( getInnerPropertyState() );
if( xInnerPropertyState.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -328,7 +328,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates(
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyState( aPropertyName );
+ aRetSeq[nN] = getPropertyState( aPropertyName );
}
}
return aRetSeq;
@@ -336,7 +336,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates(
void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName )
{
- Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
+ Reference< beans::XPropertyState > xInnerPropertyState( getInnerPropertyState() );
if( xInnerPropertyState.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -349,7 +349,7 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert
Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName )
{
Any aRet;
- Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
+ Reference< beans::XPropertyState > xInnerPropertyState( getInnerPropertyState() );
if( xInnerPropertyState.is() )
{
const WrappedProperty* pWrappedProperty = getWrappedProperty( rPropertyName );
@@ -368,7 +368,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( )
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
{
OUString aPropertyName( rPropSeq[nN].Name );
- this->setPropertyToDefault( aPropertyName );
+ setPropertyToDefault( aPropertyName );
}
}
void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUString >& rNameSeq )
@@ -376,7 +376,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- this->setPropertyToDefault( aPropertyName );
+ setPropertyToDefault( aPropertyName );
}
}
Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq )
@@ -388,7 +388,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
OUString aPropertyName( rNameSeq[nN] );
- aRetSeq[nN] = this->getPropertyDefault( aPropertyName );
+ aRetSeq[nN] = getPropertyDefault( aPropertyName );
}
}
return aRetSeq;
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 901242455252..60a8d4bcf167 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -210,7 +210,7 @@ void TickFactory2D::addPointSequenceForTickLine( drawing::PointSequenceSequence&
if( fInnerDirectionSign==0.0 )
fInnerDirectionSign = 1.0;
- B2DVector aTickScreenPosition = this->getTickScreenPosition2D(fScaledLogicTickValue);
+ B2DVector aTickScreenPosition = getTickScreenPosition2D(fScaledLogicTickValue);
if( bPlaceAtLabels )
aTickScreenPosition += m_aAxisLineToLabelLineShift;
@@ -305,7 +305,7 @@ void TickFactory2D::updateScreenValues( TickInfoArraysType& rAllTickInfos ) cons
{
TickInfo& rTickInfo = (*aTickIter);
rTickInfo.aTickScreenPosition =
- this->getTickScreenPosition2D( rTickInfo.fScaledTickValue );
+ getTickScreenPosition2D( rTickInfo.fScaledTickValue );
}
}
}
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index df37b2ef07fd..e22faf768011 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -146,7 +146,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::
if(!pfNextParentTick)
return;
- sal_Int32 nMaxSubTickCount = this->getMaxTickCount( nDepth );
+ sal_Int32 nMaxSubTickCount = getMaxTickCount( nDepth );
if(!nMaxSubTickCount)
return;
@@ -159,7 +159,7 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::
{
for( sal_Int32 nPartTick = 1; nPartTick<nIntervalCount; nPartTick++ )
{
- pValue = this->getMinorTick( nPartTick, nDepth
+ pValue = getMinorTick( nPartTick, nDepth
, fLastParentTick, *pfNextParentTick );
if(!pValue)
continue;
@@ -311,8 +311,8 @@ bool EquidistantTickFactory::isVisible( double fScaledValue ) const
void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) const
{
//create point sequences for each tick depth
- sal_Int32 nDepthCount = this->getTickDepth();
- sal_Int32 nMaxMajorTickCount = this->getMaxTickCount(0);
+ sal_Int32 nDepthCount = getTickDepth();
+ sal_Int32 nMaxMajorTickCount = getMaxTickCount(0);
if (nDepthCount <= 0 || nMaxMajorTickCount <= 0)
return;
@@ -323,7 +323,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co
sal_Int32 nRealMajorTickCount = 0;
for( sal_Int32 nMajorTick=0; nMajorTick<nMaxMajorTickCount; nMajorTick++ )
{
- double* pValue = this->getMajorTick( nMajorTick );
+ double* pValue = getMajorTick( nMajorTick );
if(!pValue)
continue;
aAllTicks[0][nRealMajorTickCount] = *pValue;
@@ -334,7 +334,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co
aAllTicks[0].realloc(nRealMajorTickCount);
if(nDepthCount>0)
- this->addSubTicks( 1, aAllTicks );
+ addSubTicks( 1, aAllTicks );
//so far we have added all ticks between the outer major tick marks
//this was necessary to create sub ticks correctly
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 59ed66cdc917..2f48b1c8facf 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -152,7 +152,7 @@ void VAxisBase::setExplicitScaleAndIncrement(
void VAxisBase::createAllTickInfos( TickInfoArraysType& rAllTickInfos )
{
- std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
+ std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
if( m_aScale.ShiftedCategoryPosition )
apTickFactory->getAllTicksShifted( rAllTickInfos );
else
@@ -178,7 +178,7 @@ bool VAxisBase::prepareShapeCreation()
return true;
//create named group shape
- m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : "");
+ m_xGroupShape_Shapes = createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : "");
if( m_aAxisProperties.m_bDisplayLabels )
m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget, m_aCID );
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index f791d065a126..43ef2d33ea12 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -273,7 +273,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
void AxisProperties::init( bool bCartesian )
{
uno::Reference< beans::XPropertySet > xProp =
- uno::Reference<beans::XPropertySet>::query( this->m_xAxisModel );
+ uno::Reference<beans::XPropertySet>::query( m_xAxisModel );
if( !xProp.is() )
return;
@@ -347,11 +347,11 @@ void AxisProperties::init( bool bCartesian )
else if(m_nMajorTickmarks!=0)
nMaxDepth=1;
- this->m_aTickmarkPropertiesList.clear();
+ m_aTickmarkPropertiesList.clear();
for( sal_Int32 nDepth=0; nDepth<nMaxDepth; nDepth++ )
{
- TickmarkProperties aTickmarkProperties = this->makeTickmarkProperties( nDepth );
- this->m_aTickmarkPropertiesList.push_back( aTickmarkProperties );
+ TickmarkProperties aTickmarkProperties = makeTickmarkProperties( nDepth );
+ m_aTickmarkPropertiesList.push_back( aTickmarkProperties );
}
}
catch( const uno::Exception& e )
@@ -382,26 +382,26 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
{
try
{
- xProp->getPropertyValue( "TextBreak" ) >>= this->bLineBreakAllowed;
- xProp->getPropertyValue( "TextOverlap" ) >>= this->bOverlapAllowed;
- xProp->getPropertyValue( "StackCharacters" ) >>= this->bStackCharacters;
- xProp->getPropertyValue( "TextRotation" ) >>= this->fRotationAngleDegree;
+ xProp->getPropertyValue( "TextBreak" ) >>= bLineBreakAllowed;
+ xProp->getPropertyValue( "TextOverlap" ) >>= bOverlapAllowed;
+ xProp->getPropertyValue( "StackCharacters" ) >>= bStackCharacters;
+ xProp->getPropertyValue( "TextRotation" ) >>= fRotationAngleDegree;
css::chart::ChartAxisArrangeOrderType eArrangeOrder;
xProp->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder;
switch(eArrangeOrder)
{
case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE:
- this->eStaggering = SIDE_BY_SIDE;
+ eStaggering = SIDE_BY_SIDE;
break;
case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN:
- this->eStaggering = STAGGER_EVEN;
+ eStaggering = STAGGER_EVEN;
break;
case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD:
- this->eStaggering = STAGGER_ODD;
+ eStaggering = STAGGER_ODD;
break;
default:
- this->eStaggering = STAGGER_AUTO;
+ eStaggering = STAGGER_AUTO;
break;
}
}
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 63d50e40e172..d5429ac3ff59 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1560,7 +1560,7 @@ void VCartesianAxis::createLabels()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1614,7 +1614,7 @@ void VCartesianAxis::createMaximumLabels()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1651,7 +1651,7 @@ void VCartesianAxis::updatePositions()
if (!m_aAxisProperties.m_bDisplayLabels)
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
@@ -1752,7 +1752,7 @@ void VCartesianAxis::createShapes()
if( !prepareShapeCreation() )
return;
- std::unique_ptr< TickFactory2D > apTickFactory2D( this->createTickFactory2D() );
+ std::unique_ptr< TickFactory2D > apTickFactory2D( createTickFactory2D() );
TickFactory2D* pTickFactory2D = apTickFactory2D.get();
if( !pTickFactory2D )
return;
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 9321ec109678..091d61718a60 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list