sc/source/ui/condformat/condformateasydlg.cxx | 20 ++++++++++----------
sc/source/ui/inc/condformateasydlg.hxx | 4 ++--
sc/source/ui/view/tabvwshc.cxx | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 138f0a92f8c5ed300248b37fbff2a07e31596825
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Apr 25 16:27:04 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 25 21:29:46 2025 +0200
ConditionalFormatEasyDialog: pass ScViewData by ref
Change-Id: I38db0341403c0e2fbf147d57dfbe956938e7f8de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184628
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/ui/condformat/condformateasydlg.cxx
b/sc/source/ui/condformat/condformateasydlg.cxx
index 71ae8745df53..c98c0201487c 100644
--- a/sc/source/ui/condformat/condformateasydlg.cxx
+++ b/sc/source/ui/condformat/condformateasydlg.cxx
@@ -52,12 +52,12 @@ void
ConditionalFormatEasyDialog::SetDescription(std::u16string_view rCondition)
ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings*
pBindings,
SfxChildWindow*
pChildWindow,
weld::Window* pParent,
- ScViewData* pViewData)
+ ScViewData& rViewData)
: ScAnyRefDlgController(pBindings, pChildWindow, pParent,
u"modules/scalc/ui/conditionaleasydialog.ui"_ustr,
u"CondFormatEasyDlg"_ustr)
- , mpViewData(pViewData)
- , mrDocument(mpViewData->GetDocument())
+ , mrViewData(rViewData)
+ , mrDocument(mrViewData.GetDocument())
, mxNumberEntry(m_xBuilder->weld_entry(u"entryNumber"_ustr))
, mxNumberEntry2(m_xBuilder->weld_entry(u"entryNumber2"_ustr))
, mxAllInputs(m_xBuilder->weld_container(u"allInputs"_ustr))
@@ -70,7 +70,7 @@
ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
{
mxButtonRangeEdit->SetReferences(this, mxRangeEntry.get());
const ScConditionMode* pCurrentMode
- = pViewData->GetDocument().GetEasyConditionalFormatDialogData();
+ = rViewData.GetDocument().GetEasyConditionalFormatDialogData();
if (!pCurrentMode)
{
SAL_WARN(
@@ -179,10 +179,10 @@
ConditionalFormatEasyDialog::ConditionalFormatEasyDialog(SfxBindings* pBindings,
mxButtonCancel->connect_clicked(LINK(this, ConditionalFormatEasyDialog,
ButtonPressed));
ScRangeList aRange;
- mpViewData->GetMarkData().FillRangeListWithMarks(&aRange, false);
+ mrViewData.GetMarkData().FillRangeListWithMarks(&aRange, false);
if (aRange.empty())
{
- ScAddress aPosition(mpViewData->GetCurX(), mpViewData->GetCurY(),
mpViewData->GetTabNo());
+ ScAddress aPosition(mrViewData.GetCurX(), mrViewData.GetCurY(),
mrViewData.GetTabNo());
aRange.push_back(ScRange(aPosition));
}
maPosition = aRange.GetTopLeftCorner();
@@ -213,7 +213,7 @@ void ConditionalFormatEasyDialog::SetReference(const
ScRange& rRange, ScDocument
RefInputStart(pEdit);
ScRefFlags nFlags = ScRefFlags::RANGE_ABS;
- const ScDocument& rDoc = mpViewData->GetDocument();
+ const ScDocument& rDoc = mrViewData.GetDocument();
OUString sRange(
rRange.Format(rDoc, nFlags,
ScAddress::Details(mrDocument.GetAddressConvention(), 0, 0)));
pEdit->SetRefString(sRange);
@@ -263,14 +263,14 @@ IMPL_LINK(ConditionalFormatEasyDialog, ButtonPressed,
weld::Button&, rButton, vo
ScRangeList aRange;
ScRefFlags nFlags
- = aRange.Parse(mxRangeEntry->GetText(), mpViewData->GetDocument(),
- mpViewData->GetDocument().GetAddressConvention(),
maPosition.Tab());
+ = aRange.Parse(mxRangeEntry->GetText(), mrViewData.GetDocument(),
+ mrViewData.GetDocument().GetAddressConvention(),
maPosition.Tab());
if ((nFlags & ScRefFlags::VALID) && !aRange.empty())
{
pFormat->AddEntry(pEntry.release());
pFormat->SetRange(aRange);
auto& rRangeList = pFormat->GetRange();
- mpViewData->GetDocShell()->GetDocFunc().ReplaceConditionalFormat(
+ mrViewData.GetDocShell()->GetDocFunc().ReplaceConditionalFormat(
0, std::move(pFormat), maPosition.Tab(), rRangeList);
}
m_xDialog->response(RET_OK);
diff --git a/sc/source/ui/inc/condformateasydlg.hxx
b/sc/source/ui/inc/condformateasydlg.hxx
index 933d2e51e207..8ec5625d8bdc 100644
--- a/sc/source/ui/inc/condformateasydlg.hxx
+++ b/sc/source/ui/inc/condformateasydlg.hxx
@@ -22,7 +22,7 @@ namespace sc
class ConditionalFormatEasyDialog : public ScAnyRefDlgController, public
SfxListener
{
public:
- ConditionalFormatEasyDialog(SfxBindings*, SfxChildWindow*, weld::Window*,
ScViewData*);
+ ConditionalFormatEasyDialog(SfxBindings*, SfxChildWindow*, weld::Window*,
ScViewData&);
virtual ~ConditionalFormatEasyDialog() override;
virtual void SetReference(const ScRange&, ScDocument&) override;
@@ -36,7 +36,7 @@ public:
private:
void SetDescription(std::u16string_view rCondition);
- ScViewData* mpViewData;
+ ScViewData& mrViewData;
ScDocument& mrDocument;
ScConditionMode meMode;
ScAddress maPosition;
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index c15ab6c4a2c0..e95fa932178d 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -327,7 +327,7 @@ std::shared_ptr<SfxModelessDialogController>
ScTabViewShell::CreateRefDialogCont
}
case SID_EASY_CONDITIONAL_FORMAT_DIALOG:
{
- xResult = std::make_shared<sc::ConditionalFormatEasyDialog>(pB,
pCW, pParent, &GetViewData());
+ xResult = std::make_shared<sc::ConditionalFormatEasyDialog>(pB,
pCW, pParent, GetViewData());
break;
}
case SID_FILTER:
