ScCondFormatList: pDoc is never nullptr

Change-Id: I764cd7eed4fe91bac7ad83dbbc48b2a2c4509c82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177273
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

10 files changed, 158 insertions, 157 deletions

diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index ff8afff2d48f..4dd4f92599f3 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -25,7 +25,7 @@ void SetType(const ScColorScaleEntry* pEntry, weld::ComboBox& rLstBox)
 }
 
 void GetType(const weld::ComboBox& rLstBox, const weld::Entry& rEd, ScColorScaleEntry* pEntry, SvNumberFormatter* pNumberFormatter,
-        ScDocument* pDoc, const ScAddress& rPos )
+        ScDocument& rDoc, const ScAddress& rPos )
 {
     double nVal = 0;
     sal_uInt32 nIndex = 0;
@@ -43,33 +43,33 @@ void GetType(const weld::ComboBox& rLstBox, const weld::Entry& rEd, ScColorScale
             pEntry->SetValue(nVal);
             break;
         case COLORSCALE_FORMULA:
-            pEntry->SetFormula(rEd.get_text(), *pDoc, rPos);
+            pEntry->SetFormula(rEd.get_text(), rDoc, rPos);
             break;
     }
 }
 
-OUString convertNumberToString(double nVal, const ScDocument* pDoc)
+OUString convertNumberToString(double nVal, const ScDocument& rDoc)
 {
-    SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+    SvNumberFormatter* pNumberFormatter = rDoc.GetFormatTable();
     return pNumberFormatter->GetInputLineString(nVal, 0);
 }
 
-void SetValue( const ScDocument* pDoc, const ScColorScaleEntry* pEntry, weld::Entry& rEdit)
+void SetValue( const ScDocument& rDoc, const ScColorScaleEntry* pEntry, weld::Entry& rEdit)
 {
     if(pEntry->GetType() == COLORSCALE_FORMULA)
         rEdit.set_text(pEntry->GetFormula(formula::FormulaGrammar::GRAM_DEFAULT));
     else if(pEntry->GetType() != COLORSCALE_MIN && pEntry->GetType() != COLORSCALE_MAX)
-        rEdit.set_text(convertNumberToString(pEntry->GetValue(), pDoc));
+        rEdit.set_text(convertNumberToString(pEntry->GetValue(), rDoc));
     else
         rEdit.set_sensitive(false);
 }
 
 }
 
-ScDataBarSettingsDlg::ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos)
+ScDataBarSettingsDlg::ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument& rDoc, const ScAddress& rPos)
     : GenericDialogController(pParent, u"modules/scalc/ui/databaroptions.ui"_ustr, u"DataBarOptions"_ustr)
-    , mpNumberFormatter(pDoc->GetFormatTable())
-    , mpDoc(pDoc)
+    , mpNumberFormatter(rDoc.GetFormatTable())
+    , mrDoc(rDoc)
     , maPos(rPos)
     , mxBtnOk(m_xBuilder->weld_button(u"ok"_ustr))
     , mxLbPos(new ColorListBox(m_xBuilder->weld_menu_button(u"positive_colour"_ustr), [this]{ return m_xDialog.get(); }))
@@ -109,10 +109,10 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBa
     }
     ::SetType(rData.mpLowerLimit.get(), *mxLbTypeMin);
     ::SetType(rData.mpUpperLimit.get(), *mxLbTypeMax);
-    SetValue(mpDoc, rData.mpLowerLimit.get(), *mxEdMin);
-    SetValue(mpDoc, rData.mpUpperLimit.get(), *mxEdMax);
-    mxLenMin->set_text(convertNumberToString(rData.mnMinLength, mpDoc));
-    mxLenMax->set_text(convertNumberToString(rData.mnMaxLength, mpDoc));
+    SetValue(mrDoc, rData.mpLowerLimit.get(), *mxEdMin);
+    SetValue(mrDoc, rData.mpUpperLimit.get(), *mxEdMax);
+    mxLenMin->set_text(convertNumberToString(rData.mnMinLength, mrDoc));
+    mxLenMax->set_text(convertNumberToString(rData.mnMaxLength, mrDoc));
     mxLbAxisCol->SelectEntry(rData.maAxisColor);
     mxCbOnlyBar->set_active(rData.mbOnlyBar);
 
@@ -180,8 +180,8 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData()
     pData->maAxisColor = mxLbAxisCol->GetSelectEntryColor();
     pData->mbOnlyBar = mxCbOnlyBar->get_active();
 
-    ::GetType(*mxLbTypeMin, *mxEdMin, pData->mpLowerLimit.get(), mpNumberFormatter, mpDoc, maPos);
-    ::GetType(*mxLbTypeMax, *mxEdMax, pData->mpUpperLimit.get(), mpNumberFormatter, mpDoc, maPos);
+    ::GetType(*mxLbTypeMin, *mxEdMin, pData->mpLowerLimit.get(), mpNumberFormatter, mrDoc, maPos);
+    ::GetType(*mxLbTypeMax, *mxEdMax, pData->mpUpperLimit.get(), mpNumberFormatter, mrDoc, maPos);
     GetAxesPosition(pData, *mxLbAxisPos);
     SetBarLength(pData, mxLenMin->get_text(), mxLenMax->get_text(), mpNumberFormatter);
 
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 8c608597cab0..dc65664f4498 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -24,13 +24,14 @@
 #include <condformatdlgdata.hxx>
 
 ScCondFormatList::ScCondFormatList(ScCondFormatDlg* pDialogParent,
+                                   ScDocument& rDoc,
                                    std::unique_ptr<weld::ScrolledWindow> xWindow,
                                    std::unique_ptr<weld::Container> xGrid)
     : mxScrollWindow(std::move(xWindow))
     , mxGrid(std::move(xGrid))
     , mbFrozen(false)
     , mbNewEntry(false)
-    , mpDoc(nullptr)
+    , mrDoc(rDoc)
     , mpDialogParent(pDialogParent)
 {
     mxScrollWindow->set_size_request(mxScrollWindow->get_approximate_digit_width() * 85,
@@ -48,11 +49,10 @@ ScCondFormatList::~ScCondFormatList()
     Freeze();
 }
 
-void ScCondFormatList::init(ScDocument& rDoc,
+void ScCondFormatList::init(
         const ScConditionalFormat* pFormat, const ScRangeList& rRanges,
         const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType)
 {
-    mpDoc = &rDoc;
     maPos = rPos;
     maRanges = rRanges;
 
@@ -71,9 +71,9 @@ void ScCondFormatList::init(ScDocument& rDoc,
                     {
                         const ScCondFormatEntry* pConditionEntry = static_cast<const ScCondFormatEntry*>( pEntry );
                         if(pConditionEntry->GetOperation() != ScConditionMode::Direct)
-                            maEntries.emplace_back(new ScConditionFrmtEntry( this, mpDoc, mpDialogParent, maPos, pConditionEntry ) );
+                            maEntries.emplace_back(new ScConditionFrmtEntry( this, mrDoc, mpDialogParent, maPos, pConditionEntry ) );
                         else
-                            maEntries.emplace_back(new ScFormulaFrmtEntry( this, mpDoc, mpDialogParent, maPos, pConditionEntry ) );
+                            maEntries.emplace_back(new ScFormulaFrmtEntry( this, mrDoc, mpDialogParent, maPos, pConditionEntry ) );
 
                     }
                     break;
@@ -81,19 +81,19 @@ void ScCondFormatList::init(ScDocument& rDoc,
                     {
                         const ScColorScaleFormat* pColorScale = static_cast<const ScColorScaleFormat*>( pEntry );
                         if( pColorScale->size() == 2 )
-                            maEntries.emplace_back(new ScColorScale2FrmtEntry( this, mpDoc, maPos, pColorScale ) );
+                            maEntries.emplace_back(new ScColorScale2FrmtEntry( this, mrDoc, maPos, pColorScale ) );
                         else
-                            maEntries.emplace_back(new ScColorScale3FrmtEntry( this, mpDoc, maPos, pColorScale ) );
+                            maEntries.emplace_back(new ScColorScale3FrmtEntry( this, mrDoc, maPos, pColorScale ) );
                     }
                     break;
                 case ScFormatEntry::Type::Databar:
-                    maEntries.emplace_back(new ScDataBarFrmtEntry( this, mpDoc, maPos, static_cast<const ScDataBarFormat*>( pEntry ) ) );
+                    maEntries.emplace_back(new ScDataBarFrmtEntry( this, mrDoc, maPos, static_cast<const ScDataBarFormat*>( pEntry ) ) );
                     break;
                 case ScFormatEntry::Type::Iconset:
-                    maEntries.emplace_back(new ScIconSetFrmtEntry( this, mpDoc, maPos, static_cast<const ScIconSetFormat*>( pEntry ) ) );
+                    maEntries.emplace_back(new ScIconSetFrmtEntry( this, mrDoc, maPos, static_cast<const ScIconSetFormat*>( pEntry ) ) );
                     break;
                 case ScFormatEntry::Type::Date:
-                    maEntries.emplace_back(new ScDateFrmtEntry( this, mpDoc, static_cast<const ScCondDateFormatEntry*>( pEntry ) ) );
+                    maEntries.emplace_back(new ScDateFrmtEntry( this, mrDoc, static_cast<const ScCondDateFormatEntry*>( pEntry ) ) );
                     break;
             }
         }
@@ -105,19 +105,19 @@ void ScCondFormatList::init(ScDocument& rDoc,
         switch(eType)
         {
             case condformat::dialog::CONDITION:
-                maEntries.emplace_back(new ScConditionFrmtEntry( this, mpDoc, mpDialogParent, maPos ));
+                maEntries.emplace_back(new ScConditionFrmtEntry( this, mrDoc, mpDialogParent, maPos ));
                 break;
             case condformat::dialog::COLORSCALE:
-                maEntries.emplace_back(new ScColorScale3FrmtEntry( this, mpDoc, maPos ));
+                maEntries.emplace_back(new ScColorScale3FrmtEntry( this, mrDoc, maPos ));
                 break;
             case condformat::dialog::DATABAR:
-                maEntries.emplace_back(new ScDataBarFrmtEntry( this, mpDoc, maPos ));
+                maEntries.emplace_back(new ScDataBarFrmtEntry( this, mrDoc, maPos ));
                 break;
             case condformat::dialog::ICONSET:
-                maEntries.emplace_back(new ScIconSetFrmtEntry( this, mpDoc, maPos ));
+                maEntries.emplace_back(new ScIconSetFrmtEntry( this, mrDoc, maPos ));
                 break;
             case condformat::dialog::DATE:
-                maEntries.emplace_back(new ScDateFrmtEntry( this, mpDoc ));
+                maEntries.emplace_back(new ScDateFrmtEntry( this, mrDoc ));
                 break;
             case condformat::dialog::NONE:
                 break;
@@ -145,7 +145,7 @@ std::unique_ptr<ScConditionalFormat> ScCondFormatList::GetConditionalFormat() co
     if(maEntries.empty())
         return nullptr;
 
-    std::unique_ptr<ScConditionalFormat> pFormat(new ScConditionalFormat(0, mpDoc));
+    std::unique_ptr<ScConditionalFormat> pFormat(new ScConditionalFormat(0, &mrDoc));
     pFormat->SetRange(maRanges);
 
     for(auto & rEntry: maEntries)
@@ -215,28 +215,28 @@ IMPL_LINK(ScCondFormatList, AfterColFormatTypeHdl, void*, p, void)
                 return;
 
             Freeze();
-            itr->reset(new ScColorScale2FrmtEntry(this, mpDoc, maPos));
+            itr->reset(new ScColorScale2FrmtEntry(this, mrDoc, maPos));
             break;
         case 1:
             if((*itr)->GetType() == condformat::entry::COLORSCALE3)
                 return;
 
             Freeze();
-            itr->reset(new ScColorScale3FrmtEntry(this, mpDoc, maPos));
+            itr->reset(new ScColorScale3FrmtEntry(this, mrDoc, maPos));
             break;
         case 2:
             if((*itr)->GetType() == condformat::entry::DATABAR)
                 return;
 
             Freeze();
-            itr->reset(new ScDataBarFrmtEntry(this, mpDoc, maPos));
+            itr->reset(new ScDataBarFrmtEntry(this, mrDoc, maPos));
             break;
         case 3:
             if((*itr)->GetType() == condformat::entry::ICONSET)
                 return;
 
             Freeze();
-            itr->reset(new ScIconSetFrmtEntry(this, mpDoc, maPos));
+            itr->reset(new ScIconSetFrmtEntry(this, mrDoc, maPos));
             break;
         default:
             break;
@@ -281,7 +281,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void)
                     return;
             }
             Freeze();
-            itr->reset(new ScColorScale3FrmtEntry(this, mpDoc, maPos));
+            itr->reset(new ScColorScale3FrmtEntry(this, mrDoc, maPos));
             mpDialogParent->InvalidateRefData();
             (*itr)->SetActive();
             break;
@@ -290,7 +290,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void)
                 return;
 
             Freeze();
-            itr->reset(new ScConditionFrmtEntry(this, mpDoc, mpDialogParent, maPos));
+            itr->reset(new ScConditionFrmtEntry(this, mrDoc, mpDialogParent, maPos));
             mpDialogParent->InvalidateRefData();
             (*itr)->SetActive();
             break;
@@ -299,7 +299,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void)
                 return;
 
             Freeze();
-            itr->reset(new ScFormulaFrmtEntry(this, mpDoc, mpDialogParent, maPos));
+            itr->reset(new ScFormulaFrmtEntry(this, mrDoc, mpDialogParent, maPos));
             mpDialogParent->InvalidateRefData();
             (*itr)->SetActive();
             break;
@@ -308,7 +308,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void)
                 return;
 
             Freeze();
-            itr->reset(new ScDateFrmtEntry( this, mpDoc ));
+            itr->reset(new ScDateFrmtEntry( this, mrDoc ));
             mpDialogParent->InvalidateRefData();
             (*itr)->SetActive();
             break;
