ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

remove unnecessary use of 'this->'

Browse Source 
Change-Id: I5c115389af7d24c18ddaf5fbec8c00f35017a5b4
Reviewed-on: https://gerrit.libreoffice.org/40671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-08-02 13:45:36 +02:00
parent 3b35bcf25f
commit 3dcf6dfcee
182 changed files with 634 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basctl/source/basicide/layout.cxx
+1 -1
View File
@@ -97,7 +97,7 @@ void Layout::ArrangeWindows ()
if (bFirstSize)
{
bFirstSize = false;
this->OnFirstSize(nWidth, nHeight); // virtual
OnFirstSize(nWidth, nHeight); // virtual
}
// sides
basic/source/sbx/sbxarray.cxx
+1 -1
View File
@@ -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;
}
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+5 -5
View File
@@ -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()
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+3 -3
View File
@@ -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
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+4 -4
View File
@@ -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)
{
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+12 -12
View File
@@ -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;
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+8 -8
View File
@@ -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) )
{
}
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+7 -7
View File
@@ -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" );
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+9 -9
View File
@@ -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;
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+8 -8
View File
@@ -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()
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+9 -9
View File
@@ -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;
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+1 -1
View File
@@ -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
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+2 -2
View File
@@ -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 )
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+12 -12
View File
@@ -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);
chart2/source/controller/dialogs/DataBrowser.cxx
+5 -5
View File
@@ -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 )
{
chart2/source/controller/dialogs/TitleDialogData.cxx
+12 -12
View File
@@ -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;
}
}
chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+4 -4
View File
@@ -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())
{
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+1 -1
View File
@@ -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 );
}
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+1 -1
View File
@@ -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;
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+3 -3
View File
@@ -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()
chart2/source/controller/dialogs/tp_ChartType.cxx
+15 -15
View File
@@ -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 );
chart2/source/controller/dialogs/tp_DataSource.cxx
+1 -1
View File
@@ -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 ));
chart2/source/controller/dialogs/tp_RangeChooser.cxx
+1 -1
View File
@@ -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();
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+17 -17
View File
@@ -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 );
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+1 -1
View File
@@ -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)
chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+1 -1
View File
@@ -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 );
}
chart2/source/controller/main/ChartController_TextEdit.cxx
+2 -2
View File
@@ -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" );
chart2/source/controller/main/ChartController_Tools.cxx
+3 -3
View File
@@ -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() );
chart2/source/controller/main/ChartController_Window.cxx
+6 -6
View File
@@ -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 )
{
chart2/source/controller/main/ChartWindow.cxx
+2 -2
View File
@@ -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() );
chart2/source/controller/main/DragMethod_PieSegment.cxx
+1 -1
View File
@@ -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(
chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+3 -3
View File
@@ -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 );
}
chart2/source/model/main/BaseCoordinateSystem.cxx
+1 -1
View File
@@ -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];
chart2/source/model/main/ChartModel.cxx
+5 -5
View File
@@ -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();
chart2/source/model/main/DataPoint.cxx
+1 -1
View File
@@ -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())
chart2/source/model/main/DataSeries.cxx
+1 -1
View File
@@ -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())
chart2/source/model/template/BarChartTypeTemplate.cxx
+1 -1
View File
@@ -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 )
chart2/source/model/template/CandleStickChartType.cxx
+1 -1
View File
@@ -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())
chart2/source/model/template/ChartType.cxx
+1 -1
View File
@@ -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();
chart2/source/model/template/PieChartTypeTemplate.cxx
+2 -2
View File
@@ -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;
chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+2 -2
View File
@@ -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;
}
chart2/source/tools/InternalDataProvider.cxx
+2 -2
View File
@@ -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 >() );
chart2/source/tools/LinearRegressionCurveCalculator.cxx
+2 -2
View File
@@ -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;
}
chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+2 -2
View File
@@ -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;
}
chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+2 -2
View File
@@ -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;
}
chart2/source/tools/RegressionCurveCalculator.cxx
+1 -1
View File
@@ -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;
chart2/source/tools/WrappedDefaultProperty.cxx
+3 -3
View File
@@ -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 )
chart2/source/tools/WrappedProperty.cxx
+10 -10
View File
@@ -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;
}
chart2/source/tools/WrappedPropertySet.cxx
+15 -15
View File
@@ -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;
chart2/source/view/axes/Tickmarks.cxx
+2 -2
View File
@@ -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 );
}
}
}
chart2/source/view/axes/Tickmarks_Equidistant.cxx
+6 -6
View File
@@ -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
chart2/source/view/axes/VAxisBase.cxx
+2 -2
View File
@@ -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 );
chart2/source/view/axes/VAxisProperties.cxx
+12 -12
View File
@@ -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;
}
}
chart2/source/view/axes/VCartesianAxis.cxx
+4 -4
View File
@@ -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;
chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+16 -16
View File
@@ -67,7 +67,7 @@ void VCartesianCoordinateSystem::createGridShapes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
for( sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
{
@@ -77,15 +77,15 @@ void VCartesianCoordinateSystem::createGridShapes()
continue;
VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis ));
aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex)
, this->getExplicitIncrement(nDimensionIndex,nAxisIndex) );
aGrid.setExplicitScaleAndIncrement( getExplicitScale(nDimensionIndex,nAxisIndex)
, getExplicitIncrement(nDimensionIndex,nAxisIndex) );
aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos );
aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
, this->createCIDForGrid( nDimensionIndex,nAxisIndex ) );
, createCIDForGrid( nDimensionIndex,nAxisIndex ) );
if(nDimensionCount==2)
aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen );
aGrid.setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
aGrid.setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
aGrid.createShapes();
}
}
@@ -104,7 +104,7 @@ void VCartesianCoordinateSystem::createVAxisList(
m_aAxisMap.clear();
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
if(nDimensionCount<=0)
return;
@@ -118,11 +118,11 @@ void VCartesianCoordinateSystem::createVAxisList(
sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex);
for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ )
{
Reference< XAxis > xAxis = this->getAxisByDimension(nDimensionIndex,nAxisIndex);
Reference< XAxis > xAxis = getAxisByDimension(nDimensionIndex,nAxisIndex);
if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel ))
continue;
AxisProperties aAxisProperties(xAxis,this->getExplicitCategoriesProvider());
AxisProperties aAxisProperties(xAxis,getExplicitCategoriesProvider());
aAxisProperties.m_nDimensionIndex = nDimensionIndex;
aAxisProperties.m_bSwapXAndY = bSwapXAndY;
aAxisProperties.m_bIsMainAxis = (nAxisIndex==0);
@@ -146,7 +146,7 @@ void VCartesianCoordinateSystem::createVAxisList(
}
aAxisProperties.init(true);
if(aAxisProperties.m_bDisplayLabels)
aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc);
aAxisProperties.m_nNumberFormatKey = getNumberFormatKeyForAxis(xAxis, xChartDoc);
std::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
@@ -164,7 +164,7 @@ void VCartesianCoordinateSystem::initVAxisInList()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -175,12 +175,12 @@ void VCartesianCoordinateSystem::initVAxisInList()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
, this->createCIDForAxis( nDimensionIndex, nAxisIndex ) );
, createCIDForAxis( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
pVAxis->setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
}
}
}
@@ -191,7 +191,7 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -202,10 +202,10 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
pVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
pVAxis->setScales( getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
}
}
}
chart2/source/view/axes/VCartesianGrid.cxx
+3 -3
View File
@@ -200,7 +200,7 @@ void VCartesianGrid::createShapes()
//create named group shape
Reference< drawing::XShapes > xGroupShape_Shapes(
this->createGroupShape( m_xLogicTarget, m_aCID ) );
createGroupShape( m_xLogicTarget, m_aCID ) );
if(!xGroupShape_Shapes.is())
return;
@@ -209,7 +209,7 @@ void VCartesianGrid::createShapes()
fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create all scaled tickmark values
std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
TickFactory& aTickFactory = *apTickFactory.get();
TickInfoArraysType aAllTickInfos;
aTickFactory.getAllTicks( aAllTickInfos );
@@ -232,7 +232,7 @@ void VCartesianGrid::createShapes()
Reference< drawing::XShapes > xTarget( xGroupShape_Shapes );
if( nDepth > 0 )
{
xTarget.set( this->createGroupShape( m_xLogicTarget
xTarget.set( createGroupShape( m_xLogicTarget
, ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) )
) );
if(!xTarget.is())
chart2/source/view/axes/VCoordinateSystem.cxx
+4 -4
View File
@@ -178,7 +178,7 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
if( nYResolution < 10 )
nYResolution = 10;
if( this->getPropertySwapXAndYAxis() )
if( getPropertySwapXAndYAxis() )
std::swap(nXResolution,nYResolution);
//2D
@@ -232,7 +232,7 @@ void VCoordinateSystem::impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex
{
impl_adjustDimension( rDimensionIndex );
if( rAxisIndex < 0 || rAxisIndex > this->getMaximumAxisIndexByDimension(rDimensionIndex) )
if( rAxisIndex < 0 || rAxisIndex > getMaximumAxisIndexByDimension(rDimensionIndex) )
rAxisIndex = 0;
}
@@ -251,7 +251,7 @@ std::vector< ExplicitScaleData > VCoordinateSystem::getExplicitScales( sal_Int32
std::vector< ExplicitScaleData > aRet(m_aExplicitScales);
impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex );
aRet[nDimensionIndex]=this->getExplicitScale( nDimensionIndex, nAxisIndex );
aRet[nDimensionIndex]=getExplicitScale( nDimensionIndex, nAxisIndex );
return aRet;
}
@@ -261,7 +261,7 @@ std::vector< ExplicitIncrementData > VCoordinateSystem::getExplicitIncrements( s
std::vector< ExplicitIncrementData > aRet(m_aExplicitIncrements);
impl_adjustDimensionAndIndex( nDimensionIndex, nAxisIndex );
aRet[nDimensionIndex]=this->getExplicitIncrement( nDimensionIndex, nAxisIndex );
aRet[nDimensionIndex]=getExplicitIncrement( nDimensionIndex, nAxisIndex );
return aRet;
}
chart2/source/view/axes/VPolarAngleAxis.cxx
+2 -2
View File
@@ -164,13 +164,13 @@ void VPolarAngleAxis::createLabels()
if( m_aAxisProperties.m_bDisplayLabels )
{
//get the transformed screen values for all tickmarks in aAllTickInfos
std::unique_ptr< TickFactory > apTickFactory( this->createTickFactory() );
std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
//create tick mark text shapes
//@todo: iterate through all tick depth which should be labeled
EquidistantTickIter aTickIter( m_aAllTickInfos, m_aIncrement, 0 );
this->updateUnscaledValuesAtTicks( aTickIter );
updateUnscaledValuesAtTicks( aTickIter );
removeTextShapesFromTicks();
chart2/source/view/axes/VPolarCoordinateSystem.cxx
+17 -17
View File
@@ -46,7 +46,7 @@ uno::Sequence< sal_Int32 > VPolarCoordinateSystem::getCoordinateSystemResolution
if( aResolution.getLength() >= 2 )
{
if( this->getPropertySwapXAndYAxis() )
if( getPropertySwapXAndYAxis() )
{
aResolution[0]/=2;//radius
aResolution[1]*=4;//outer circle resolution
@@ -82,13 +82,13 @@ void VPolarCoordinateSystem::createVAxisList(
sal_Int32 nMaxAxisIndex = m_xCooSysModel->getMaximumAxisIndexByDimension(nDimensionIndex);
for( sal_Int32 nAxisIndex = 0; nAxisIndex <= nMaxAxisIndex; nAxisIndex++ )
{
Reference< XAxis > xAxis( this->getAxisByDimension(nDimensionIndex,nAxisIndex) );
Reference< XAxis > xAxis( getAxisByDimension(nDimensionIndex,nAxisIndex) );
if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel ))
continue;
AxisProperties aAxisProperties(xAxis,this->getExplicitCategoriesProvider());
AxisProperties aAxisProperties(xAxis,getExplicitCategoriesProvider());
aAxisProperties.init();
if(aAxisProperties.m_bDisplayLabels)
aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis(xAxis, xChartDoc);
aAxisProperties.m_nNumberFormatKey = getNumberFormatKeyForAxis(xAxis, xChartDoc);
std::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
@@ -105,7 +105,7 @@ void VPolarCoordinateSystem::initVAxisInList()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -116,15 +116,15 @@ void VPolarCoordinateSystem::initVAxisInList()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) );
pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement(nDimensionIndex, nAxisIndex) );
pVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
, this->createCIDForAxis( nDimensionIndex, nAxisIndex ) );
, createCIDForAxis( nDimensionIndex, nAxisIndex ) );
VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis );
if( pVPolarAxis )
pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
pVPolarAxis->setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
pVAxis->setScales( getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
}
}
}
@@ -135,7 +135,7 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
tVAxisMap::iterator aIt( m_aAxisMap.begin() );
tVAxisMap::const_iterator aEnd( m_aAxisMap.end() );
@@ -146,13 +146,13 @@ void VPolarCoordinateSystem::updateScalesAndIncrementsOnAxes()
{
sal_Int32 nDimensionIndex = aIt->first.first;
sal_Int32 nAxisIndex = aIt->first.second;
pVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) );
pVAxis->setExplicitScaleAndIncrement( getExplicitScale( nDimensionIndex, nAxisIndex ), getExplicitIncrement(nDimensionIndex, nAxisIndex) );
VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( pVAxis );
if( pVPolarAxis )
pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
pVPolarAxis->setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
pVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
pVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
pVAxis->setScales( getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
}
}
}
@@ -163,7 +163,7 @@ void VPolarCoordinateSystem::createGridShapes()
return;
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
bool bSwapXAndY = getPropertySwapXAndYAxis();
for( sal_Int32 nDimensionIndex=0; nDimensionIndex<3; nDimensionIndex++)
{
@@ -174,12 +174,12 @@ void VPolarCoordinateSystem::createGridShapes()
continue;
VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis ));
aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
aGrid.setIncrements( getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
, this->createCIDForGrid( nDimensionIndex, nAxisIndex ) );
, createCIDForGrid( nDimensionIndex, nAxisIndex ) );
if(nDimensionCount==2)
aGrid.setTransformationSceneToScreen( m_aMatrixSceneToScreen );
aGrid.setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY );
aGrid.setScales( getExplicitScales( nDimensionIndex, nAxisIndex), bSwapXAndY );
aGrid.createShapes();
}
}
chart2/source/view/axes/VPolarGrid.cxx
+5 -5
View File
@@ -106,7 +106,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
, const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
this->createGroupShape( xLogicTarget, m_aCID ) );
createGroupShape( xLogicTarget, m_aCID ) );
const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
Reference< XScaling > xInverseScaling( NULL );
@@ -160,7 +160,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
, const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
this->createGroupShape( xLogicTarget, m_aCID ) );
createGroupShape( xLogicTarget, m_aCID ) );
const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1];
const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0];
@@ -182,7 +182,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
Reference< drawing::XShapes > xTarget( xMainTarget );
if( nDepth > 0 )
{
xTarget.set( this->createGroupShape( xLogicTarget
xTarget.set( createGroupShape( xLogicTarget
, ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) )
) );
if(!xTarget.is())
@@ -238,9 +238,9 @@ void VPolarGrid::createShapes()
if(m_nDimension==2)
{
if(m_nDimensionIndex==1)
this->create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
create2DRadiusGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
//else //no Angle Grid so far as this equals exactly the y axis positions
// this->create2DAngleGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
// create2DAngleGrid( m_xLogicTarget, aRadiusTickInfos, aAngleTickInfos, aLinePropertiesList );
}
}
chart2/source/view/charttypes/AreaChart.cxx
+6 -6
View File
@@ -414,7 +414,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries
uno::Reference< drawing::XShape > xShape(nullptr);
if(m_nDimension==3)
{
double fDepth = this->getTransformedDepth();
double fDepth = getTransformedDepth();
sal_Int32 nPolyCount = aPoly.SequenceX.getLength();
for(sal_Int32 nPoly=0;nPoly<nPolyCount;nPoly++)
{
@@ -511,7 +511,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries
if(m_nDimension==3)
{
xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes
, aPoly, this->getTransformedDepth() );
, aPoly, getTransformedDepth() );
}
else //m_nDimension!=3
{
@@ -552,7 +552,7 @@ void AreaChart::impl_createSeriesShapes()
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -699,7 +699,7 @@ void AreaChart::createShapes()
if( rLogicYSumMap.find(nAttachedAxisIndex)==rLogicYSumMap.end() )
rLogicYSumMap[nAttachedAxisIndex]=0.0;
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -737,7 +737,7 @@ void AreaChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShapeFrontChild(*aSeriesIter, m_xSeriesTarget);
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -929,7 +929,7 @@ void AreaChart::createShapes()
LabelAlignment eAlignment = LABEL_ALIGN_TOP;
drawing::Position3D aScenePosition3D( aScenePosition.PositionX
, aScenePosition.PositionY
, aScenePosition.PositionZ+this->getTransformedDepth() );
, aScenePosition.PositionZ+getTransformedDepth() );
sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() );
chart2/source/view/charttypes/BarChart.cxx
+3 -3
View File
@@ -85,7 +85,7 @@ drawing::Direction3D BarChart::getPreferredDiagramAspectRatio() const
if( m_nDimension == 3 )
{
aRet = drawing::Direction3D(1.0,-1.0,1.0);
BarPositionHelper* pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( MAIN_AXIS_INDEX) ) );
BarPositionHelper* pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( MAIN_AXIS_INDEX) ) );
if (pPosHelper)
{
drawing::Direction3D aScale( pPosHelper->getScaledLogicWidth() );
@@ -498,7 +498,7 @@ void BarChart::createShapes()
{
nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
//2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot
pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) );
pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) );
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
}
@@ -874,7 +874,7 @@ void BarChart::createShapes()
{
sal_Int32 nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
//2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot
pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) );
pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) );
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
}
chart2/source/view/charttypes/BubbleChart.cxx
+2 -2
View File
@@ -235,7 +235,7 @@ void BubbleChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(*aSeriesIter, xSeriesTarget);
sal_Int32 nAttachedAxisIndex = pSeries->getAttachedAxisIndex();
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper;
PlotterBase::m_pPosHelper = pPosHelper;
@@ -330,7 +330,7 @@ void BubbleChart::createShapes()
LabelAlignment eAlignment = LABEL_ALIGN_TOP;
drawing::Position3D aScenePosition3D( aScenePosition.PositionX
, aScenePosition.PositionY
, aScenePosition.PositionZ+this->getTransformedDepth() );
, aScenePosition.PositionZ+getTransformedDepth() );
sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() );
chart2/source/view/charttypes/CandleStickChart.cxx
+1 -1
View File
@@ -151,7 +151,7 @@ void CandleStickChart::createShapes()
{
nAttachedAxisIndex = aXSlotIter->getAttachedAxisIndexForFirstSeries();
//2ND_AXIS_IN_BARS so far one can assume to have the same plotter for each z slot
pPosHelper = dynamic_cast<BarPositionHelper*>(&( this->getPlottingPositionHelper( nAttachedAxisIndex ) ) );
pPosHelper = dynamic_cast<BarPositionHelper*>(&( getPlottingPositionHelper( nAttachedAxisIndex ) ) );
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
}
chart2/source/view/charttypes/NetChart.cxx
+4 -4
View File
@@ -265,7 +265,7 @@ void NetChart::impl_createSeriesShapes()
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -404,7 +404,7 @@ void NetChart::createShapes()
if( aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
aLogicYSumMap[nAttachedAxisIndex]=0.0;
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -447,7 +447,7 @@ void NetChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShapeFrontChild(*aSeriesIter, m_xSeriesTarget);
sal_Int32 nAttachedAxisIndex = (*aSeriesIter)->getAttachedAxisIndex();
PlottingPositionHelper* pPosHelper = &(this->getPlottingPositionHelper( nAttachedAxisIndex ));
PlottingPositionHelper* pPosHelper = &(getPlottingPositionHelper( nAttachedAxisIndex ));
if(!pPosHelper)
pPosHelper = m_pMainPosHelper.get();
PlotterBase::m_pPosHelper = pPosHelper;
@@ -617,7 +617,7 @@ void NetChart::createShapes()
LabelAlignment eAlignment = LABEL_ALIGN_TOP;
drawing::Position3D aScenePosition3D( aScenePosition.PositionX
, aScenePosition.PositionY
, aScenePosition.PositionZ+this->getTransformedDepth() );
, aScenePosition.PositionZ+getTransformedDepth() );
sal_Int32 nLabelPlacement = pSeries->getLabelPlacement( nIndex, m_xChartTypeModel, pPosHelper->isSwapXAndY() );
chart2/source/view/charttypes/PieChart.cxx
+8 -8
View File
@@ -602,7 +602,7 @@ void PieChart::createShapes()
if( !bIsVisible )
continue;
aParam.mfDepth = this->getTransformedDepth() * (n3DRelativeHeight / 100.0);
aParam.mfDepth = getTransformedDepth() * (n3DRelativeHeight / 100.0);
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget);
///collect data point information (logic coordinates, style ):
@@ -773,7 +773,7 @@ PieChart::PieLabelInfo::PieLabelInfo()
bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, const awt::Size& rPageSize, bool bMoveHalfWay, bool bMoveClockwise )
{
//return true if the move was successful
if(!this->bMovementAllowed)
if(!bMovementAllowed)
return false;
const sal_Int32 nLabelDistanceX = rPageSize.Width/50;
@@ -781,7 +781,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c
///compute the rectangle representing the intersection of the label bounding
///boxes (`aOverlap`).
::basegfx::B2IRectangle aOverlap( lcl_getRect( this->xLabelGroupShape ) );
::basegfx::B2IRectangle aOverlap( lcl_getRect( xLabelGroupShape ) );
aOverlap.intersect( lcl_getRect( pFix->xLabelGroupShape ) );
if( !aOverlap.isEmpty() )
{
@@ -797,7 +797,7 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c
///`aTangentialDirection` is greater than the vertical component,
///the magnitude of the shift is equal to `aOverlap.Width` else to
///`aOverlap.Height`;
basegfx::B2IVector aRadiusDirection = this->aFirstPosition - this->aOrigin;
basegfx::B2IVector aRadiusDirection = aFirstPosition - aOrigin;
aRadiusDirection.setLength(1.0);
basegfx::B2IVector aTangentialDirection( -aRadiusDirection.getY(), aRadiusDirection.getX() );
bool bShiftHorizontal = abs(aTangentialDirection.getX()) > abs(aTangentialDirection.getY());
@@ -813,17 +813,17 @@ bool PieChart::PieLabelInfo::moveAwayFrom( const PieChart::PieLabelInfo* pFix, c
///`aTangentialDirection` is reversed;
if(!bMoveClockwise)
nShift*=-1;
awt::Point aOldPos( this->xLabelGroupShape->getPosition() );
awt::Point aOldPos( xLabelGroupShape->getPosition() );
basegfx::B2IVector aNewPos = basegfx::B2IVector( aOldPos.X, aOldPos.Y ) + nShift*aTangentialDirection;
///a final check is performed in order to be sure that the moved label
///is still inside the page document;
awt::Point aNewAWTPos( aNewPos.getX(), aNewPos.getY() );
if( !lcl_isInsidePage( aNewAWTPos, this->xLabelGroupShape->getSize(), rPageSize ) )
if( !lcl_isInsidePage( aNewAWTPos, xLabelGroupShape->getSize(), rPageSize ) )
return false;
this->xLabelGroupShape->setPosition( aNewAWTPos );
this->bMoved = true;
xLabelGroupShape->setPosition( aNewAWTPos );
bMoved = true;
}
return true;
chart2/source/view/charttypes/VSeriesPlotter.cxx
+16 -16
View File
@@ -299,9 +299,9 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getSeriesGroupShapeFrontChild
if(!xShapes.is())
{
//ensure that the series group shape is already created
uno::Reference< drawing::XShapes > xSeriesShapes( this->getSeriesGroupShape( pDataSeries, xTarget ) );
uno::Reference< drawing::XShapes > xSeriesShapes( getSeriesGroupShape( pDataSeries, xTarget ) );
//ensure that the back child is created first
this->getSeriesGroupShapeBackChild( pDataSeries, xTarget );
getSeriesGroupShapeBackChild( pDataSeries, xTarget );
//use series group shape as parent for the new created front group shape
xShapes = createGroupShape( xSeriesShapes );
pDataSeries->m_xFrontSubGroupShape = xShapes;
@@ -316,7 +316,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getSeriesGroupShapeBackChild(
if(!xShapes.is())
{
//ensure that the series group shape is already created
uno::Reference< drawing::XShapes > xSeriesShapes( this->getSeriesGroupShape( pDataSeries, xTarget ) );
uno::Reference< drawing::XShapes > xSeriesShapes( getSeriesGroupShape( pDataSeries, xTarget ) );
//use series group shape as parent for the new created back group shape
xShapes = createGroupShape( xSeriesShapes );
pDataSeries->m_xBackSubGroupShape = xShapes;
@@ -350,7 +350,7 @@ uno::Reference< drawing::XShapes > VSeriesPlotter::getErrorBarsGroupShape( VData
if(!xShapes.is())
{
//create a group shape for this series and add to logic target:
xShapes = this->createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) );
xShapes = createGroupShape( xTarget,rDataSeries.getErrorBarsCID(bYError) );
rShapeGroup = xShapes;
}
return xShapes;
@@ -1011,7 +1011,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic
if( xErrorBarProp.is())
{
uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes(
this->getErrorBarsGroupShape(rVDataSeries, xTarget, false) );
getErrorBarsGroupShape(rVDataSeries, xTarget, false) );
createErrorBar( xErrorBarsGroup_Shapes
, rUnscaledLogicPosition, xErrorBarProp
@@ -1033,7 +1033,7 @@ void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogic
if( xErrorBarProp.is())
{
uno::Reference< drawing::XShapes > xErrorBarsGroup_Shapes(
this->getErrorBarsGroupShape(rVDataSeries, xTarget, true) );
getErrorBarsGroupShape(rVDataSeries, xTarget, true) );
createErrorBar( xErrorBarsGroup_Shapes
, rUnscaledLogicPosition, xErrorBarProp
@@ -1423,7 +1423,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
{
double fMinY, fMaxY;
this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
return fMinY;
}
@@ -1456,7 +1456,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s
if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
{
double fMinY, fMaxY;
this->getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
return fMaxY;
}
@@ -1975,7 +1975,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange(
double fMinimumY; ::rtl::math::setNan(&fMinimumY);
double fMaximumY; ::rtl::math::setNan(&fMaximumY);
this->calculateYMinAndMaxForCategory( nCatIndex
calculateYMinAndMaxForCategory( nCatIndex
, bSeparateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex );
if(rfMinimumY > fMinimumY)
@@ -2133,7 +2133,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
continue;
std::vector<ViewLegendEntry> aSeriesEntries(
this->createLegendEntriesForSeries(
createLegendEntriesForSeries(
rEntryKeyAspectRatio, *pSeries, xTextProperties,
xTarget, xShapeFactory, xContext));
@@ -2284,8 +2284,8 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries(
, const Reference< lang::XMultiServiceFactory >& xShapeFactory )
{
LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle();
uno::Any aExplicitSymbol( this->getExplicitSymbol( rSeries, -1 ) );
LegendSymbolStyle eLegendSymbolStyle = getLegendSymbolStyle();
uno::Any aExplicitSymbol( getExplicitSymbol( rSeries, -1 ) );
VLegendSymbolFactory::PropertyType ePropType =
VLegendSymbolFactory::PropertyType::FilledSeries;
@@ -2315,8 +2315,8 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForPoint(
, const Reference< lang::XMultiServiceFactory >& xShapeFactory )
{
LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle();
uno::Any aExplicitSymbol( this->getExplicitSymbol(rSeries,nPointIndex) );
LegendSymbolStyle eLegendSymbolStyle = getLegendSymbolStyle();
uno::Any aExplicitSymbol( getExplicitSymbol(rSeries,nPointIndex) );
VLegendSymbolFactory::PropertyType ePropType =
VLegendSymbolFactory::PropertyType::FilledSeries;
@@ -2393,7 +2393,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
uno::Reference< drawing::XShapes > xSymbolGroup( AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory)->createGroup2D( xTarget ));
// create the symbol
Reference< drawing::XShape > xShape( this->createLegendSymbolForPoint( rEntryKeyAspectRatio,
Reference< drawing::XShape > xShape( createLegendSymbolForPoint( rEntryKeyAspectRatio,
rSeries, nIdx, xSymbolGroup, xShapeFactory ) );
// set CID to symbol for selection
@@ -2422,7 +2422,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
uno::Reference< drawing::XShapes > xSymbolGroup( AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory)->createGroup2D( xTarget ));
// create the symbol
Reference< drawing::XShape > xShape( this->createLegendSymbolForSeries(
Reference< drawing::XShape > xShape( createLegendSymbolForSeries(
rEntryKeyAspectRatio, rSeries, xSymbolGroup, xShapeFactory ) );
// set CID to symbol for selection
chart2/source/view/main/DrawModelWrapper.cxx
+14 -14
View File
@@ -148,7 +148,7 @@ uno::Reference< uno::XInterface > DrawModelWrapper::createUnoModel()
uno::Reference< frame::XModel > DrawModelWrapper::getUnoModel()
{
uno::Reference< uno::XInterface > xI = this->SdrModel::getUnoModel();
uno::Reference< uno::XInterface > xI = SdrModel::getUnoModel();
return uno::Reference<frame::XModel>::query( xI );
}
@@ -159,7 +159,7 @@ SdrModel& DrawModelWrapper::getSdrModel()
uno::Reference< lang::XMultiServiceFactory > DrawModelWrapper::getShapeFactory()
{
uno::Reference< lang::XMultiServiceFactory > xShapeFactory( this->getUnoModel(), uno::UNO_QUERY );
uno::Reference< lang::XMultiServiceFactory > xShapeFactory( getUnoModel(), uno::UNO_QUERY );
return xShapeFactory;
}
@@ -189,14 +189,14 @@ uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getMainDrawPage()
//ensure that additional shapes are in front of the chart objects so create the chart root before
// let us disable this call for now
// TODO:moggi
// AbstractShapeFactory::getOrCreateShapeFactory(this->getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage );
// AbstractShapeFactory::getOrCreateShapeFactory(getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage );
return m_xMainDrawPage;
}
uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getHiddenDrawPage()
{
if( !m_xHiddenDrawPage.is() )
{
uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSuplier( this->getUnoModel(), uno::UNO_QUERY );
uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSuplier( getUnoModel(), uno::UNO_QUERY );
if( xDrawPagesSuplier.is() )
{
uno::Reference< drawing::XDrawPages > xDrawPages( xDrawPagesSuplier->getDrawPages () );
@@ -240,13 +240,13 @@ uno::Reference< drawing::XShapes > DrawModelWrapper::getChartRootShape(
void DrawModelWrapper::lockControllers()
{
uno::Reference< frame::XModel > xDrawModel( this->getUnoModel() );
uno::Reference< frame::XModel > xDrawModel( getUnoModel() );
if( xDrawModel.is())
xDrawModel->lockControllers();
}
void DrawModelWrapper::unlockControllers()
{
uno::Reference< frame::XModel > xDrawModel( this->getUnoModel() );
uno::Reference< frame::XModel > xDrawModel( getUnoModel() );
if( xDrawModel.is())
xDrawModel->unlockControllers();
}
@@ -258,36 +258,36 @@ OutputDevice* DrawModelWrapper::getReferenceDevice() const
SfxItemPool& DrawModelWrapper::GetItemPool()
{
return this->SdrModel::GetItemPool();
return SdrModel::GetItemPool();
}
XColorListRef DrawModelWrapper::GetColorList() const
{
return this->SdrModel::GetColorList();
return SdrModel::GetColorList();
}
XDashListRef DrawModelWrapper::GetDashList() const
{
return this->SdrModel::GetDashList();
return SdrModel::GetDashList();
}
XLineEndListRef DrawModelWrapper::GetLineEndList() const
{
return this->SdrModel::GetLineEndList();
return SdrModel::GetLineEndList();
}
XGradientListRef DrawModelWrapper::GetGradientList() const
{
return this->SdrModel::GetGradientList();
return SdrModel::GetGradientList();
}
XHatchListRef DrawModelWrapper::GetHatchList() const
{
return this->SdrModel::GetHatchList();
return SdrModel::GetHatchList();
}
XBitmapListRef DrawModelWrapper::GetBitmapList() const
{
return this->SdrModel::GetBitmapList();
return SdrModel::GetBitmapList();
}
XPatternListRef DrawModelWrapper::GetPatternList() const
{
return this->SdrModel::GetPatternList();
return SdrModel::GetPatternList();
}
SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName )
chart2/source/view/main/PlottingPositionHelper.cxx
+15 -15
View File
@@ -87,7 +87,7 @@ PlottingPositionHelper* PlottingPositionHelper::clone() const
PlottingPositionHelper* PlottingPositionHelper::createSecondaryPosHelper( const ExplicitScaleData& rSecondaryScale )
{
PlottingPositionHelper* pRet = this->clone();
PlottingPositionHelper* pRet = clone();
pRet->m_aScales[1]=rSecondaryScale;
return pRet;
}
@@ -175,23 +175,23 @@ uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScale
drawing::Position3D PlottingPositionHelper::transformLogicToScene(
double fX, double fY, double fZ, bool bClip ) const
{
this->doLogicScaling( &fX,&fY,&fZ );
doLogicScaling( &fX,&fY,&fZ );
if(bClip)
this->clipScaledLogicValues( &fX,&fY,&fZ );
clipScaledLogicValues( &fX,&fY,&fZ );
return this->transformScaledLogicToScene( fX, fY, fZ, false );
return transformScaledLogicToScene( fX, fY, fZ, false );
}
drawing::Position3D PlottingPositionHelper::transformScaledLogicToScene(
double fX, double fY, double fZ, bool bClip ) const
{
if( bClip )
this->clipScaledLogicValues( &fX,&fY,&fZ );
clipScaledLogicValues( &fX,&fY,&fZ );
drawing::Position3D aPos( fX, fY, fZ);
uno::Reference< XTransformation > xTransformation =
this->getTransformationScaledLogicToScene();
getTransformationScaledLogicToScene();
uno::Sequence< double > aSeq =
xTransformation->transform( Position3DToSequence(aPos) );
return SequenceToPosition3D(aSeq);
@@ -233,7 +233,7 @@ void PlottingPositionHelper::transformScaledLogicToScene( drawing::PolyPolygonSh
double& fX = xValues[nP];
double& fY = yValues[nP];
double& fZ = zValues[nP];
aScenePosition = this->transformScaledLogicToScene( fX,fY,fZ,true );
aScenePosition = transformScaledLogicToScene( fX,fY,fZ,true );
fX = aScenePosition.PositionX;
fY = aScenePosition.PositionY;
fZ = aScenePosition.PositionZ;
@@ -412,8 +412,8 @@ double PolarPlottingPositionHelper::getWidthAngleDegree( double& fStartLogicValu
fStartLogicValueOnAngleAxis = fHelp;
}
double fStartAngleDegree = this->transformToAngleDegree( fStartLogicValueOnAngleAxis );
double fEndAngleDegree = this->transformToAngleDegree( fEndLogicValueOnAngleAxis );
double fStartAngleDegree = transformToAngleDegree( fStartLogicValueOnAngleAxis );
double fEndAngleDegree = transformToAngleDegree( fEndLogicValueOnAngleAxis );
double fWidthAngleDegree = fEndAngleDegree - fStartAngleDegree;
if( ::rtl::math::approxEqual( fStartAngleDegree, fEndAngleDegree )
@@ -598,19 +598,19 @@ double PolarPlottingPositionHelper::transformToRadius( double fLogicValueOnRadiu
drawing::Position3D PolarPlottingPositionHelper::transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const
{
if(bClip)
this->clipLogicValues( &fX,&fY,&fZ );
clipLogicValues( &fX,&fY,&fZ );
double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX;
double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY;
return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ );
return transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ );
}
drawing::Position3D PolarPlottingPositionHelper::transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const
{
if(bClip)
this->clipScaledLogicValues( &fX,&fY,&fZ );
clipScaledLogicValues( &fX,&fY,&fZ );
double fLogicValueOnAngleAxis = m_bSwapXAndY ? fY : fX;
double fLogicValueOnRadiusAxis = m_bSwapXAndY ? fX : fY;
return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false );
return transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false );
}
drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius
, double fLogicZ ) const
@@ -629,8 +629,8 @@ drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( dou
drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling ) const
{
double fUnitAngleDegree = this->transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling);
double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling);
double fUnitAngleDegree = transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling);
double fUnitRadius = transformToRadius(fLogicValueOnRadiusAxis,bDoScaling);
return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ );
}
chart2/source/view/main/PolarLabelPositionHelper.cxx
+4 -4
View File
@@ -77,7 +77,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
else
fRadius = fUnitCircleInnerRadius + (fUnitCircleOuterRadius-fUnitCircleInnerRadius)/2.0 ;
awt::Point aRet( this->transformSceneToScreenPosition(
awt::Point aRet( transformSceneToScreenPosition(
m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ+0.5 ) ) );
if(m_nDimensionCount==3 && nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE)
@@ -85,10 +85,10 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
//check whether the upper or the downer edge is more distant from the center
//take the farest point to put the label to
awt::Point aP0( this->transformSceneToScreenPosition(
awt::Point aP0( transformSceneToScreenPosition(
m_pPosHelper->transformUnitCircleToScene( 0, 0, fLogicZ ) ) );
awt::Point aP1(aRet);
awt::Point aP2( this->transformSceneToScreenPosition(
awt::Point aP2( transformSceneToScreenPosition(
m_pPosHelper->transformUnitCircleToScene( fAngleDegree, fRadius, fLogicZ-0.5 ) ) );
::basegfx::B2DVector aV0( aP0.X, aP0.Y );
@@ -158,7 +158,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
//add a scaling independent Offset if requested
if( nScreenValueOffsetInRadiusDirection != 0)
{
awt::Point aOrigin( this->transformSceneToScreenPosition(
awt::Point aOrigin( transformSceneToScreenPosition(
m_pPosHelper->transformUnitCircleToScene( 0.0, 0.0, fLogicZ+0.5 ) ) );
basegfx::B2IVector aDirection( aRet.X- aOrigin.X, aRet.Y- aOrigin.Y );
aDirection.setLength(nScreenValueOffsetInRadiusDirection);
chart2/source/view/main/VDataSeries.cxx
+16 -16
View File
@@ -572,7 +572,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce
{
OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT);
bool bHasNumberFormat = false;
uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex ));
uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex ));
sal_Int32 nNumberFormat = -1;
if( xPointProp.is() && (xPointProp->getPropertyValue(aPropName) >>= nNumberFormat) )
bHasNumberFormat = true;
@@ -582,7 +582,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor
{
OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : OUString(CHART_UNONAME_NUMFMT);
sal_Int32 nNumberFormat = -1;
uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( nPointIndex ));
uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex ));
if( xPointProp.is() )
xPointProp->getPropertyValue(aPropName) >>= nNumberFormat;
return nNumberFormat;
@@ -625,7 +625,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Refe
sal_Int32 nLabelPlacement=0;
try
{
uno::Reference< beans::XPropertySet > xPointProps( this->getPropertiesOfPoint( nPointIndex ) );
uno::Reference< beans::XPropertySet > xPointProps( getPropertiesOfPoint( nPointIndex ) );
if( xPointProps.is() )
xPointProps->getPropertyValue("LabelPlacement") >>= nLabelPlacement;
@@ -807,7 +807,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
adaptPointCache( index );
if (!m_apSymbolProperties_AttributedPoint)
m_apSymbolProperties_AttributedPoint
= getSymbolPropertiesFromPropertySet(this->getPropertiesOfPoint(index));
= getSymbolPropertiesFromPropertySet(getPropertiesOfPoint(index));
pRet = m_apSymbolProperties_AttributedPoint.get();
//if a single data point does not have symbols but the dataseries itself has symbols
//we create an invisible symbol shape to enable selection of that point
@@ -815,7 +815,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
{
if (!m_apSymbolProperties_Series)
m_apSymbolProperties_Series
= getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries());
= getSymbolPropertiesFromPropertySet(getPropertiesOfSeries());
if( m_apSymbolProperties_Series.get() && m_apSymbolProperties_Series->Style != SymbolStyle_NONE )
{
if (!m_apSymbolProperties_InvisibleSymbolForSelection)
@@ -835,7 +835,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
{
if (!m_apSymbolProperties_Series)
m_apSymbolProperties_Series
= getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries());
= getSymbolPropertiesFromPropertySet(getPropertiesOfSeries());
pRet = m_apSymbolProperties_Series.get();
}
@@ -856,7 +856,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getXErrorBarProperties( sal_I
{
uno::Reference< beans::XPropertySet > xErrorBarProp;
uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( index ));
uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( index ));
if( xPointProp.is() )
xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp;
return xErrorBarProp;
@@ -866,7 +866,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getYErrorBarProperties( sal_I
{
uno::Reference< beans::XPropertySet > xErrorBarProp;
uno::Reference< beans::XPropertySet > xPointProp( this->getPropertiesOfPoint( index ));
uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( index ));
if( xPointProp.is() )
xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp;
return xErrorBarProp;
@@ -879,7 +879,7 @@ bool VDataSeries::hasPointOwnColor( sal_Int32 index ) const
try
{
uno::Reference< beans::XPropertyState > xPointState( this->getPropertiesOfPoint(index), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertyState > xPointState( getPropertiesOfPoint(index), uno::UNO_QUERY_THROW );
return (xPointState->getPropertyState("Color") != beans::PropertyState_DEFAULT_VALUE );
}
catch(const uno::Exception& e)
@@ -905,7 +905,7 @@ bool VDataSeries::isAttributedDataPoint( sal_Int32 index ) const
bool VDataSeries::isVaryColorsByPoint() const
{
bool bVaryColorsByPoint = false;
Reference< beans::XPropertySet > xSeriesProp( this->getPropertiesOfSeries() );
Reference< beans::XPropertySet > xSeriesProp( getPropertiesOfSeries() );
if( xSeriesProp.is() )
xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint;
return bVaryColorsByPoint;
@@ -915,7 +915,7 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int
{
if( isAttributedDataPoint( index ) )
return m_xDataSeries->getDataPointByIndex(index);
return this->getPropertiesOfSeries();
return getPropertiesOfSeries();
}
uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const
@@ -958,14 +958,14 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const
adaptPointCache( index );
if( !m_apLabel_AttributedPoint.get() )
m_apLabel_AttributedPoint
= getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index));
= getDataPointLabelFromPropertySet(getPropertiesOfPoint(index));
pRet = m_apLabel_AttributedPoint.get();
}
else
{
if (!m_apLabel_Series)
m_apLabel_Series
= getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index));
= getDataPointLabelFromPropertySet(getPropertiesOfPoint(index));
pRet = m_apLabel_Series.get();
}
if( !m_bAllowPercentValueInDataLabel )
@@ -978,7 +978,7 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const
DataPointLabel* VDataSeries::getDataPointLabelIfLabel( sal_Int32 index ) const
{
DataPointLabel* pLabel = this->getDataPointLabel( index );
DataPointLabel* pLabel = getDataPointLabel( index );
if( !pLabel || (!pLabel->ShowNumber && !pLabel->ShowNumberInPercent
&& !pLabel->ShowCategoryName ) )
return nullptr;
@@ -1000,7 +1000,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
// Cache these properties for this point.
m_apLabelPropNames_AttributedPoint.reset(new tNameSequence);
m_apLabelPropValues_AttributedPoint.reset(new tAnySequence);
xTextProp.set( this->getPropertiesOfPoint( index ));
xTextProp.set( getPropertiesOfPoint( index ));
PropertyMapper::getTextLabelMultiPropertyLists(
xTextProp, *m_apLabelPropNames_AttributedPoint, *m_apLabelPropValues_AttributedPoint);
bDoDynamicFontResize = true;
@@ -1015,7 +1015,7 @@ bool VDataSeries::getTextLabelMultiPropertyLists( sal_Int32 index
// Cache these properties for the whole series.
m_apLabelPropNames_Series.reset(new tNameSequence);
m_apLabelPropValues_Series.reset(new tAnySequence);
xTextProp.set( this->getPropertiesOfPoint( index ));
xTextProp.set( getPropertiesOfPoint( index ));
PropertyMapper::getTextLabelMultiPropertyLists(
xTextProp, *m_apLabelPropNames_Series, *m_apLabelPropValues_Series);
bDoDynamicFontResize = true;
chart2/source/view/main/VLineProperties.cxx
+12 -12
View File
@@ -29,10 +29,10 @@ using namespace ::com::sun::star;
VLineProperties::VLineProperties()
{
this->Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR
this->LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE
this->Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE
this->Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH
Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR
LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE
Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE
Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH
}
void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
@@ -41,11 +41,11 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert
{
try
{
this->Color = xProp->getPropertyValue( "LineColor" );
this->LineStyle = xProp->getPropertyValue( "LineStyle" );
this->Transparence = xProp->getPropertyValue( "LineTransparence" );
this->Width = xProp->getPropertyValue( "LineWidth" );
this->DashName = xProp->getPropertyValue( "LineDashName" );
Color = xProp->getPropertyValue( "LineColor" );
LineStyle = xProp->getPropertyValue( "LineStyle" );
Transparence = xProp->getPropertyValue( "LineTransparence" );
Width = xProp->getPropertyValue( "LineWidth" );
DashName = xProp->getPropertyValue( "LineDashName" );
}
catch( const uno::Exception& e )
{
@@ -53,7 +53,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert
}
}
else
this->LineStyle <<= drawing::LineStyle_NONE;
LineStyle <<= drawing::LineStyle_NONE;
}
bool VLineProperties::isLineVisible() const
@@ -61,11 +61,11 @@ bool VLineProperties::isLineVisible() const
bool bRet = false;
drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID);
this->LineStyle >>= aLineStyle;
LineStyle >>= aLineStyle;
if( aLineStyle != drawing::LineStyle_NONE )
{
sal_Int16 nLineTransparence=0;
this->Transparence >>= nLineTransparence;
Transparence >>= nLineTransparence;
if(nLineTransparence!=100)
{
bRet = true;
comphelper/source/eventattachermgr/eventattachermgr.cxx
+7 -7
View File
@@ -431,7 +431,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents
// Examine the index and apply the array
std::deque< AttachedObject_Impl > aList = implCheckIndex( nIndex )->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
detach( nIndex, rObj.xTarget );
const ScriptEventDescriptor* pArray = ScriptEvents.getConstArray();
sal_Int32 nLen = ScriptEvents.getLength();
@@ -439,7 +439,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents
registerScriptEvent( nIndex, pArray[ i ] );
for( const auto& rObj : aList )
this->attach( nIndex, rObj.xTarget, rObj.aHelper );
attach( nIndex, rObj.xTarget, rObj.aHelper );
}
@@ -457,7 +457,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
std::deque< AttachedObject_Impl > aList = aIt->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
detach( nIndex, rObj.xTarget );
OUString aLstType = ListenerType;
sal_Int32 nLastDot = aLstType.lastIndexOf('.');
@@ -479,7 +479,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
}
for( const auto& rObj : aList )
this->attach( nIndex, rObj.xTarget, rObj.aHelper );
attach( nIndex, rObj.xTarget, rObj.aHelper );
}
@@ -490,10 +490,10 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex )
std::deque< AttachedObject_Impl > aList = aIt->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
detach( nIndex, rObj.xTarget );
aIt->aEventList.clear();
for( const auto& rObj : aList )
this->attach( nIndex, rObj.xTarget, rObj.aHelper );
attach( nIndex, rObj.xTarget, rObj.aHelper );
}
@@ -518,7 +518,7 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
std::deque< AttachedObject_Impl > aList = aIt->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
detach( nIndex, rObj.xTarget );
aIndex.erase( aIt );
}
comphelper/source/xml/attributelist.cxx
+3 -3
View File
@@ -32,9 +32,9 @@ struct TagAttribute_Impl
TagAttribute_Impl( const OUString &aName, const OUString &aType,
const OUString &aValue )
{
this->sName = aName;
this->sType = aType;
this->sValue = aValue;
sName = aName;
sType = aType;
sValue = aValue;
}
OUString sName;
compilerplugins/clang/plugin.hxx
+1 -1
View File
@@ -208,7 +208,7 @@ RewritePlugin::RewriteOptions::RewriteOptions( RewriteOption option )
{
// Note that 'flags' stores also RemoveLineIfEmpty, it must be kept in sync with the base class.
if( flags & RewritePlugin::RemoveLineIfEmpty )
this->RemoveLineIfEmpty = true;
RemoveLineIfEmpty = true;
}
inline
connectivity/source/drivers/postgresql/pq_driver.cxx
+1 -1
View File
@@ -169,7 +169,7 @@ public:
cppu::ComponentFactoryFunc fptr,
const Sequence< OUString > & serviceNames,
const Reference< XComponentContext > & defaultContext) :
cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >( this->m_mutex ),
cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >( m_mutex ),
m_create( fptr ),
m_serviceNames( serviceNames ),
m_implName( rImplementationName_ ),
connectivity/source/drivers/postgresql/pq_driver.hxx
+1 -1
View File
@@ -74,7 +74,7 @@ class Driver : public MutexHolder, public DriverBase
public:
explicit Driver ( const css::uno::Reference < css::uno::XComponentContext > & ctx )
: DriverBase( this->m_mutex ),
: DriverBase( m_mutex ),
m_ctx( ctx ),
m_smgr( ctx->getServiceManager() )
{}
cui/source/customize/cfg.cxx
+2 -2
View File
@@ -3503,8 +3503,8 @@ OUString SvxIconReplacementDialog::ReplaceIconName( const OUString& rMessage )
sal_uInt16 SvxIconReplacementDialog::ShowDialog()
{
this->Execute();
return ( this->GetCurButtonId() );
Execute();
return ( GetCurButtonId() );
}
/*******************************************************************************
*
cui/source/dialogs/hangulhanjadlg.cxx
+1 -1
View File
@@ -538,7 +538,7 @@ namespace svx
}
void SuggestionDisplay::SetHelpIds()
{
this->SetHelpId( HID_HANGULDLG_SUGGESTIONS );
SetHelpId( HID_HANGULDLG_SUGGESTIONS );
m_aValueSet->SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID );
m_aListBox->SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST );
}
cui/source/options/cfgchart.cxx
+2 -2
View File
@@ -152,7 +152,7 @@ OUString SvxChartColorTable::getDefaultName( size_t _nIndex )
bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
{
// note: XColorEntry has no operator ==
bool bEqual = ( this->m_aColorEntries.size() == _rOther.m_aColorEntries.size() );
bool bEqual = ( m_aColorEntries.size() == _rOther.m_aColorEntries.size() );
if( bEqual )
{
@@ -298,7 +298,7 @@ bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const
const SvxChartColorTableItem * rCTItem( dynamic_cast<const SvxChartColorTableItem * >( & rAttr ));
if( rCTItem )
{
return (this->m_aColorTable == rCTItem->GetColorList());
return (m_aColorTable == rCTItem->GetColorList());
}
return false;
drawinglayer/source/primitive2d/baseprimitive2d.cxx
+1 -1
View File
@@ -192,7 +192,7 @@ namespace drawinglayer
if(!empty())
{
const sal_Int32 nCount(this->size());
const sal_Int32 nCount(size());
for(sal_Int32 a(0L); a < nCount; a++)
{
editeng/source/items/svxfont.cxx
+1 -1
View File
@@ -515,7 +515,7 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer* pPrinter,
nTmpEsc = -20;
else
nTmpEsc = nEsc;
Size aSize = ( this->GetFontSize() );
Size aSize = ( GetFontSize() );
aPos.Y() -= ( nTmpEsc * aSize.Height() ) / 100L;
}
Font aOldFont( ChgPhysFont( pOut ) );
filter/source/config/cache/cacheitem.cxx
Vendored
+6 -6
View File
@@ -45,8 +45,8 @@ void CacheItem::update(const CacheItem& rUpdateItem)
pItUpdate != rUpdateItem.end() ;
++pItUpdate )
{
iterator pItThis = this->find(pItUpdate->first);
if (pItThis == this->end())
iterator pItThis = find(pItUpdate->first);
if (pItThis == end())
(*this)[pItUpdate->first] = pItUpdate->second; // add new prop
else
pItThis->second = pItUpdate->second; // change value of existing prop
@@ -305,8 +305,8 @@ bool CacheItem::haveProps(const CacheItem& lProps) const
++pIt )
{
// i) one required property does not exist at this item => return false
const_iterator pItThis = this->find(pIt->first);
if (pItThis == this->end())
const_iterator pItThis = find(pIt->first);
if (pItThis == end())
{
FILTER_CONFIG_LOG_1_("CacheItem::haveProps() ... didn't found \"%s\" => return FALSE\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
return false;
@@ -338,8 +338,8 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const
// => continue with next one, because
// "excluding" means... "don't have it".
// And "not exists" matches to "don't have it".
const_iterator pItThis = this->find(pIt->first);
if (pItThis == this->end())
const_iterator pItThis = find(pIt->first);
if (pItThis == end())
{
FILTER_CONFIG_LOG_1_("CacheItem::dontHaveProps() ... not found \"%s\" => continue loop!\n", _FILTER_CONFIG_TO_ASCII_(pIt->first))
continue;
filter/source/msfilter/msdffimp.cxx
+4 -4
View File
@@ -5961,12 +5961,12 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
// Patriarch found (the upmost shape group container) ?
if( DFF_msofbtSpgrContainer == nFbt )
{
if(!this->GetShapeGroupContainerData( rSt, nLength, true, nDrawingContainerId )) return;
if(!GetShapeGroupContainerData( rSt, nLength, true, nDrawingContainerId )) return;
}
// empty Shape Container ? (outside of shape group container)
else if( DFF_msofbtSpContainer == nFbt )
{
if(!this->GetShapeContainerData( rSt, nLength, ULONG_MAX, nDrawingContainerId )) return;
if(!GetShapeContainerData( rSt, nLength, ULONG_MAX, nDrawingContainerId )) return;
}
else
rSt.SeekRel( nLength );
@@ -5995,14 +5995,14 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
if( DFF_msofbtSpContainer == nFbt )
{
sal_uLong nGroupOffs = bFirst ? nStartShapeGroupCont - DFF_COMMON_RECORD_HEADER_SIZE : ULONG_MAX;
if ( !this->GetShapeContainerData( rSt, nLength, nGroupOffs, nDrawingContainerId ) )
if ( !GetShapeContainerData( rSt, nLength, nGroupOffs, nDrawingContainerId ) )
return false;
bFirst = false;
}
// nested shape group container ?
else if( DFF_msofbtSpgrContainer == nFbt )
{
if ( !this->GetShapeGroupContainerData( rSt, nLength, false, nDrawingContainerId ) )
if ( !GetShapeGroupContainerData( rSt, nLength, false, nDrawingContainerId ) )
return false;
}
else
filter/source/svg/svgwriter.cxx
+3 -3
View File
@@ -1530,10 +1530,10 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
return;
bool bStandAloneTextPortion = false;
if( !this->isTextShapeStarted() )
if( !isTextShapeStarted() )
{
bStandAloneTextPortion = true;
this->startTextShape();
startTextShape();
}
mbLineBreak = false;
@@ -1602,7 +1602,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
if( bStandAloneTextPortion )
{
this->endTextShape();
endTextShape();
}
}
forms/source/component/RadioButton.cxx
+3 -3
View File
@@ -118,7 +118,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any&
// my name
OUString sMyGroup;
if (hasProperty(PROPERTY_GROUP_NAME, this))
this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
if (sMyGroup.isEmpty())
sMyGroup = m_aName;
@@ -200,8 +200,8 @@ void ORadioButtonModel::setControlSource()
OUString sName, sGroupName;
if (hasProperty(PROPERTY_GROUP_NAME, this))
this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName;
this->getPropertyValue(PROPERTY_NAME) >>= sName;
getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName;
getPropertyValue(PROPERTY_NAME) >>= sName;
Reference<XPropertySet> xMyProps(
static_cast<XWeak*>(this), css::uno::UNO_QUERY);
fpicker/source/aqua/SalAquaPicker.mm
+1 -1
View File
@@ -180,7 +180,7 @@ int SalAquaPicker::runandwaitforresult()
{
SolarMutexGuard aGuard;
int status = this->run();
int status = run();
return status;
}
framework/source/dispatch/dispatchprovider.cxx
+1 -1
View File
@@ -305,7 +305,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
// If we are this top frame itself (means our owner frame)
// we should call ourself recursiv with a better target "_self".
// So we can share the same code! (see reaction for "_self" inside this method too.)
xDispatcher = this->queryDispatch(aURL,SPECIALTARGET_SELF,0);
xDispatcher = queryDispatch(aURL,SPECIALTARGET_SELF,0);
}
else
{
framework/source/dispatch/mailtodispatcher.cxx
+1 -1
View File
@@ -95,7 +95,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
for( sal_Int32 i=0; i<nCount; ++i )
{
lDispatcher[i] = this->queryDispatch(
lDispatcher[i] = queryDispatch(
lDescriptor[i].FeatureURL,
lDescriptor[i].FrameName,
lDescriptor[i].SearchFlags);
framework/source/dispatch/popupmenudispatcher.cxx
+1 -1
View File
@@ -222,7 +222,7 @@ PopupMenuDispatcher::queryDispatches(
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
for( sal_Int32 i=0; i<nCount; ++i )
{
lDispatcher[i] = this->queryDispatch(
lDispatcher[i] = queryDispatch(
lDescriptor[i].FeatureURL,
lDescriptor[i].FrameName,
lDescriptor[i].SearchFlags);
framework/source/dispatch/servicehandler.cxx
+1 -1
View File
@@ -95,7 +95,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
for( sal_Int32 i=0; i<nCount; ++i )
{
lDispatcher[i] = this->queryDispatch(
lDispatcher[i] = queryDispatch(
lDescriptor[i].FeatureURL,
lDescriptor[i].FrameName,
lDescriptor[i].SearchFlags);
framework/source/dispatch/systemexec.cxx
+1 -1
View File
@@ -77,7 +77,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatcher( nCount );
for( sal_Int32 i=0; i<nCount; ++i )
{
lDispatcher[i] = this->queryDispatch(
lDispatcher[i] = queryDispatch(
lDescriptor[i].FeatureURL,
lDescriptor[i].FrameName,
lDescriptor[i].SearchFlags);
framework/source/layoutmanager/toolbarlayoutmanager.cxx
+1 -1
View File
@@ -1285,7 +1285,7 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars()
{
for (auto const& rURL : aMakeVisibleToolbars)
{
this->requestToolbar(rURL);
requestToolbar(rURL);
}
}
}
hwpfilter/source/hiodev.cxx
+1 -1
View File
@@ -116,7 +116,7 @@ HStreamIODev::HStreamIODev(HStream * stream):_stream(stream)
HStreamIODev::~HStreamIODev()
{
/* 플러시한 후 닫는다. */
this->flush();
flush();
if (_gzfp)
gz_close(_gzfp);
_gzfp = nullptr;
i18npool/source/transliteration/transliterationImpl.cxx
+5 -5
View File
@@ -518,7 +518,7 @@ TransliterationImpl::getRange(const Sequence< OUString > &inStrs,
}
ostr.realloc(j_tmp);
return this->getRange(ostr, j_tmp, ++_numCascade);
return getRange(ostr, j_tmp, ++_numCascade);
}
@@ -532,7 +532,7 @@ TransliterationImpl::transliterateRange( const OUString& str1, const OUString& s
ostr[0] = str1;
ostr[1] = str2;
return this->getRange(ostr, 2, 0);
return getRange(ostr, 2, 0);
}
@@ -546,8 +546,8 @@ TransliterationImpl::compareSubstring(
Sequence <sal_Int32> offset;
OUString in_str1 = this->transliterate(str1, off1, len1, offset);
OUString in_str2 = this->transliterate(str2, off2, len2, offset);
OUString in_str1 = transliterate(str1, off1, len1, offset);
OUString in_str2 = transliterate(str2, off2, len2, offset);
const sal_Unicode* unistr1 = in_str1.getStr();
const sal_Unicode* unistr2 = in_str2.getStr();
sal_Int32 strlen1 = in_str1.getLength();
@@ -569,7 +569,7 @@ TransliterationImpl::compareString(const OUString& str1, const OUString& str2 )
if (caseignoreOnly && caseignore.is())
return caseignore->compareString(str1, str2);
else
return this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength());
return compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength());
}
i18npool/source/transliteration/transliteration_Ignore.cxx
+3 -3
View File
@@ -33,8 +33,8 @@ transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 n
Sequence< sal_Int32 > offset2;
// The method folding is defined in a sub class.
OUString s1 = this->folding( str1, pos1, nCount1, offset1);
OUString s2 = this->folding( str2, pos2, nCount2, offset2);
OUString s1 = folding( str1, pos1, nCount1, offset1);
OUString s2 = folding( str2, pos2, nCount2, offset2);
const sal_Unicode * p1 = s1.getStr();
const sal_Unicode * p2 = s2.getStr();
@@ -84,7 +84,7 @@ transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos
Sequence< sal_Int32 >& offset )
{
// The method folding is defined in a sub class.
return this->folding( inStr, startPos, nCount, offset);
return folding( inStr, startPos, nCount, offset);
}
Sequence< OUString > SAL_CALL
i18npool/source/transliteration/transliteration_body.cxx
+1 -1
View File
@@ -205,7 +205,7 @@ OUString SAL_CALL
Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
Sequence< sal_Int32 >& offset)
{
return this->transliterate(inStr, startPos, nCount, offset);
return transliterate(inStr, startPos, nCount, offset);
}
Transliteration_casemapping::Transliteration_casemapping()
i18npool/source/transliteration/transliteration_commonclass.cxx
+3 -3
View File
@@ -77,8 +77,8 @@ transliteration_commonclass::compareSubstring(
Sequence <sal_Int32> offset1(2*len1);
Sequence <sal_Int32> offset2(2*len2);
OUString in_str1 = this->transliterate(str1, off1, len1, offset1);
OUString in_str2 = this->transliterate(str2, off2, len2, offset2);
OUString in_str1 = transliterate(str1, off1, len1, offset1);
OUString in_str2 = transliterate(str2, off2, len2, offset2);
sal_Int32 strlen1 = in_str1.getLength();
sal_Int32 strlen2 = in_str2.getLength();
const sal_Unicode* unistr1 = in_str1.getStr();
@@ -101,7 +101,7 @@ transliteration_commonclass::compareSubstring(
sal_Int32 SAL_CALL
transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 )
{
return( this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength()));
return( compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength()));
}
OUString SAL_CALL
idl/source/prj/database.cxx
+1 -1
View File
@@ -144,7 +144,7 @@ bool SvIdlDataBase::ReadIdFile( const OString& rOFileName )
return true;
aIdFileList.push_back( rFileName );
this->AddDepFile( aFullName );
AddDepFile( aFullName );
SvTokenStream aTokStm( aFullName );
if( aTokStm.GetStream().GetError() == ERRCODE_NONE )
{
include/canvas/propertysethelper.hxx
+4 -4
View File
@@ -68,27 +68,27 @@ namespace canvas
const SetterType& setter)
{
MapType::MapEntry aEntry={name, {getter, setter}};
this->push_back(aEntry);
push_back(aEntry);
}
MakeMap(const char* name,
const GetterType& getter)
{
MapType::MapEntry aEntry={name, {getter, SetterType()}};
this->push_back(aEntry);
push_back(aEntry);
}
MakeMap& operator()(const char* name,
const GetterType& getter,
const SetterType& setter)
{
MapType::MapEntry aEntry={name, {getter, setter}};
this->push_back(aEntry);
push_back(aEntry);
return *this;
}
MakeMap& operator()(const char* name,
const GetterType& getter)
{
MapType::MapEntry aEntry={name, {getter, SetterType()}};
this->push_back(aEntry);
push_back(aEntry);
return *this;
}
};

Some files were not shown because too many files have changed in this diff Show More