sc/source/ui/condformat/condformatdlg.cxx | 34 +++++-----
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 12 +--
sc/source/ui/inc/PivotLayoutDialog.hxx | 4 -
sc/source/ui/inc/condformatdlg.hxx | 4 -
sc/source/ui/inc/tabcont.hxx | 4 -
sc/source/ui/inc/tabsplit.hxx | 4 -
sc/source/ui/view/tabcont.cxx | 94 +++++++++++++++---------------
sc/source/ui/view/tabsplit.cxx | 8 +-
sc/source/ui/view/tabview5.cxx | 6 -
sc/source/ui/view/tabvwshc.cxx | 4 -
10 files changed, 87 insertions(+), 87 deletions(-)
New commits:
commit 21b025b0cb8614a86a3d3a7fd3ffdfff4e1fa0eb
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Apr 25 14:28:33 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 25 16:20:08 2025 +0200
sc: pass ScViewData by ref in some places
it's always non-null.
Change-Id: I0ac888c6d4e40a9de59c8b6136dd3be8c3ec3770
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184624
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 3d0a2ddc0c72..bb5dbc325335 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -421,12 +421,12 @@ static bool isLOKMobilePhone()
}
ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
- weld::Window* pParent, ScViewData* pViewData,
+ weld::Window* pParent, ScViewData& rViewData,
const std::shared_ptr<ScCondFormatDlgData>& rItem)
: ScAnyRefDlgController(pB, pCW, pParent,
isLOKMobilePhone()?u"modules/scalc/ui/conditionalformatdialogmobile.ui"_ustr:u"modules/scalc/ui/conditionalformatdialog.ui"_ustr,
u"ConditionalFormatDialog"_ustr)
- , mpViewData(pViewData)
+ , mrViewData(rViewData)
// previous version based on SfxPoolItem used SfxPoolItem::Clone here, so
make a copy
// using copy constructor
, mpDlgData(std::make_shared<ScCondFormatDlgData>(*rItem))
@@ -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, mpViewData->GetDocument(),
m_xBuilder->weld_scrolled_window(u"listwindow"_ustr),
+ , mxCondFormList(new ScCondFormatList(this, mrViewData.GetDocument(),
m_xBuilder->weld_scrolled_window(u"listwindow"_ustr),
m_xBuilder->weld_grid(u"list"_ustr)))
{
mxEdRange->SetReferences(this, mxFtRange.get());
@@ -454,8 +454,8 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB,
SfxChildWindow* pCW,
}
else if (!mpDlgData->IsManaged())
{
- ScDocument& rDoc = mpViewData->GetDocument();
- pFormat = rDoc.GetCondFormList(mpViewData->GetTabNo())->GetFormat (
mnKey );
+ ScDocument& rDoc = mrViewData.GetDocument();
+ pFormat = rDoc.GetCondFormList(mrViewData.GetTabNo())->GetFormat (
mnKey );
}
ScRangeList aRange;
@@ -466,10 +466,10 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB,
SfxChildWindow* pCW,
else
{
// this is for adding a new entry
- mpViewData->GetMarkData().FillRangeListWithMarks(&aRange, false);
+ mrViewData.GetMarkData().FillRangeListWithMarks(&aRange, false);
if(aRange.empty())
{
- ScAddress aPos(mpViewData->GetCurX(), mpViewData->GetCurY(),
mpViewData->GetTabNo());
+ ScAddress aPos(mrViewData.GetCurX(), mrViewData.GetCurY(),
mrViewData.GetTabNo());
aRange.push_back(ScRange(aPos));
}
mnKey = 0;
@@ -488,7 +488,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB,
SfxChildWindow* pCW,
mxEdRange->SetGetFocusHdl( LINK( this, ScCondFormatDlg, RangeGetFocusHdl )
);
OUString aRangeString;
- const ScDocument& rDoc = pViewData->GetDocument();
+ const ScDocument& rDoc = rViewData.GetDocument();
aRange.Format(aRangeString, ScRefFlags::VALID, rDoc,
rDoc.GetAddressConvention());
mxEdRange->SetText(aRangeString);
@@ -561,7 +561,7 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef,
ScDocument&)
else
nFlags = ScRefFlags::RANGE_ABS;
- const ScDocument& rDoc = mpViewData->GetDocument();
+ const ScDocument& rDoc = mrViewData.GetDocument();
OUString aRefStr(rRef.Format(rDoc, nFlags,
ScAddress::Details(rDoc.GetAddressConvention(), 0, 0)));
if (pEdit != mxEdRange.get())
@@ -584,8 +584,8 @@ std::unique_ptr<ScConditionalFormat>
ScCondFormatDlg::GetConditionalFormat() con
return nullptr;
ScRangeList aRange;
- ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(),
- mpViewData->GetDocument().GetAddressConvention(), maPos.Tab());
+ ScRefFlags nFlags = aRange.Parse(aRangeStr, mrViewData.GetDocument(),
+ mrViewData.GetDocument().GetAddressConvention(), maPos.Tab());
mxCondFormList->SetRange(aRange);
std::unique_ptr<ScConditionalFormat> pFormat =
mxCondFormList->GetConditionalFormat();
@@ -620,11 +620,11 @@ void ScCondFormatDlg::OkPressed()
if(pFormat)
{
auto& rRangeList = pFormat->GetRange();
-
mpViewData->GetDocShell()->GetDocFunc().ReplaceConditionalFormat(mnKey,
+
mrViewData.GetDocShell()->GetDocFunc().ReplaceConditionalFormat(mnKey,
std::move(pFormat), maPos.Tab(), rRangeList);
}
else
-
mpViewData->GetDocShell()->GetDocFunc().ReplaceConditionalFormat(mnKey,
+
mrViewData.GetDocShell()->GetDocFunc().ReplaceConditionalFormat(mnKey,
nullptr, maPos.Tab(), ScRangeList());
}
else
@@ -644,7 +644,7 @@ void ScCondFormatDlg::OkPressed()
}
// provide needed DialogData
- mpViewData->GetViewShell()->setScCondFormatDlgData(mpDlgData);
+ mrViewData.GetViewShell()->setScCondFormatDlgData(mpDlgData);
SetDispatcherLock( false );
// Queue message to open Conditional Format Manager Dialog
@@ -661,7 +661,7 @@ void ScCondFormatDlg::CancelPressed()
if ( mpDlgData->IsManaged() )
{
// provide needed DialogData
- mpViewData->GetViewShell()->setScCondFormatDlgData(mpDlgData);
+ mrViewData.GetViewShell()->setScCondFormatDlgData(mpDlgData);
SetDispatcherLock( false );
// Queue message to open Conditional Format Manager Dialog
@@ -689,8 +689,8 @@ IMPL_LINK(ScCondFormatDlg, EdRangeModifyHdl,
formula::RefEdit&, rEdit, void)
{
OUString aRangeStr = rEdit.GetText();
ScRangeList aRange;
- ScRefFlags nFlags = aRange.Parse(aRangeStr, mpViewData->GetDocument(),
- mpViewData->GetDocument().GetAddressConvention());
+ ScRefFlags nFlags = aRange.Parse(aRangeStr, mrViewData.GetDocument(),
+ mrViewData.GetDocument().GetAddressConvention());
if(nFlags & ScRefFlags::VALID)
{
rEdit.GetWidget()->set_message_type(weld::EntryMessageType::Normal);
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 675eb9313c95..d91343f925f9 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -71,12 +71,12 @@ ScRange lclGetRangeForNamedRange(OUString const & aName,
const ScDocument& rDocu
ScPivotLayoutDialog::ScPivotLayoutDialog(
SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow, weld::Window* pParent,
- ScViewData* pViewData, const ScDPObject*
pPivotTableObject, bool bNewPivotTable)
+ ScViewData& rViewData, const ScDPObject*
pPivotTableObject, bool bNewPivotTable)
: ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent,
u"modules/scalc/ui/pivottablelayoutdialog.ui"_ustr, u"PivotTableLayout"_ustr)
, maPivotTableObject(*pPivotTableObject)
, mpPreviouslyFocusedListBox(nullptr)
- , mpViewData(pViewData)
- , mrDocument(pViewData->GetDocument())
+ , mrViewData(rViewData)
+ , mrDocument(rViewData.GetDocument())
, mbNewPivotTable(bNewPivotTable)
, maAddressDetails(mrDocument.GetAddressConvention(), 0, 0)
, mbDialogLostFocus(false)
@@ -481,7 +481,7 @@ void ScPivotLayoutDialog::ApplyChanges()
sal_uInt16 nWhichPivot =
ScModule::get()->GetPool().GetWhichIDFromSlotID(SID_PIVOT_TABLE);
ScPivotItem aPivotItem(nWhichPivot, &aSaveData, &aDestinationRange,
bToNewSheet);
-
mpViewData->GetViewShell()->SetDialogDPObject(std::make_unique<ScDPObject>(maPivotTableObject));
+
mrViewData.GetViewShell()->SetDialogDPObject(std::make_unique<ScDPObject>(maPivotTableObject));
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
@@ -506,9 +506,9 @@ void ScPivotLayoutDialog::ApplyChanges()
}
if (pDPObj)
{
- ScDBDocFunc aFunc( *(mpViewData->GetDocShell() ));
+ ScDBDocFunc aFunc( *(mrViewData.GetDocShell() ));
aFunc.RemovePivotTable( *pDPObj, true, false);
- mpViewData->GetView()->CursorPosChanged();
+ mrViewData.GetView()->CursorPosChanged();
}
}
return;
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index c2923ce34ae2..d995e3bfb13a 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -39,7 +39,7 @@ public:
ScPivotLayoutTreeListBase* mpPreviouslyFocusedListBox;
private:
- ScViewData* mpViewData;
+ ScViewData& mrViewData;
ScDocument& mrDocument;
bool mbNewPivotTable;
@@ -114,7 +114,7 @@ private:
public:
ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow*
pChildWindow, weld::Window* pParent,
- ScViewData* pViewData, const ScDPObject*
pPivotTableObject, bool bCreateNewPivotTable);
+ ScViewData& rViewData, const ScDPObject*
pPivotTableObject, bool bCreateNewPivotTable);
virtual ~ScPivotLayoutDialog() override;
virtual void SetReference(const ScRange& rReferenceRange, ScDocument&
rDocument) override;
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 28a8626afe59..b35651ed3a01 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -81,7 +81,7 @@ private:
sal_uInt32 mnKey;
ScAddress maPos;
- ScViewData* mpViewData;
+ ScViewData& mrViewData;
std::shared_ptr<ScCondFormatDlgData> mpDlgData;
@@ -109,7 +109,7 @@ protected:
public:
ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window*
pWindow,
- ScViewData* pViewData, const
std::shared_ptr<ScCondFormatDlgData>& rItem);
+ ScViewData& rViewData, const
std::shared_ptr<ScCondFormatDlgData>& rItem);
virtual ~ScCondFormatDlg() override;
std::unique_ptr<ScConditionalFormat> GetConditionalFormat() const;
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index 6a12c1d073af..c66ee9607c54 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -31,7 +31,7 @@ class ScViewData;
class ScTabControl : public TabBar, public DropTargetHelper, public
DragSourceHelper
{
private:
- ScViewData* pViewData;
+ ScViewData& rViewData;
sal_uInt16 nMouseClickPageId; /// Last page ID after mouse
button down/up
sal_uInt16 nSelPageIdByMouse; /// Selected page ID, if selected
with mouse
bool bErrorShown;
@@ -62,7 +62,7 @@ protected:
virtual void AddTabClick() override;
public:
- ScTabControl( vcl::Window* pParent, ScViewData* pData );
+ ScTabControl( vcl::Window* pParent, ScViewData& rData );
virtual void dispose() override;
virtual ~ScTabControl() override;
diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx
index ce09efddc260..035de1cb32bd 100644
--- a/sc/source/ui/inc/tabsplit.hxx
+++ b/sc/source/ui/inc/tabsplit.hxx
@@ -26,7 +26,7 @@ class ScViewData;
class ScTabSplitter : public Splitter
{
private:
- const ScViewData *const pViewData;
+ ScViewData& rViewData;
bool bFixed;
protected:
@@ -34,7 +34,7 @@ protected:
public:
ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle,
- const ScViewData* pData );
+ ScViewData& rData );
virtual ~ScTabSplitter() override;
void SetFixed(bool bSet);
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index aa2ed2895ba1..4582900557f9 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -39,16 +39,16 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
-ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
+ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData& rData )
: TabBar(pParent, WB_3DLOOK | WB_MINSCROLL | WB_SCROLL | WB_RANGESELECT |
WB_MULTISELECT | WB_DRAG, true)
, DropTargetHelper(this)
, DragSourceHelper(this)
- , pViewData(pData)
+ , rViewData(rData)
, nMouseClickPageId(TabBar::PAGE_NOT_FOUND)
, nSelPageIdByMouse(TabBar::PAGE_NOT_FOUND)
, bErrorShown(false)
{
- ScDocument& rDoc = pViewData->GetDocument();
+ ScDocument& rDoc = rViewData.GetDocument();
OUString aString;
Color aTabBgColor;
@@ -76,11 +76,11 @@ ScTabControl::ScTabControl( vcl::Window* pParent,
ScViewData* pData )
}
}
- SetCurPageId( static_cast<sal_uInt16>(pViewData->GetTabNo()) + 1 );
+ SetCurPageId( static_cast<sal_uInt16>(rViewData.GetTabNo()) + 1 );
SetSizePixel( Size(SC_TABBAR_DEFWIDTH, 0) );
- SetSplitHdl( LINK( pViewData->GetView(), ScTabView, TabBarResize ) );
+ SetSplitHdl( LINK( rViewData.GetView(), ScTabView, TabBarResize ) );
EnableEditMode();
UpdateInputContext();
@@ -99,7 +99,7 @@ IMPL_LINK(ScTabControl, ShowPageList, const CommandEvent &,
rEvent, void)
sal_uInt16 nCurPageId = GetCurPageId();
- ScDocument& rDoc = pViewData->GetDocument();
+ ScDocument& rDoc = rViewData.GetDocument();
SCTAB nCount = rDoc.GetTableCount();
for (SCTAB i=0; i<nCount; ++i)
{
@@ -149,7 +149,7 @@ SCTAB ScTabControl::GetPrivatDropPos(const Point& rPos )
if(nPos !=0 )
{
- ScDocument& rDoc = pViewData->GetDocument();
+ ScDocument& rDoc = rViewData.GetDocument();
SCTAB nCount = rDoc.GetTableCount();
@@ -185,8 +185,8 @@ void ScTabControl::MouseButtonDown( const MouseEvent& rMEvt
)
if ( !pScMod->IsModalMode() && !pScMod->IsFormulaMode() && !IsInEditMode()
)
{
// activate View
- pViewData->GetViewShell()->SetActive(); // Appear and
SetViewFrame
- pViewData->GetView()->ActiveGrabFocus();
+ rViewData.GetViewShell()->SetActive(); // Appear and
SetViewFrame
+ rViewData.GetView()->ActiveGrabFocus();
}
if (rMEvt.IsLeft() && rMEvt.GetModifier() == 0)
@@ -205,7 +205,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
if ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && nMouseClickPageId != 0 &&
nMouseClickPageId != TabBar::PAGE_NOT_FOUND )
{
- SfxDispatcher* pDispatcher =
pViewData->GetViewShell()->GetViewFrame().GetDispatcher();
+ SfxDispatcher* pDispatcher =
rViewData.GetViewShell()->GetViewFrame().GetDispatcher();
pDispatcher->Execute( FID_TAB_MENU_RENAME, SfxCallMode::SYNCHRON |
SfxCallMode::RECORD );
return;
}
@@ -213,7 +213,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
if( nMouseClickPageId == 0 )
{
// Click in the area next to the existing tabs:
- SfxDispatcher* pDispatcher =
pViewData->GetViewShell()->GetViewFrame().GetDispatcher();
+ SfxDispatcher* pDispatcher =
rViewData.GetViewShell()->GetViewFrame().GetDispatcher();
pDispatcher->Execute( FID_TAB_DESELECTALL, SfxCallMode::SYNCHRON |
SfxCallMode::RECORD );
// forget page ID, to be really sure that the dialog is not called
twice
nMouseClickPageId = TabBar::PAGE_NOT_FOUND;
@@ -227,7 +227,7 @@ void ScTabControl::AddTabClick()
TabBar::AddTabClick();
// Insert a new sheet at the right end, with default name.
- ScDocument& rDoc = pViewData->GetDocument();
+ ScDocument& rDoc = rViewData.GetDocument();
ScModule* pScMod = ScModule::get();
if (!rDoc.IsDocEditable() || pScMod->IsTableLocked())
return;
@@ -239,9 +239,9 @@ void ScTabControl::AddTabClick()
OUString aName;
rDoc.CreateValidTabName(aName);
SCTAB nTabCount = rDoc.GetTableCount();
- pViewData->GetViewShell()->InsertTable(aName, nTabCount);
+ rViewData.GetViewShell()->InsertTable(aName, nTabCount);
if (!pScMod->IsModalMode() && !pScMod->IsFormulaMode() && !IsInEditMode())
- pViewData->GetViewShell()->SetActive();
+ rViewData.GetViewShell()->SetActive();
}
void ScTabControl::Select()
@@ -253,8 +253,8 @@ void ScTabControl::Select()
nMouseClickPageId = TabBar::PAGE_NOT_FOUND;
ScModule* pScMod = ScModule::get();
- ScDocument& rDoc = pViewData->GetDocument();
- ScMarkData& rMark = pViewData->GetMarkData();
+ ScDocument& rDoc = rViewData.GetDocument();
+ ScMarkData& rMark = rViewData.GetMarkData();
SCTAB nCount = rDoc.GetTableCount();
SCTAB i;
@@ -264,7 +264,7 @@ void ScTabControl::Select()
for (i=0; i<nCount; i++)
SelectPage( static_cast<sal_uInt16>(i)+1, rMark.GetTableSelect(i)
);
- SetCurPageId( static_cast<sal_uInt16>(pViewData->GetTabNo()) + 1 );
+ SetCurPageId( static_cast<sal_uInt16>(rViewData.GetTabNo()) + 1 );
return;
}
@@ -274,8 +274,8 @@ void ScTabControl::Select()
sal_uInt16 nPage = nCurId - 1;
// OLE-inplace deactivate
- if ( nPage != static_cast<sal_uInt16>(pViewData->GetTabNo()) )
- pViewData->GetView()->DrawMarkListHasChanged();
+ if ( nPage != static_cast<sal_uInt16>(rViewData.GetTabNo()) )
+ rViewData.GetView()->DrawMarkListHasChanged();
// InputEnterHandler onlw when not reference input
@@ -286,9 +286,9 @@ void ScTabControl::Select()
for (i=0; i<nCount; i++)
rMark.SelectTable( i, IsPageSelected(static_cast<sal_uInt16>(i)+1) );
- SfxDispatcher& rDisp = pViewData->GetDispatcher();
+ SfxDispatcher& rDisp = rViewData.GetDispatcher();
if (rDisp.IsLocked())
- pViewData->GetView()->SetTabNo( static_cast<SCTAB>(nPage) );
+ rViewData.GetView()->SetTabNo( static_cast<SCTAB>(nPage) );
else
{
// sheet for basic is 1-based
@@ -297,7 +297,7 @@ void ScTabControl::Select()
SfxCallMode::SLOT | SfxCallMode::RECORD, { &aItem });
}
- SfxBindings& rBind = pViewData->GetBindings();
+ SfxBindings& rBind = rViewData.GetBindings();
rBind.Invalidate( FID_FILL_TAB );
rBind.Invalidate( FID_TAB_DESELECTALL );
@@ -318,12 +318,12 @@ void ScTabControl::Select()
// (for references over multiple sheets)
// for others this is only needed fidgeting
- if ( bRefMode && pViewData->GetRefType() == SC_REFTYPE_REF )
- if (
pViewData->GetViewShell()->GetViewFrame().HasChildWindow(SID_OPENDLG_CONSOLIDATE)
)
+ if ( bRefMode && rViewData.GetRefType() == SC_REFTYPE_REF )
+ if (
rViewData.GetViewShell()->GetViewFrame().HasChildWindow(SID_OPENDLG_CONSOLIDATE)
)
{
ScRange aRange(
- pViewData->GetRefStartX(), pViewData->GetRefStartY(),
pViewData->GetRefStartZ(),
- pViewData->GetRefEndX(), pViewData->GetRefEndY(),
pViewData->GetRefEndZ() );
+ rViewData.GetRefStartX(), rViewData.GetRefStartY(),
rViewData.GetRefStartZ(),
+ rViewData.GetRefEndX(), rViewData.GetRefEndY(),
rViewData.GetRefEndZ() );
pScMod->SetReference( aRange, rDoc, &rMark );
pScMod->EndReference(); // due to Auto-Hide
}
@@ -331,7 +331,7 @@ void ScTabControl::Select()
void ScTabControl::UpdateInputContext()
{
- ScDocument& rDoc = pViewData->GetDocument();
+ ScDocument& rDoc = rViewData.GetDocument();
WinBits nStyle = GetStyle();
if (rDoc.GetDocumentShell()->IsReadOnly())
// no insert sheet tab for readonly doc.
@@ -342,9 +342,9 @@ void ScTabControl::UpdateInputContext()
void ScTabControl::UpdateStatus()
{
- ScDocument& rDoc = pViewData->GetDocument();
- ScMarkData& rMark = pViewData->GetMarkData();
- bool bActive = pViewData->IsActive();
+ ScDocument& rDoc = rViewData.GetDocument();
+ ScMarkData& rMark = rViewData.GetMarkData();
+ bool bActive = rViewData.IsActive();
SCTAB nCount = rDoc.GetTableCount();
SCTAB i;
@@ -395,7 +395,7 @@ void ScTabControl::UpdateStatus()
}
}
}
- SetCurPageId( static_cast<sal_uInt16>(pViewData->GetTabNo()) + 1 );
+ SetCurPageId( static_cast<sal_uInt16>(rViewData.GetTabNo()) + 1 );
if (bActive)
{
@@ -439,14 +439,14 @@ void ScTabControl::SwitchToPageId(sal_uInt16 nId)
{
// notify LibreOfficeKit about changed page
OString aPayload = OString::number(nId - 1);
-
pViewData->GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_SET_PART,
aPayload);
+
rViewData.GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_SET_PART,
aPayload);
}
}
void ScTabControl::Command( const CommandEvent& rCEvt )
{
ScModule* pScMod = ScModule::get();
- ScTabViewShell* pViewSh = pViewData->GetViewShell();
+ ScTabViewShell* pViewSh = rViewData.GetViewShell();
bool bDisable = pScMod->IsFormulaMode() ||
pScMod->IsModalMode();
// first activate ViewFrame (Bug 19493):
@@ -466,7 +466,7 @@ void ScTabControl::Command( const CommandEvent& rCEvt )
// Popup-Menu:
// get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so
it can't be null
- pViewData->GetDispatcher().ExecutePopup( u"sheettab"_ustr );
+ rViewData.GetDispatcher().ExecutePopup( u"sheettab"_ustr );
}
void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
@@ -485,12 +485,12 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */,
const Point& rPosPixel )
void ScTabControl::DoDrag()
{
- ScDocShell* pDocSh = pViewData->GetDocShell();
+ ScDocShell* pDocSh = rViewData.GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
- SCTAB nTab = pViewData->GetTabNo();
+ SCTAB nTab = rViewData.GetTabNo();
ScRange aTabRange( 0, 0, nTab, rDoc.MaxCol(), rDoc.MaxRow(), nTab );
- ScMarkData aTabMark = pViewData->GetMarkData();
+ ScMarkData aTabMark = rViewData.GetMarkData();
aTabMark.ResetMark(); // doesn't change marked table information
aTabMark.SetMarkArea( aTabRange );
@@ -509,9 +509,9 @@ void ScTabControl::DoDrag()
pTransferObj->SetDragSource( pDocSh, aTabMark );
- pTransferObj->SetSourceCursorPos( pViewData->GetCurX(),
pViewData->GetCurY() );
+ pTransferObj->SetSourceCursorPos( rViewData.GetCurX(), rViewData.GetCurY()
);
- vcl::Window* pWindow = pViewData->GetActiveWin();
+ vcl::Window* pWindow = rViewData.GetActiveWin();
ScModule::get()->SetDragObject(pTransferObj.get(), nullptr); // for
internal D&D
pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
@@ -540,7 +540,7 @@ sal_Int8 ScTabControl::ExecuteDrop( const ExecuteDropEvent&
rEvt )
{
EndSwitchPage();
- ScDocument& rDoc = pViewData->GetDocument();
+ ScDocument& rDoc = rViewData.GetDocument();
const ScDragData& rData = ScModule::get()->GetDragData();
if ( rData.pCellTransfer && (rData.pCellTransfer->GetDragSourceFlags() &
ScDragSrc::Table) &&
rData.pCellTransfer->GetSourceDocument() == &rDoc )
@@ -559,7 +559,7 @@ sal_Int8 ScTabControl::ExecuteDrop( const ExecuteDropEvent&
rEvt )
if ( !rDoc.GetChangeTrack() && rDoc.IsDocEditable() )
{
//! use table selection from the tab control where dragging
was started?
- pViewData->GetView()->MoveTable( lcl_DocShellNr(rDoc), nPos,
rEvt.mnAction != DND_ACTION_MOVE );
+ rViewData.GetView()->MoveTable( lcl_DocShellNr(rDoc), nPos,
rEvt.mnAction != DND_ACTION_MOVE );
rData.pCellTransfer->SetDragWasInternal(); // don't
delete
return DND_ACTION_COPY;
@@ -579,7 +579,7 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent&
rEvt )
return rEvt.mnAction;
}
- const ScDocument& rDoc = pViewData->GetDocument();
+ const ScDocument& rDoc = rViewData.GetDocument();
const ScDragData& rData = ScModule::get()->GetDragData();
if ( rData.pCellTransfer && (rData.pCellTransfer->GetDragSourceFlags() &
ScDragSrc::Table) &&
rData.pCellTransfer->GetSourceDocument() == &rDoc )
@@ -602,13 +602,13 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent&
rEvt )
bool ScTabControl::StartRenaming()
{
- return pViewData->GetDocument().IsDocEditable();
+ return rViewData.GetDocument().IsDocEditable();
}
TabBarAllowRenamingReturnCode ScTabControl::AllowRenaming()
{
- ScTabViewShell* pViewSh = pViewData->GetViewShell();
- OSL_ENSURE( pViewSh, "pViewData->GetViewShell()" );
+ ScTabViewShell* pViewSh = rViewData.GetViewShell();
+ OSL_ENSURE( pViewSh, "rViewData.GetViewShell()" );
TabBarAllowRenamingReturnCode nRet = TABBAR_RENAMING_CANCEL;
sal_uInt16 nId = GetEditPageId();
@@ -627,7 +627,7 @@ TabBarAllowRenamingReturnCode ScTabControl::AllowRenaming()
OSL_FAIL("ScTabControl::AllowRenaming: nested calls");
nRet = TABBAR_RENAMING_NO;
}
- else if (pViewData->GetDocShell()->IsInModalMode())
+ else if (rViewData.GetDocShell()->IsInModalMode())
{
// don't show error message above any modal dialog
// instead cancel renaming without error message
@@ -650,7 +650,7 @@ TabBarAllowRenamingReturnCode ScTabControl::AllowRenaming()
void ScTabControl::EndRenaming()
{
if ( HasFocus() )
- pViewData->GetView()->ActiveGrabFocus();
+ rViewData.GetView()->ActiveGrabFocus();
}
void ScTabControl::Mirror()
diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx
index fb8435b2712a..95fef3d1acf6 100644
--- a/sc/source/ui/view/tabsplit.cxx
+++ b/sc/source/ui/view/tabsplit.cxx
@@ -22,9 +22,9 @@
#include <vcl/settings.hxx>
-ScTabSplitter::ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, const
ScViewData* pData ) :
+ScTabSplitter::ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle,
ScViewData& rData ) :
Splitter(pParent, nWinStyle),
- pViewData(pData)
+ rViewData(rData)
{
SetFixed(false);
EnableRTL(false);
@@ -60,7 +60,7 @@ void ScTabSplitter::Paint( vcl::RenderContext&
rRenderContext, const tools::Rect
if (IsHorizontal())
{
- switch (pViewData->GetHSplitMode())
+ switch (rViewData.GetHSplitMode())
{
case SC_SPLIT_NONE:
{
@@ -91,7 +91,7 @@ void ScTabSplitter::Paint( vcl::RenderContext&
rRenderContext, const tools::Rect
}
else
{
- switch (pViewData->GetVSplitMode())
+ switch (rViewData.GetVSplitMode())
{
case SC_SPLIT_NONE:
{
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 2fd37f316df3..ecb064a04b6d 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -91,14 +91,14 @@ void ScTabView::Init()
for (i=0; i<2; i++)
pColOutline[i] = pRowOutline[i] = nullptr;
- pHSplitter = VclPtr<ScTabSplitter>::Create( pFrameWin, WinBits( WB_HSCROLL
), &aViewData );
- pVSplitter = VclPtr<ScTabSplitter>::Create( pFrameWin, WinBits( WB_VSCROLL
), &aViewData );
+ pHSplitter = VclPtr<ScTabSplitter>::Create( pFrameWin, WinBits( WB_HSCROLL
), aViewData );
+ pVSplitter = VclPtr<ScTabSplitter>::Create( pFrameWin, WinBits( WB_VSCROLL
), aViewData );
// SSA: override default keyboard step size to allow snap to row/column
pHSplitter->SetKeyboardStepSize( 1 );
pVSplitter->SetKeyboardStepSize( 1 );
- pTabControl = VclPtr<ScTabControl>::Create(pFrameWin, &aViewData);
+ pTabControl = VclPtr<ScTabControl>::Create(pFrameWin, aViewData);
if (mbInlineWithScrollbar)
pTabControl->SetStyle(pTabControl->GetStyle() | WB_SIZEABLE);
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 8e1f6860d619..5a2153e6043b 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -410,7 +410,7 @@ std::shared_ptr<SfxModelessDialogController>
ScTabViewShell::CreateRefDialogCont
ScViewData& rViewData = GetViewData();
rViewData.SetRefTabNo( rViewData.GetTabNo() );
ScDPObject* pObj = rDoc.GetDPAtCursor(rViewData.GetCurX(),
rViewData.GetCurY(), rViewData.GetTabNo());
- xResult = std::make_shared<ScPivotLayoutDialog>(pB, pCW,
pParent, &rViewData, pDialogDPObject.get(), pObj == nullptr);
+ xResult = std::make_shared<ScPivotLayoutDialog>(pB, pCW,
pParent, rViewData, pDialogDPObject.get(), pObj == nullptr);
}
break;
@@ -434,7 +434,7 @@ std::shared_ptr<SfxModelessDialogController>
ScTabViewShell::CreateRefDialogCont
ScViewData& rViewData = GetViewData();
rViewData.SetRefTabNo( rViewData.GetTabNo() );
- xResult = std::make_shared<ScCondFormatDlg>(pB, pCW, pParent,
&rViewData, rDlgData);
+ xResult = std::make_shared<ScCondFormatDlg>(pB, pCW, pParent,
rViewData, rDlgData);
// Remove the DialogData stored by Conditional Format Manager
Dialog.
setScCondFormatDlgData(nullptr);