@@ -321,7 +321,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void)
 IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl, weld::Button&, void )
 {
     Freeze();
-    maEntries.emplace_back(new ScConditionFrmtEntry(this, mpDoc, mpDialogParent, maPos));
+    maEntries.emplace_back(new ScConditionFrmtEntry(this, mrDoc, mpDialogParent, maPos));
     for(auto& rxEntry : maEntries)
     {
         rxEntry->SetInactive();
@@ -440,7 +440,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
     , mxFtRange(m_xBuilder->weld_label(u"ftassign"_ustr))
     , mxEdRange(new formula::RefEdit(m_xBuilder->weld_entry(u"edassign"_ustr)))
     , mxRbRange(new formula::RefButton(m_xBuilder->weld_button(u"rbassign"_ustr)))
-    , mxCondFormList(new ScCondFormatList(this, m_xBuilder->weld_scrolled_window(u"listwindow"_ustr),
+    , mxCondFormList(new ScCondFormatList(this, mpViewData->GetDocument(), m_xBuilder->weld_scrolled_window(u"listwindow"_ustr),
                                           m_xBuilder->weld_container(u"list"_ustr)))
 {
     mxEdRange->SetReferences(this, mxFtRange.get());
@@ -476,7 +476,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
     }
     maPos = aRange.GetTopLeftCorner();
 
-    mxCondFormList->init(mpViewData->GetDocument(), pFormat, aRange, maPos, mpDlgItem->GetDialogType());
+    mxCondFormList->init(pFormat, aRange, maPos, mpDlgItem->GetDialogType());
 
     mxBtnOk->connect_clicked(LINK(this, ScCondFormatDlg, BtnPressedHdl ) );
     mxBtnAdd->connect_clicked( LINK( mxCondFormList.get(), ScCondFormatList, AddBtnHdl ) );
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index c9b5e208ffa5..6906d4fb5316 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -50,7 +50,7 @@ static bool isLOKMobilePhone()
     return pCurrent && pCurrent->isLOKMobilePhone();
 }
 
-ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos)
+ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos)
     : mpParent(pParent)
     , mxBuilder(Application::CreateBuilder(pParent->GetContainer(), isLOKMobilePhone()?u"modules/scalc/ui/conditionalentrymobile.ui"_ustr:u"modules/scalc/ui/conditionalentry.ui"_ustr))
     , mxBorder(mxBuilder->weld_widget(u"border"_ustr))
@@ -60,7 +60,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, co
     , mbActive(false)
     , maStrCondition(ScResId(SCSTR_CONDITION))
     , mxLbType(mxBuilder->weld_combo_box(u"type"_ustr))
-    , mpDoc(pDoc)
+    , mrDoc(rDoc)
     , maPos(rPos)
 {
     mxLbType->set_size_request(CommonWidgetWidth, -1);
@@ -148,9 +148,9 @@ const ScConditionMode ScConditionFrmtEntry::mpEntryToCond[ScConditionFrmtEntry::
         ScConditionMode::LastYear,
         ScConditionMode::NextYear };
 
-ScConditionFrmtEntry::ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
+ScConditionFrmtEntry::ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, ScCondFormatDlg* pDialogParent,
         const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry)
-    : ScCondFrmtEntry(pParent, pDoc, rPos)
+    : ScCondFrmtEntry(pParent, rDoc, rPos)
     , mxLbCondType(mxBuilder->weld_combo_box(u"typeis"_ustr))
     , mxEdVal1(new formula::RefEdit(mxBuilder->weld_entry(u"val1"_ustr)))
     , mxEdVal2(new formula::RefEdit(mxBuilder->weld_entry(u"val2"_ustr)))
@@ -169,7 +169,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument
 
     Init(pDialogParent);
 
-    StartListening(*pDoc->GetStyleSheetPool(), DuplicateHandling::Prevent);
+    StartListening(*rDoc.GetStyleSheetPool(), DuplicateHandling::Prevent);
 
     if(pFormatEntry)
     {
@@ -221,7 +221,7 @@ void ScConditionFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
     mxEdVal1->SetModifyHdl( LINK( this, ScConditionFrmtEntry, OnEdChanged ) );
     mxEdVal2->SetModifyHdl( LINK( this, ScConditionFrmtEntry, OnEdChanged ) );
 
-    ScCondFormatHelper::FillStyleListBox(mpDoc, *mxLbStyle);
+    ScCondFormatHelper::FillStyleListBox(mrDoc, *mxLbStyle);
     mxLbStyle->connect_changed( LINK( this, ScConditionFrmtEntry, StyleSelectHdl ) );
 
     mxLbCondType->connect_changed( LINK( this, ScConditionFrmtEntry, ConditionTypeSelectHdl ) );
@@ -241,14 +241,14 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const
         }
     }
 
-    ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, *mpDoc, maPos, mxLbStyle->get_active_text());
+    ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mrDoc, maPos, mxLbStyle->get_active_text());
     return pEntry;
 }
 
 IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, formula::RefEdit&, rRefEdit, void)
 {
     weld::Entry& rEdit = *rRefEdit.GetWidget();
-    ScCondFormatHelper::ValidateInputField(rEdit, *mxFtVal, mpDoc, maPos);
+    ScCondFormatHelper::ValidateInputField(rEdit, *mxFtVal, mrDoc, maPos);
 }
 
 void ScConditionFrmtEntry::Select()
@@ -381,21 +381,21 @@ void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const SfxHint& rHint)
     if(rHint.GetId() == SfxHintId::StyleSheetModified || rHint.GetId() == SfxHintId::StyleSheetModifiedExtended)
     {
         if(!mbIsInStyleCreate)
-            ScCondFormatHelper::UpdateStyleList(*mxLbStyle, mpDoc);
+            ScCondFormatHelper::UpdateStyleList(*mxLbStyle, mrDoc);
     }
 }
 
 IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl, weld::ComboBox&, void)
 {
     mbIsInStyleCreate = true;
-    ScCondFormatHelper::StyleSelect(mpParent->GetFrameWeld(), *mxLbStyle, mpDoc, maWdPreview);
+    ScCondFormatHelper::StyleSelect(mpParent->GetFrameWeld(), *mxLbStyle, mrDoc, maWdPreview);
     mbIsInStyleCreate = false;
 }
 
 // formula
 
-ScFormulaFrmtEntry::ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat)
-    : ScCondFrmtEntry(pParent, pDoc, rPos)
+ScFormulaFrmtEntry::ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat)
+    : ScCondFrmtEntry(pParent, rDoc, rPos)
     , mxFtStyle(mxBuilder->weld_label(u"styleft"_ustr))
     , mxLbStyle(mxBuilder->weld_combo_box(u"style"_ustr))
     , mxWdPreviewWin(mxBuilder->weld_widget(u"previewwin"_ustr))
@@ -411,7 +411,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument* pD
 
     if(pFormat)
     {
-        mxEdFormula->SetText(pFormat->GetExpression(rPos, 0, 0, pDoc->GetGrammar()));
+        mxEdFormula->SetText(pFormat->GetExpression(rPos, 0, 0, rDoc.GetGrammar()));
         mxLbStyle->set_active_text(pFormat->GetStyle());
     }
     else
@@ -430,13 +430,13 @@ void ScFormulaFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
 {
     mxEdFormula->SetGetFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeGetFocusHdl ) );
 
-    ScCondFormatHelper::FillStyleListBox(mpDoc, *mxLbStyle);
+    ScCondFormatHelper::FillStyleListBox(mrDoc, *mxLbStyle);
     mxLbStyle->connect_changed( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) );
 }
 
 IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl, weld::ComboBox&, void)
 {
-    ScCondFormatHelper::StyleSelect(mpParent->GetFrameWeld(), *mxLbStyle, mpDoc, maWdPreview);
+    ScCondFormatHelper::StyleSelect(mpParent->GetFrameWeld(), *mxLbStyle, mrDoc, maWdPreview);
 }
 
 ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const
@@ -445,7 +445,7 @@ ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const
     if(aFormula.isEmpty())
         return nullptr;
 
-    ScFormatEntry* pEntry = new ScCondFormatEntry(ScConditionMode::Direct, aFormula, OUString(), *mpDoc, maPos, mxLbStyle->get_active_text());
+    ScFormatEntry* pEntry = new ScCondFormatEntry(ScConditionMode::Direct, aFormula, OUString(), mrDoc, maPos, mxLbStyle->get_active_text());
     return pEntry;
 }
 
@@ -483,9 +483,9 @@ void ScFormulaFrmtEntry::SetInactive()
 
 namespace {
 
-OUString convertNumberToString(double nVal, const ScDocument* pDoc)
+OUString convertNumberToString(double nVal, const ScDocument& rDoc)
 {
-    SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+    SvNumberFormatter* pNumberFormatter = rDoc.GetFormatTable();
     return pNumberFormatter->GetInputLineString(nVal, 0);
 }
 
@@ -547,7 +547,7 @@ void removeType(weld::ComboBox& rListBox, ScColorScaleEntryType eType)
         rListBox.remove(nPos);
 }
 
-void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbType, weld::Entry& rEdit, ColorListBox& rLbCol, const ScDocument* pDoc )
+void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbType, weld::Entry& rEdit, ColorListBox& rLbCol, const ScDocument& rDoc )
 {
     // entry Automatic is not available for color scales
     assert(rEntry.GetType() > COLORSCALE_AUTO);
@@ -562,7 +562,7 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& r
         case COLORSCALE_PERCENT:
             {
                 double nVal = rEntry.GetValue();
-                rEdit.set_text(convertNumberToString(nVal, pDoc));
+                rEdit.set_text(convertNumberToString(nVal, rDoc));
             }
             break;
         case COLORSCALE_FORMULA:
@@ -576,7 +576,7 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& r
 }
 
 void SetColorScaleEntry(ScColorScaleEntry* pEntry, const weld::ComboBox& rType, const weld::Entry& rValue,
-                        ScDocument* pDoc, const ScAddress& rPos)
+                        ScDocument& rDoc, const ScAddress& rPos)
 {
     ScColorScaleEntryType eType = getSelectedType(rType);
 
@@ -593,24 +593,24 @@ void SetColorScaleEntry(ScColorScaleEntry* pEntry, const weld::ComboBox& rType,
             {
                 sal_uInt32 nIndex = 0;
                 double nVal = 0;
-                SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+                SvNumberFormatter* pNumberFormatter = rDoc.GetFormatTable();
                 (void)pNumberFormatter->IsNumberFormat(rValue.get_text(), nIndex, nVal);
                 pEntry->SetValue(nVal);
             }
             break;
         case COLORSCALE_FORMULA:
-            pEntry->SetFormula(rValue.get_text(), *pDoc, rPos);
+            pEntry->SetFormula(rValue.get_text(), rDoc, rPos);
             break;
         default:
             break;
     }
 }
 
-ScColorScaleEntry* createColorScaleEntry( const weld::ComboBox& rType, const ColorListBox& rColor, const weld::Entry& rValue, ScDocument* pDoc, const ScAddress& rPos )
+ScColorScaleEntry* createColorScaleEntry( const weld::ComboBox& rType, const ColorListBox& rColor, const weld::Entry& rValue, ScDocument& rDoc, const ScAddress& rPos )
 {
     ScColorScaleEntry* pEntry = new ScColorScaleEntry();
 
-    SetColorScaleEntry(pEntry, rType, rValue, pDoc, rPos);
+    SetColorScaleEntry(pEntry, rType, rValue, rDoc, rPos);
     Color aColor = rColor.GetSelectEntryColor();
     pEntry->SetColor(aColor);
     return pEntry;
@@ -618,8 +618,8 @@ ScColorScaleEntry* createColorScaleEntry( const weld::ComboBox& rType, const Col
 
 }
 
-ScColorScale2FrmtEntry::ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat)
-    : ScCondFrmtEntry(pParent, pDoc, rPos)
+ScColorScale2FrmtEntry::ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat)
+    : ScCondFrmtEntry(pParent, rDoc, rPos)
     , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr))
     , mxLbEntryTypeMin(mxBuilder->weld_combo_box(u"colscalemin"_ustr))
     , mxLbEntryTypeMax(mxBuilder->weld_combo_box(u"colscalemax"_ustr))
@@ -652,9 +652,9 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocu
     if(pFormat)
     {
         ScColorScaleEntries::const_iterator itr = pFormat->begin();
-        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMin, *mxEdMin, *mxLbColMin, pDoc);
+        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMin, *mxEdMin, *mxLbColMin, rDoc);
         ++itr;
-        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMax, *mxEdMax, *mxLbColMax, pDoc);
+        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMax, *mxEdMax, *mxLbColMax, rDoc);
     }
     else
     {
@@ -682,9 +682,9 @@ void ScColorScale2FrmtEntry::Init()
 
 ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const
 {
-    ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
-    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMin, *mxLbColMin, *mxEdMin, mpDoc, maPos));
-    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMax, *mxLbColMax, *mxEdMax, mpDoc, maPos));
+    ScColorScaleFormat* pColorScale = new ScColorScaleFormat(&mrDoc);
+    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMin, *mxLbColMin, *mxEdMin, mrDoc, maPos));
+    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMax, *mxLbColMax, *mxEdMax, mrDoc, maPos));
     return pColorScale;
 }
 
@@ -753,8 +753,8 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, weld::ComboBox&, rBox, void )
         pEd->set_sensitive(false);
 }
 
-ScColorScale3FrmtEntry::ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat)
-    : ScCondFrmtEntry(pParent, pDoc, rPos)
+ScColorScale3FrmtEntry::ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat)
+    : ScCondFrmtEntry(pParent, rDoc, rPos)
     , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr))
     , mxLbEntryTypeMin(mxBuilder->weld_combo_box(u"colscalemin"_ustr))
     , mxLbEntryTypeMiddle(mxBuilder->weld_combo_box(u"colscalemiddle"_ustr))
@@ -792,12 +792,12 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocu
     if(pFormat)
     {
         ScColorScaleEntries::const_iterator itr = pFormat->begin();
-        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMin, *mxEdMin, *mxLbColMin, pDoc);
+        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMin, *mxEdMin, *mxLbColMin, rDoc);
         assert(pFormat->size() == 3);
         ++itr;
-        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMiddle, *mxEdMiddle, *mxLbColMiddle, pDoc);
+        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMiddle, *mxEdMiddle, *mxLbColMiddle, rDoc);
         ++itr;
-        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMax, *mxEdMax, *mxLbColMax, pDoc);
+        SetColorScaleEntryTypes(*itr[0], *mxLbEntryTypeMax, *mxEdMax, *mxLbColMax, rDoc);
     }
     else
     {
@@ -830,11 +830,11 @@ void ScColorScale3FrmtEntry::Init()
 
 ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const
 {
-    ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
-    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMin, *mxLbColMin, *mxEdMin, mpDoc, maPos));
+    ScColorScaleFormat* pColorScale = new ScColorScaleFormat(&mrDoc);
+    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMin, *mxLbColMin, *mxEdMin, mrDoc, maPos));
     if (mxLbColorFormat->get_active() == 1)
-        pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMiddle, *mxLbColMiddle, *mxEdMiddle, mpDoc, maPos));
-    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMax, *mxLbColMax, *mxEdMax, mpDoc, maPos));
+        pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMiddle, *mxLbColMiddle, *mxEdMiddle, mrDoc, maPos));
+    pColorScale->AddEntry(createColorScaleEntry(*mxLbEntryTypeMax, *mxLbColMax, *mxEdMax, mrDoc, maPos));
     return pColorScale;
 }
 
@@ -938,7 +938,7 @@ IMPL_LINK_NOARG(ScConditionFrmtEntry, ConditionTypeSelectHdl, weld::ComboBox&, v
 
 namespace {
 
-void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbType, weld::Entry& rEdit, const ScDocument* pDoc )
+void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbType, weld::Entry& rEdit, const ScDocument& rDoc )
 {
     selectType(rLbType, rEntry.GetType());
     switch(rEntry.GetType())
@@ -952,7 +952,7 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbT
         case COLORSCALE_PERCENTILE:
             {
                 double nVal = rEntry.GetValue();
-                SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable();
+                SvNumberFormatter* pNumberFormatter = rDoc.GetFormatTable();
                 OUString aText = pNumberFormatter->GetInputLineString(nVal, 0);
                 rEdit.set_text(aText);
             }
@@ -965,8 +965,8 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, weld::ComboBox& rLbT
 
 }
 
-ScDataBarFrmtEntry::ScDataBarFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat)
-    : ScCondFrmtEntry(pParent, pDoc, rPos)
+ScDataBarFrmtEntry::ScDataBarFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat)
+    : ScCondFrmtEntry(pParent, rDoc, rPos)
     , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr))
     , mxLbDataBarMinType(mxBuilder->weld_combo_box(u"colscalemin"_ustr))
     , mxLbDataBarMaxType(mxBuilder->weld_combo_box(u"colscalemax"_ustr))
@@ -992,8 +992,8 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry(ScCondFormatList* pParent, ScDocument* pD
     if(pFormat)
     {
         mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData()));
-        SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *mxLbDataBarMinType, *mxEdDataBarMin, pDoc);
-        SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *mxLbDataBarMaxType, *mxEdDataBarMax, pDoc);
+        SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *mxLbDataBarMinType, *mxEdDataBarMin, rDoc);
+        SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *mxLbDataBarMaxType, *mxEdDataBarMax, rDoc);
         DataBarTypeSelectHdl(*mxLbDataBarMinType);
     }
     else
@@ -1037,10 +1037,10 @@ void ScDataBarFrmtEntry::Init()
 ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const
 {
     SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *mxLbDataBarMinType,
-                       *mxEdDataBarMin, mpDoc, maPos);
+                       *mxEdDataBarMin, mrDoc, maPos);
     SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *mxLbDataBarMaxType,
-                       *mxEdDataBarMax, mpDoc, maPos);
-    ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc);
+                       *mxEdDataBarMax, mrDoc, maPos);
+    ScDataBarFormat* pDataBar = new ScDataBarFormat(&mrDoc);
     pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData));
     return pDataBar;
 }
@@ -1092,21 +1092,21 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, weld::ComboBox&, void
 IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl, weld::Button&, void )
 {
     SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *mxLbDataBarMinType,
-                       *mxEdDataBarMin, mpDoc, maPos);
+                       *mxEdDataBarMin, mrDoc, maPos);
     SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *mxLbDataBarMaxType,
-                       *mxEdDataBarMax, mpDoc, maPos);
-    ScDataBarSettingsDlg aDlg(mpParent->GetFrameWeld(), *mpDataBarData, mpDoc, maPos);
+                       *mxEdDataBarMax, mrDoc, maPos);
+    ScDataBarSettingsDlg aDlg(mpParent->GetFrameWeld(), *mpDataBarData, mrDoc, maPos);
     if (aDlg.run() == RET_OK)
     {
         mpDataBarData.reset(aDlg.GetData());
-        SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *mxLbDataBarMinType, *mxEdDataBarMin, mpDoc);
-        SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *mxLbDataBarMaxType, *mxEdDataBarMax, mpDoc);
+        SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *mxLbDataBarMinType, *mxEdDataBarMin, mrDoc);
+        SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *mxLbDataBarMaxType, *mxEdDataBarMax, mrDoc);
         DataBarTypeSelectHdl(*mxLbDataBarMinType);
     }
 }
 
-ScDateFrmtEntry::ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat)
-    : ScCondFrmtEntry(pParent, pDoc, ScAddress())
+ScDateFrmtEntry::ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScCondDateFormatEntry* pFormat)
+    : ScCondFrmtEntry(pParent, rDoc, ScAddress())
     , mxLbDateEntry(mxBuilder->weld_combo_box(u"datetype"_ustr))
     , mxFtStyle(mxBuilder->weld_label(u"styleft"_ustr))
     , mxLbStyle(mxBuilder->weld_combo_box(u"style"_ustr))
@@ -1121,7 +1121,7 @@ ScDateFrmtEntry::ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, co
 
     Init();
 
-    StartListening(*pDoc->GetStyleSheetPool(), DuplicateHandling::Prevent);
+    StartListening(*rDoc.GetStyleSheetPool(), DuplicateHandling::Prevent);
 
     if(pFormat)
     {
@@ -1143,7 +1143,7 @@ void ScDateFrmtEntry::Init()
     mxLbDateEntry->set_active(0);
     mxLbType->set_active(3);
 
-    ScCondFormatHelper::FillStyleListBox(mpDoc, *mxLbStyle);
+    ScCondFormatHelper::FillStyleListBox(mrDoc, *mxLbStyle);
     mxLbStyle->connect_changed( LINK( this, ScDateFrmtEntry, StyleSelectHdl ) );
     mxLbStyle->set_active(1);
 }
@@ -1173,13 +1173,13 @@ void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint )
     if(rHint.GetId() == SfxHintId::StyleSheetModified || rHint.GetId() == SfxHintId::StyleSheetModifiedExtended)
     {
         if(!mbIsInStyleCreate)
-            ScCondFormatHelper::UpdateStyleList(*mxLbStyle, mpDoc);
+            ScCondFormatHelper::UpdateStyleList(*mxLbStyle, mrDoc);
     }
 }
 
 ScFormatEntry* ScDateFrmtEntry::GetEntry() const
 {
-    ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
+    ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(&mrDoc);
     condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(mxLbDateEntry->get_active());
     pNewEntry->SetDateType(eType);
     pNewEntry->SetStyleName(mxLbStyle->get_active_text());
@@ -1195,7 +1195,7 @@ OUString ScDateFrmtEntry::GetExpressionString()
 IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl, weld::ComboBox&, void )
 {
     mbIsInStyleCreate = true;
-    ScCondFormatHelper::StyleSelect(mpParent->GetFrameWeld(), *mxLbStyle, mpDoc, maWdPreview);
+    ScCondFormatHelper::StyleSelect(mpParent->GetFrameWeld(), *mxLbStyle, mrDoc, maWdPreview);
     mbIsInStyleCreate = false;
 }
 
@@ -1212,7 +1212,7 @@ private:
     weld::Container* mpContainer;
 
 public:
-    ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconSetType eType, const ScDocument* pDoc,
+    ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconSetType eType, const ScDocument& rDoc,
             sal_Int32 i, const ScColorScaleEntry* pEntry = nullptr);
     ~ScIconSetFrmtDataEntry();
     void Show() { mxGrid->show(); }
@@ -1228,7 +1228,7 @@ public:
     void SetFirstEntry();
 };
 
-ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconSetType eType, const ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry)
+ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconSetType eType, const ScDocument& rDoc, sal_Int32 i, const ScColorScaleEntry* pEntry)
     : mxBuilder(Application::CreateBuilder(pParent, u"modules/scalc/ui/conditionaliconset.ui"_ustr))
     , mxGrid(mxBuilder->weld_container(u"ConditionalIconSet"_ustr))
     , mxImgIcon(mxBuilder->weld_image(u"icon"_ustr))
@@ -1247,15 +1247,15 @@ ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry(weld::Container* pParent, ScIconS
         {
             case COLORSCALE_VALUE:
                 mxLbEntryType->set_active(0);
-                mxEdEntry->set_text(convertNumberToString(pEntry->GetValue(), pDoc));
+                mxEdEntry->set_text(convertNumberToString(pEntry->GetValue(), rDoc));
                 break;
             case COLORSCALE_PERCENTILE:
                 mxLbEntryType->set_active(2);
-                mxEdEntry->set_text(convertNumberToString(pEntry->GetValue(), pDoc));
+                mxEdEntry->set_text(convertNumberToString(pEntry->GetValue(), rDoc));
                 break;
             case COLORSCALE_PERCENT:
                 mxLbEntryType->set_active(1);
-                mxEdEntry->set_text(convertNumberToString(pEntry->GetValue(), pDoc));
+                mxEdEntry->set_text(convertNumberToString(pEntry->GetValue(), rDoc));
                 break;
             case COLORSCALE_FORMULA:
                 mxLbEntryType->set_active(3);
@@ -1319,8 +1319,8 @@ void ScIconSetFrmtDataEntry::SetFirstEntry()
     mxLbEntryType->set_active(1);
 }
 
-ScIconSetFrmtEntry::ScIconSetFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat)
-    : ScCondFrmtEntry(pParent, pDoc, rPos)
+ScIconSetFrmtEntry::ScIconSetFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat)
+    : ScCondFrmtEntry(pParent, rDoc, rPos)
     , mxLbColorFormat(mxBuilder->weld_combo_box(u"colorformat"_ustr))
     , mxLbIconSetType(mxBuilder->weld_combo_box(u"iconsettype"_ustr))
     , mxIconParent(mxBuilder->weld_container(u"iconparent"_ustr))
@@ -1342,7 +1342,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry(ScCondFormatList* pParent, ScDocument* pD
                 i < n; ++i)
         {
             maEntries.emplace_back(new ScIconSetFrmtDataEntry(
-                mxIconParent.get(), eType, pDoc, i, pIconSetFormatData->m_Entries[i].get()));
+                mxIconParent.get(), eType, rDoc, i, pIconSetFormatData->m_Entries[i].get()));
             maEntries[i]->set_grid_top_attach(i);
         }
         maEntries[0]->SetFirstEntry();
@@ -1375,7 +1375,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl, weld::ComboBox&, void )
 
     for(size_t i = 0; i < nElements; ++i)
     {
-        maEntries.emplace_back(new ScIconSetFrmtDataEntry(mxIconParent.get(), static_cast<ScIconSetType>(nPos), mpDoc, i));
+        maEntries.emplace_back(new ScIconSetFrmtDataEntry(mxIconParent.get(), static_cast<ScIconSetType>(nPos), mrDoc, i));
         maEntries[i]->set_grid_top_attach(i);
         maEntries[i]->Show();
     }
@@ -1413,13 +1413,13 @@ void ScIconSetFrmtEntry::SetInactive()
 
 ScFormatEntry* ScIconSetFrmtEntry::GetEntry() const
 {
-    ScIconSetFormat* pFormat = new ScIconSetFormat(mpDoc);
+    ScIconSetFormat* pFormat = new ScIconSetFormat(&mrDoc);
 
     ScIconSetFormatData* pData = new ScIconSetFormatData;
     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(mrDoc, maPos));
     }
     pFormat->SetIconSetData(pData);
 
diff --git a/sc/source/ui/condformat/condformateasydlg.cxx b/sc/source/ui/condformat/condformateasydlg.cxx
index fe473ce80b96..677d10c3b9d5 100644
--- a/sc/source/ui/condformat/condformateasydlg.cxx
+++ b/sc/source/ui/condformat/condformateasydlg.cxx
@@ -71,7 +71,7 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
                             u"CondFormatEasyDlg"_ustr)
     , mpParent(pParent)
     , mpViewData(pViewData)
-    , mpDocument(&mpViewData->GetDocument())
+    , mrDocument(mpViewData->GetDocument())
     , mbIsManaged(false)
     , mnFormatKey(0)
     , mnEntryIndex(0)
@@ -264,7 +264,7 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
     ScRangeList aRange;
     mpViewData->GetMarkData().FillRangeListWithMarks(&aRange, false);
     ScConditionalFormat* format
-        = mpDocument->GetCondFormList(mpViewData->GetTabNo())->GetFormat(mnFormatKey);
+        = mrDocument.GetCondFormList(mpViewData->GetTabNo())->GetFormat(mnFormatKey);
     if (aRange.empty() && mnFormatKey != -1 && mnEntryIndex != -1)
     {
         aRange = format->GetRangeList();
@@ -280,7 +280,7 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
     maPosition.SetTab(mpViewData->GetTabNo());
 
     OUString sRangeString;
-    aRange.Format(sRangeString, ScRefFlags::VALID, *mpDocument, mpDocument->GetAddressConvention());
+    aRange.Format(sRangeString, ScRefFlags::VALID, mrDocument, mrDocument.GetAddressConvention());
     mxRangeEntry->SetText(sRangeString);
 
     OUString sStyleName;
@@ -307,8 +307,8 @@ ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
         }
     }
 
-    StartListening(*mpDocument->GetStyleSheetPool(), DuplicateHandling::Prevent);
-    ScCondFormatHelper::FillStyleListBox(mpDocument, *mxStyles);
+    StartListening(*mrDocument.GetStyleSheetPool(), DuplicateHandling::Prevent);
+    ScCondFormatHelper::FillStyleListBox(mrDocument, *mxStyles);
 
     mxStyles->set_active_text(sStyleName);
     StyleSelectHdl(*mxStyles);
@@ -328,7 +328,7 @@ void ConditionalFormatEasyDialog::Notify(SfxBroadcaster&, const SfxHint& rHint)
 {
     if (rHint.GetId() == SfxHintId::StyleSheetModified
         || rHint.GetId() == SfxHintId::StyleSheetModifiedExtended)
-        ScCondFormatHelper::UpdateStyleList(*mxStyles, mpDocument);
+        ScCondFormatHelper::UpdateStyleList(*mxStyles, mrDocument);
 }
 
 void ConditionalFormatEasyDialog::SetReference(const ScRange& rRange, ScDocument&)
@@ -340,7 +340,7 @@ void ConditionalFormatEasyDialog::SetReference(const ScRange& rRange, ScDocument
     ScRefFlags nFlags = ScRefFlags::RANGE_ABS;
     const ScDocument& rDoc = mpViewData->GetDocument();
     OUString sRange(
-        rRange.Format(rDoc, nFlags, ScAddress::Details(mpDocument->GetAddressConvention(), 0, 0)));
+        rRange.Format(rDoc, nFlags, ScAddress::Details(mrDocument.GetAddressConvention(), 0, 0)));
     pEdit->SetRefString(sRange);
     maPosition = rRange.aStart;
 }
