Skip to content

C
core
Kaydet (Commit) 71c60f8f authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

coverity#982279 Resource leak in object 

Change-Id: I8a616dee5795c3614baa69840b3a8808ef89b650
üst faace681
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
sc/source/filter/inc/condformatbuffer.hxx
Dosyayı görüntüle @ 71c60f8f
...@@ -133,7 +133,7 @@ public: ...@@ -133,7 +133,7 @@ public:
private: private:
std::vector< ColorScaleRuleModelEntry > maEntries; std::vector< ColorScaleRuleModelEntry > maEntries;
ScIconSetFormatData* mpFormatData; std::unique_ptr<ScIconSetFormatData> mxFormatData;
OUString maIconSetType; OUString maIconSetType;
}; };
......
sc/source/filter/oox/condformatbuffer.cxx
Dosyayı görüntüle @ 71c60f8f
...@@ -287,7 +287,7 @@ void DataBarRule::SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScA ...@@ -287,7 +287,7 @@ void DataBarRule::SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScA
IconSetRule::IconSetRule( const CondFormat& rFormat ): IconSetRule::IconSetRule( const CondFormat& rFormat ):
WorksheetHelper( rFormat ), WorksheetHelper( rFormat ),
mpFormatData( new ScIconSetFormatData ) mxFormatData( new ScIconSetFormatData )
{ {
} }
...@@ -302,8 +302,8 @@ void IconSetRule::importCfvo( const AttributeList& rAttribs ) ...@@ -302,8 +302,8 @@ void IconSetRule::importCfvo( const AttributeList& rAttribs )
void IconSetRule::importAttribs( const AttributeList& rAttribs ) void IconSetRule::importAttribs( const AttributeList& rAttribs )
{ {
maIconSetType = rAttribs.getString( XML_iconSet, OUString("3TrafficLights1") ); maIconSetType = rAttribs.getString( XML_iconSet, OUString("3TrafficLights1") );
mpFormatData->mbShowValue = rAttribs.getBool( XML_showValue, true ); mxFormatData->mbShowValue = rAttribs.getBool( XML_showValue, true );
mpFormatData->mbReverse = rAttribs.getBool( XML_reverse, false ); mxFormatData->mbReverse = rAttribs.getBool( XML_reverse, false );
} }
void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScAddress& rPos ) void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScAddress& rPos )
...@@ -311,7 +311,7 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA ...@@ -311,7 +311,7 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA
for(size_t i = 0; i < maEntries.size(); ++i) for(size_t i = 0; i < maEntries.size(); ++i)
{ {
ScColorScaleEntry* pModelEntry = ConvertToModel( maEntries[i], pDoc, rPos ); ScColorScaleEntry* pModelEntry = ConvertToModel( maEntries[i], pDoc, rPos );
mpFormatData->maEntries.push_back(pModelEntry); mxFormatData->maEntries.push_back(pModelEntry);
} }
ScIconSetType eIconSetType = IconSet_3TrafficLights1; ScIconSetType eIconSetType = IconSet_3TrafficLights1;
...@@ -324,8 +324,8 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA ...@@ -324,8 +324,8 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA
break; break;
} }
} }
mpFormatData->eIconSetType = eIconSetType; mxFormatData->eIconSetType = eIconSetType;
pFormat->SetIconSetData(mpFormatData); pFormat->SetIconSetData(mxFormatData.release());
} }
CondFormatRuleModel::CondFormatRuleModel() : CondFormatRuleModel::CondFormatRuleModel() :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment