strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ScIconSetFrmtDataEntry::CreateEntry always dereferences it ScDocument* arg

Browse source 
Change-Id: I4adee5f3632d4c9a9846f38828c85e39c1f3218d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102663
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2020-09-14 10:58:13 +01:00
parent 41a86d795e
commit 90fbbecb2e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sc/source/ui/condformat/condformatdlgentry.cxx
View file

@ -1323,7 +1323,7 @@ public:
mxGrid->set_grid_top_attach(nTop);
}
ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const;
ScColorScaleEntry* CreateEntry(ScDocument& rDoc, const ScAddress& rPos) const;
void SetFirstEntry();
};
@ -1373,7 +1373,7 @@ ScIconSetFrmtDataEntry::~ScIconSetFrmtDataEntry()
mpContainer->move(mxGrid.get(), nullptr);
}
ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const
ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument& rDoc, const ScAddress& rPos) const
{
sal_Int32 nPos = mxLbEntryType->get_active();
OUString aText = mxEdEntry->get_text();
@ -1381,7 +1381,7 @@ ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const S
sal_uInt32 nIndex = 0;
double nVal = 0;
SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
SvNumberFormatter* pNumberFormatter = rDoc.GetFormatTable();
(void)pNumberFormatter->IsNumberFormat(aText, nIndex, nVal);
pEntry->SetValue(nVal);
@ -1398,7 +1398,7 @@ ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const S
break;
case 3:
pEntry->SetType(COLORSCALE_FORMULA);
pEntry->SetFormula(aText, *pDoc, rPos, pDoc->GetGrammar());
pEntry->SetFormula(aText, rDoc, rPos, rDoc.GetGrammar());
break;
default:
assert(false);
@ -1516,7 +1516,7 @@ ScFormatEntry* ScIconSetFrmtEntry::GetEntry() const
pData->eIconSetType = static_cast<ScIconSetType>(mxLbIconSetType->get_active());
for(const auto& rxEntry : maEntries)
{
pData->m_Entries.emplace_back(rxEntry->CreateEntry(mpDoc, maPos));
pData->m_Entries.emplace_back(rxEntry->CreateEntry(*mpDoc, maPos));
}
pFormat->SetIconSetData(pData);