mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return the std::unique_ptr itself here, not a raw pointer

Browse Source 
Change-Id: I25d9bc5c969d00642613971c88f864285ecdddbc
This commit is contained in:
Stephan Bergmann
2015-09-28 10:08:07 +02:00
parent c762354ceb
commit b4271a1cd1
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
chart2/source/view/main/VDataSeries.cxx
View File

@@ -779,7 +779,7 @@ double VDataSeries::getYMeanValue() const
return m_fYMeanValue; return m_fYMeanValue;
} }
Symbol* getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) std::unique_ptr<Symbol> getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{ {
::std::unique_ptr< Symbol > apSymbolProps( new Symbol() ); ::std::unique_ptr< Symbol > apSymbolProps( new Symbol() );
try try
@@ -798,7 +798,7 @@ Symbol* getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XProper
{ {
ASSERT_EXCEPTION( e ); ASSERT_EXCEPTION( e );
} }
return apSymbolProps.release(); return apSymbolProps;
} }
Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
@@ -808,16 +808,16 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
{ {
adaptPointCache( index ); adaptPointCache( index );
if (!m_apSymbolProperties_AttributedPoint) if (!m_apSymbolProperties_AttributedPoint)
m_apSymbolProperties_AttributedPoint.reset( m_apSymbolProperties_AttributedPoint
getSymbolPropertiesFromPropertySet(this->getPropertiesOfPoint(index))); = getSymbolPropertiesFromPropertySet(this->getPropertiesOfPoint(index));
pRet = m_apSymbolProperties_AttributedPoint.get(); pRet = m_apSymbolProperties_AttributedPoint.get();
//if a single data point does not have symbols but the dataseries itself has symbols //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 //we create an invisible symbol shape to enable selection of that point
if( !pRet || pRet->Style == SymbolStyle_NONE ) if( !pRet || pRet->Style == SymbolStyle_NONE )
{ {
if (!m_apSymbolProperties_Series) if (!m_apSymbolProperties_Series)
m_apSymbolProperties_Series.reset( m_apSymbolProperties_Series
getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries())); = getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries());
if( m_apSymbolProperties_Series.get() && m_apSymbolProperties_Series->Style != SymbolStyle_NONE ) if( m_apSymbolProperties_Series.get() && m_apSymbolProperties_Series->Style != SymbolStyle_NONE )
{ {
if (!m_apSymbolProperties_InvisibleSymbolForSelection) if (!m_apSymbolProperties_InvisibleSymbolForSelection)
@@ -836,8 +836,8 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index ) const
else else
{ {
if (!m_apSymbolProperties_Series) if (!m_apSymbolProperties_Series)
m_apSymbolProperties_Series.reset( m_apSymbolProperties_Series
getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries())); = getSymbolPropertiesFromPropertySet(this->getPropertiesOfSeries());
pRet = m_apSymbolProperties_Series.get(); pRet = m_apSymbolProperties_Series.get();
} }
@@ -925,7 +925,7 @@ uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const
return uno::Reference<css::beans::XPropertySet>(m_xDataSeries, css::uno::UNO_QUERY); return uno::Reference<css::beans::XPropertySet>(m_xDataSeries, css::uno::UNO_QUERY);
} }
DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) std::unique_ptr<DataPointLabel> getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{ {
::std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() ); ::std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() );
try try
@@ -937,7 +937,7 @@ DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::X
{ {
ASSERT_EXCEPTION( e ); ASSERT_EXCEPTION( e );
} }
return apLabel.release(); return apLabel;
} }
void VDataSeries::adaptPointCache( sal_Int32 nNewPointIndex ) const void VDataSeries::adaptPointCache( sal_Int32 nNewPointIndex ) const
@@ -959,15 +959,15 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const
{ {
adaptPointCache( index ); adaptPointCache( index );
if( !m_apLabel_AttributedPoint.get() ) if( !m_apLabel_AttributedPoint.get() )
m_apLabel_AttributedPoint.reset( m_apLabel_AttributedPoint
getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index))); = getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index));
pRet = m_apLabel_AttributedPoint.get(); pRet = m_apLabel_AttributedPoint.get();
} }
else else
{ {
if (!m_apLabel_Series) if (!m_apLabel_Series)
m_apLabel_Series.reset( m_apLabel_Series
getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index))); = getDataPointLabelFromPropertySet(this->getPropertiesOfPoint(index));
pRet = m_apLabel_Series.get(); pRet = m_apLabel_Series.get();
} }
if( !m_bAllowPercentValueInDataLabel ) if( !m_bAllowPercentValueInDataLabel )