@@ -361,11 +361,11 @@ IMPL_LINK(ConditionalFormatEasyDialog, ButtonPressed, weld::Button&, rButton, vo
     if (&rButton == mxButtonOk.get())
     {
         if (mnEntryIndex != -1 && mnFormatKey != -1) // isEdit
-            mpDocument->GetCondFormList(maPosition.Tab())
+            mrDocument.GetCondFormList(maPosition.Tab())
                 ->GetFormat(mnFormatKey)
                 ->RemoveEntry(mnEntryIndex);
 
-        std::unique_ptr<ScConditionalFormat> pFormat(new ScConditionalFormat(0, mpDocument));
+        std::unique_ptr<ScConditionalFormat> pFormat(new ScConditionalFormat(0, &mrDocument));
 
         OUString sExpression1 = (mxNumberEntry->get_visible() && mxAllInputs->get_visible()
                                      ? mxNumberEntry->get_text()
@@ -390,20 +390,20 @@ IMPL_LINK(ConditionalFormatEasyDialog, ButtonPressed, weld::Button&, rButton, vo
         std::unique_ptr<ScFormatEntry> xEntry;
         if (meMode < ScConditionMode::Formula)
         {
-            xEntry.reset(new ScCondFormatEntry(meMode, sExpression1, sExpression2, *mpDocument,
+            xEntry.reset(new ScCondFormatEntry(meMode, sExpression1, sExpression2, mrDocument,
                                                maPosition, mxStyles->get_active_text()));
         }
         else if (meMode >= ScConditionMode::Today && meMode < ScConditionMode::NONE)
         {
-            ScCondDateFormatEntry entry(mpDocument);
+            ScCondDateFormatEntry entry(&mrDocument);
             entry.SetDateType(GetScCondFormatDateType(meMode));
             entry.SetStyleName(mxStyles->get_active_text());
-            xEntry.reset(new ScCondDateFormatEntry(mpDocument, entry));
+            xEntry.reset(new ScCondDateFormatEntry(&mrDocument, entry));
         }
         else if (meMode == ScConditionMode::Formula)
         {
             xEntry.reset(new ScCondFormatEntry(ScConditionMode::Direct, msFormula, OUString(),
-                                               *mpDocument, maPosition,
+                                               mrDocument, maPosition,
                                                mxStyles->get_active_text()));
         }
         else
@@ -432,12 +432,12 @@ IMPL_LINK(ConditionalFormatEasyDialog, ButtonPressed, weld::Button&, rButton, vo
 
 IMPL_LINK_NOARG(ConditionalFormatEasyDialog, StyleSelectHdl, weld::ComboBox&, void)
 {
-    ScCondFormatHelper::StyleSelect(mpParent, *mxStyles, &(mpViewData->GetDocument()), maWdPreview);
+    ScCondFormatHelper::StyleSelect(mpParent, *mxStyles, mpViewData->GetDocument(), maWdPreview);
 }
 
 IMPL_LINK(ConditionalFormatEasyDialog, OnEdChanged, weld::Entry&, rEntry, void)
 {
-    ScCondFormatHelper::ValidateInputField(rEntry, *mxWarningLabel, mpDocument, maPosition);
+    ScCondFormatHelper::ValidateInputField(rEntry, *mxWarningLabel, mrDocument, maPosition);
 
     if (!mxWarningLabel->get_label().isEmpty())
         mxWarningLabel->show();
diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx
index 876facef4dc8..39e183278666 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -231,7 +231,7 @@ OUString ScCondFormatHelper::GetExpression( ScCondFormatEntryType eType, sal_Int
 }
 
 void ScCondFormatHelper::StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle,
-                                     const ScDocument* pDoc, SvxFontPrevWindow& rWdPreview)
+                                     const ScDocument& rDoc, SvxFontPrevWindow& rWdPreview)
 {
     if (rLbStyle.get_active() == 0)
     {
@@ -260,7 +260,7 @@ void ScCondFormatHelper::StyleSelect(weld::Window* pDialogParent, weld::ComboBox
                     pDisp->Lock(true);
 
                 // Find the new style and add it into the style list boxes
-                SfxStyleSheetIterator aStyleIter(pDoc->GetStyleSheetPool(), SfxStyleFamily::Para);
+                SfxStyleSheetIterator aStyleIter(rDoc.GetStyleSheetPool(), SfxStyleFamily::Para);
                 bool bFound = false;
                 for (SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle && !bFound;
                      pStyle = aStyleIter.Next())
@@ -293,7 +293,7 @@ void ScCondFormatHelper::StyleSelect(weld::Window* pDialogParent, weld::ComboBox
 
     OUString aStyleName = rLbStyle.get_active_text();
     SfxStyleSheetBase* pStyleSheet
-        = pDoc->GetStyleSheetPool()->Find(aStyleName, SfxStyleFamily::Para);
+        = rDoc.GetStyleSheetPool()->Find(aStyleName, SfxStyleFamily::Para);
     if (pStyleSheet)
     {
         const SfxItemSet& rSet = pStyleSheet->GetItemSet();
@@ -301,10 +301,10 @@ void ScCondFormatHelper::StyleSelect(weld::Window* pDialogParent, weld::ComboBox
     }
 }
 
-void ScCondFormatHelper::FillStyleListBox(const ScDocument* pDocument, weld::ComboBox& rCombo)
+void ScCondFormatHelper::FillStyleListBox(const ScDocument& rDocument, weld::ComboBox& rCombo)
 {
     std::set<OUString> aStyleNames;
-    SfxStyleSheetIterator aStyleIter(pDocument->GetStyleSheetPool(), SfxStyleFamily::Para);
+    SfxStyleSheetIterator aStyleIter(rDocument.GetStyleSheetPool(), SfxStyleFamily::Para);
     for (SfxStyleSheetBase* pStyle = aStyleIter.First(); pStyle; pStyle = aStyleIter.Next())
     {
         aStyleNames.insert(pStyle->GetName());
@@ -315,16 +315,16 @@ void ScCondFormatHelper::FillStyleListBox(const ScDocument* pDocument, weld::Com
     }
 }
 
-void ScCondFormatHelper::UpdateStyleList(weld::ComboBox& rLbStyle, const ScDocument* pDoc)
+void ScCondFormatHelper::UpdateStyleList(weld::ComboBox& rLbStyle, const ScDocument& rDoc)
 {
     OUString aSelectedStyle = rLbStyle.get_active_text();
     for (sal_Int32 i = rLbStyle.get_count(); i > 1; --i)
         rLbStyle.remove(i - 1);
-    ScCondFormatHelper::FillStyleListBox(pDoc, rLbStyle);
+    ScCondFormatHelper::FillStyleListBox(rDoc, rLbStyle);
     rLbStyle.set_active_text(aSelectedStyle);
 }
 
-void ScCondFormatHelper::ValidateInputField(weld::Entry& rEntry, weld::Label& rLabel, ScDocument* pDoc, ScAddress& rPos)
+void ScCondFormatHelper::ValidateInputField(weld::Entry& rEntry, weld::Label& rLabel, ScDocument& rDoc, ScAddress& rPos)
 {
     OUString aFormula = rEntry.get_text();
 
@@ -334,7 +334,7 @@ void ScCondFormatHelper::ValidateInputField(weld::Entry& rEntry, weld::Label& rL
         return;
     }
 
-    ScCompiler aComp( *pDoc, rPos, pDoc->GetGrammar() );
+    ScCompiler aComp( rDoc, rPos, rDoc.GetGrammar() );
     aComp.SetExtendedErrorDetection( ScCompiler::ExtendedErrorDetection::EXTENDED_ERROR_DETECTION_NAME_BREAK);
     std::unique_ptr<ScTokenArray> ta(aComp.CompileString(aFormula));
 
diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx
index c30e4c80fa75..5865527e3dc2 100644
--- a/sc/source/ui/inc/colorformat.hxx
+++ b/sc/source/ui/inc/colorformat.hxx
@@ -23,7 +23,7 @@ private:
     OUString maStrWarnSameValue;
     SvNumberFormatter* mpNumberFormatter;
 
-    ScDocument* mpDoc;
+    ScDocument& mrDoc;
     ScAddress maPos;
 
     std::unique_ptr<weld::Button> mxBtnOk;
@@ -53,7 +53,7 @@ private:
     void Init();
 
 public:
-    ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc,
+    ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument& rDoc,
                          const ScAddress& rPos);
     virtual ~ScDataBarSettingsDlg() override;
 
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 4b2b4cfb4c11..1946196b5028 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -38,19 +38,20 @@ private:
     bool mbFrozen;
     bool mbNewEntry;
 
-    ScDocument* mpDoc;
+    ScDocument& mrDoc;
     ScAddress maPos;
     ScRangeList maRanges;
     ScCondFormatDlg* mpDialogParent;
 
 public:
     ScCondFormatList(ScCondFormatDlg* pParent,
+                     ScDocument& rDoc,
                      std::unique_ptr<weld::ScrolledWindow> xWindow,
                      std::unique_ptr<weld::Container> xGrid);
     weld::Container* GetContainer() { return mxGrid.get(); }
     ~ScCondFormatList();
 
-    void init(ScDocument& rDoc, const ScConditionalFormat* pFormat,
+    void init(const ScConditionalFormat* pFormat,
         const ScRangeList& rRanges, const ScAddress& rPos,
         condformat::dialog::ScCondFormatDialogType eType);
 
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 6f024643d4b3..05cb252e9b68 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -61,7 +61,7 @@ private:
 protected:
     std::unique_ptr<weld::ComboBox> mxLbType;
 
-    ScDocument* mpDoc;
+    ScDocument& mrDoc;
     ScAddress maPos;
 
     virtual void Select();
@@ -70,7 +70,7 @@ protected:
     virtual OUString GetExpressionString() = 0;
 
 public:
-    ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos);
+    ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos);
     virtual ~ScCondFrmtEntry();
 
     void Show() { mxGrid->show(); }
@@ -127,7 +127,7 @@ protected:
     virtual void Deselect() override;
 
 public:
-    ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
+    ScConditionFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, ScCondFormatDlg* pDialogParent,
             const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = nullptr);
     virtual ~ScConditionFrmtEntry() override;
 
@@ -156,7 +156,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry
     DECL_LINK(StyleSelectHdl, weld::ComboBox&, void);
 
 public:
-    ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = nullptr);
+    ScFormulaFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = nullptr);
     virtual ~ScFormulaFrmtEntry() override;
 
     virtual ScFormatEntry* GetEntry() const override;
@@ -191,7 +191,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry
 
     DECL_LINK( EntryTypeHdl, weld::ComboBox&, void );
 public:
-    ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr);
+    ScColorScale2FrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr);
     virtual ~ScColorScale2FrmtEntry() override;
     virtual ScFormatEntry* GetEntry() const override;
     virtual void SetActive() override;
@@ -228,7 +228,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry
 
     DECL_LINK( EntryTypeHdl, weld::ComboBox&, void );
 public:
-    ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr);
+    ScColorScale3FrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr);
     virtual ~ScColorScale3FrmtEntry() override;
     virtual ScFormatEntry* GetEntry() const override;
     virtual void SetActive() override;
@@ -261,7 +261,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry
     DECL_LINK( OptionBtnHdl, weld::Button&, void );
     DECL_LINK( DataBarTypeSelectHdl, weld::ComboBox&, void );
 public:
-    ScDataBarFrmtEntry(ScCondFormatList* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = nullptr);
+    ScDataBarFrmtEntry(ScCondFormatList* pParemt, ScDocument& rDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = nullptr);
     virtual ~ScDataBarFrmtEntry() override;
     virtual ScFormatEntry* GetEntry() const override;
     virtual void SetActive() override;
@@ -273,7 +273,7 @@ public:
 class ScDateFrmtEntry : public ScCondFrmtEntry, public SfxListener
 {
 public:
-    ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = nullptr);
+    ScDateFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScCondDateFormatEntry* pFormat = nullptr);
     virtual ~ScDateFrmtEntry() override;
     virtual ScFormatEntry* GetEntry() const override;
     virtual void SetActive() override;
@@ -320,7 +320,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry
     DECL_LINK(IconSetTypeHdl, weld::ComboBox&, void);
 
 public:
-    ScIconSetFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = nullptr);
+    ScIconSetFrmtEntry(ScCondFormatList* pParent, ScDocument& rDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = nullptr);
     virtual ~ScIconSetFrmtEntry() override;
     virtual ScFormatEntry* GetEntry() const override;
     virtual void SetActive() override;
diff --git a/sc/source/ui/inc/condformateasydlg.hxx b/sc/source/ui/inc/condformateasydlg.hxx
index 8bc21215b178..6dfa19c37752 100644
--- a/sc/source/ui/inc/condformateasydlg.hxx
+++ b/sc/source/ui/inc/condformateasydlg.hxx
@@ -41,7 +41,7 @@ private:
 
     weld::Window* mpParent;
     ScViewData* mpViewData;
-    ScDocument* mpDocument;
+    ScDocument& mrDocument;
     ScConditionMode meMode;
     bool mbIsManaged;
     OUString msFormula;
diff --git a/sc/source/ui/inc/condformathelper.hxx b/sc/source/ui/inc/condformathelper.hxx
index f3bd7b2a2013..1098b56e4663 100644
--- a/sc/source/ui/inc/condformathelper.hxx
+++ b/sc/source/ui/inc/condformathelper.hxx
@@ -35,10 +35,10 @@ public:
     static SC_DLLPUBLIC OUString GetExpression( ScCondFormatEntryType eType, sal_Int32 nIndex,
             std::u16string_view aStr1 = std::u16string_view(), std::u16string_view aStr2 = std::u16string_view() );
     static SC_DLLPUBLIC void StyleSelect(weld::Window* pDialogParent, weld::ComboBox& rLbStyle,
-                                         const ScDocument* pDoc, SvxFontPrevWindow& rWdPreview);
-    static SC_DLLPUBLIC void FillStyleListBox(const ScDocument* pDocument, weld::ComboBox& rCombo);
-    static SC_DLLPUBLIC void UpdateStyleList(weld::ComboBox& rLbStyle, const ScDocument* pDoc);
-    static SC_DLLPUBLIC void ValidateInputField(weld::Entry& rEntry, weld::Label& label, ScDocument* pDoc, ScAddress& rPos);
+                                         const ScDocument& rDoc, SvxFontPrevWindow& rWdPreview);
+    static SC_DLLPUBLIC void FillStyleListBox(const ScDocument& rDocument, weld::ComboBox& rCombo);
+    static SC_DLLPUBLIC void UpdateStyleList(weld::ComboBox& rLbStyle, const ScDocument& rDoc);
+    static SC_DLLPUBLIC void ValidateInputField(weld::Entry& rEntry, weld::Label& label, ScDocument& rDoc, ScAddress& rPos);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */