sc/inc/fmtuno.hxx | 2 +-
sc/source/ui/unoobj/cellsuno.cxx | 2 +-
sc/source/ui/unoobj/fmtuno.cxx | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit f7605c97f6a0693bee71b8118a48c19968bea52a
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 13 19:50:10 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 14 09:56:26 2020 +0200
FillFormat never called with a nullptr
Change-Id: Ibcadbe7b4d5caf6542f87c800ec92c61225e55de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102606
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 1625df961738..0819fe5a016f 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -83,7 +83,7 @@ public:
SCTAB nTab,
formula::FormulaGrammar::Grammar eGrammar);
virtual ~ScTableConditionalFormat() override;
- void FillFormat( ScConditionalFormat& rFormat,
ScDocument* pDoc,
+ void FillFormat( ScConditionalFormat& rFormat,
ScDocument& rDoc,
formula::FormulaGrammar::Grammar eGrammar)
const;
// XSheetConditionalEntries
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index cb906b447aa5..7425705096a3 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2321,7 +2321,7 @@ void ScCellRangesBase::SetOnePropertyValue( const
SfxItemPropertySimpleEntry* pE
if (pFormat->getCount())
{
auto pNew =
std::make_unique<ScConditionalFormat>( 0, &rDoc ); // Index will be set on
inserting
- pFormat->FillFormat( *pNew, &rDoc, eGrammar );
+ pFormat->FillFormat( *pNew, rDoc, eGrammar );
pNew->SetRange( aRanges );
pDocShell->GetDocFunc().ReplaceConditionalFormat( 0, std::move(pNew), nTab,
aRanges );
}
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index c6a84e98cb9c..f8a363541109 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -193,7 +193,7 @@ FormulaGrammar::Grammar lclResolveGrammar(
FormulaGrammar::Grammar eExtGrammar,
} // namespace
void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat,
- ScDocument* pDoc, FormulaGrammar::Grammar eGrammar) const
+ ScDocument& rDoc, FormulaGrammar::Grammar eGrammar) const
{
// ScConditionalFormat = Core-Struktur, has to be empty
@@ -208,22 +208,22 @@ void ScTableConditionalFormat::FillFormat(
ScConditionalFormat& rFormat,
FormulaGrammar::Grammar eGrammar2 = lclResolveGrammar( eGrammar,
aData.meGrammar2 );
ScCondFormatEntry* pCoreEntry = new ScCondFormatEntry( aData.meMode,
aData.maExpr1, aData.maExpr2,
- pDoc, aData.maPos, aData.maStyle, aData.maExprNmsp1,
aData.maExprNmsp2, eGrammar1, eGrammar2 );
+ &rDoc, aData.maPos, aData.maStyle, aData.maExprNmsp1,
aData.maExprNmsp2, eGrammar1, eGrammar2 );
if ( !aData.maPosStr.isEmpty() )
pCoreEntry->SetSrcString( aData.maPosStr );
if ( aData.maTokens1.hasElements() )
{
- ScTokenArray aTokenArray(*pDoc);
- if ( ScTokenConversion::ConvertToTokenArray(*pDoc, aTokenArray,
aData.maTokens1) )
+ ScTokenArray aTokenArray(rDoc);
+ if ( ScTokenConversion::ConvertToTokenArray(rDoc, aTokenArray,
aData.maTokens1) )
pCoreEntry->SetFormula1(aTokenArray);
}
if ( aData.maTokens2.hasElements() )
{
- ScTokenArray aTokenArray(*pDoc);
- if ( ScTokenConversion::ConvertToTokenArray(*pDoc, aTokenArray,
aData.maTokens2) )
+ ScTokenArray aTokenArray(rDoc);
+ if ( ScTokenConversion::ConvertToTokenArray(rDoc, aTokenArray,
aData.maTokens2) )
pCoreEntry->SetFormula2(aTokenArray);
}
rFormat.AddEntry( pCoreEntry );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
