sc/source/ui/app/uiitems.cxx | 12 ------------
sc/source/ui/dbgui/filtdlg.cxx | 2 +-
sc/source/ui/dbgui/pfiltdlg.cxx | 2 +-
sc/source/ui/dbgui/sfiltdlg.cxx | 2 +-
sc/source/ui/inc/olinewin.hxx | 2 +-
sc/source/ui/inc/uiitems.hxx | 2 --
sc/source/ui/view/olinewin.cxx | 4 ++--
sc/source/ui/view/tabview.cxx | 8 ++++----
8 files changed, 10 insertions(+), 24 deletions(-)
New commits:
commit 0799e55b3d57b8872d363b5ea81e6f89b75d0f4a
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Apr 25 17:27:43 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 25 22:16:44 2025 +0200
ScOutlineWindow: pass ScViewData by ref
Change-Id: Iea4da0879bfc281cdb430bec3285a1a5c2da4bba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184633
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx
index 7f99ae662436..eade172add48 100644
--- a/sc/source/ui/inc/olinewin.hxx
+++ b/sc/source/ui/inc/olinewin.hxx
@@ -58,7 +58,7 @@ public:
ScOutlineWindow(
vcl::Window* pParent,
ScOutlineMode eMode,
- ScViewData* pViewData,
+ ScViewData& rViewData,
ScSplitPos eWhich );
virtual ~ScOutlineWindow() override;
virtual void dispose() override;
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 6298f5db3687..52a78b2dcf0e 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -37,9 +37,9 @@ const tools::Long SC_OL_POSOFFSET = 2;
const size_t SC_OL_NOLEVEL = static_cast< size_t >( -1 );
const size_t SC_OL_HEADERENTRY = static_cast< size_t >( -1 );
-ScOutlineWindow::ScOutlineWindow( vcl::Window* pParent, ScOutlineMode eMode,
ScViewData* pViewData, ScSplitPos eWhich ) :
+ScOutlineWindow::ScOutlineWindow( vcl::Window* pParent, ScOutlineMode eMode,
ScViewData& rViewData, ScSplitPos eWhich ) :
Window( pParent ),
- mrViewData( *pViewData ),
+ mrViewData( rViewData ),
meWhich( eWhich ),
mbHoriz( eMode == SC_OUTLINE_HOR ),
mbMirrorEntries( false ), // updated in SetHeaderSize
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 46d6a8f2efe3..1b219878411d 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1657,14 +1657,14 @@ void ScTabView::UpdateShow()
}
if (bHOutline && !pColOutline[SC_SPLIT_LEFT])
- pColOutline[SC_SPLIT_LEFT] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_HOR, &aViewData, SC_SPLIT_BOTTOMLEFT );
+ pColOutline[SC_SPLIT_LEFT] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_HOR, aViewData, SC_SPLIT_BOTTOMLEFT );
if (bShowH && bHOutline && !pColOutline[SC_SPLIT_RIGHT])
- pColOutline[SC_SPLIT_RIGHT] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_HOR, &aViewData, SC_SPLIT_BOTTOMRIGHT );
+ pColOutline[SC_SPLIT_RIGHT] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_HOR, aViewData, SC_SPLIT_BOTTOMRIGHT );
if (bVOutline && !pRowOutline[SC_SPLIT_BOTTOM])
- pRowOutline[SC_SPLIT_BOTTOM] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_VER, &aViewData, SC_SPLIT_BOTTOMLEFT );
+ pRowOutline[SC_SPLIT_BOTTOM] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_VER, aViewData, SC_SPLIT_BOTTOMLEFT );
if (bShowV && bVOutline && !pRowOutline[SC_SPLIT_TOP])
- pRowOutline[SC_SPLIT_TOP] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_VER, &aViewData, SC_SPLIT_TOPLEFT );
+ pRowOutline[SC_SPLIT_TOP] = VclPtr<ScOutlineWindow>::Create(
pFrameWin, SC_OUTLINE_VER, aViewData, SC_SPLIT_TOPLEFT );
if (bShowH && bHeader && !pColBar[SC_SPLIT_RIGHT])
pColBar[SC_SPLIT_RIGHT] = VclPtr<ScColBar>::Create( pFrameWin,
SC_SPLIT_RIGHT,
commit 1b09a4bfc1e39a9f9a049c98c3ebc02edb4d4a8e
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Apr 25 17:00:29 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 25 22:16:34 2025 +0200
ScQueryItem: always pass ScViewData from caller
Change-Id: I02c061ecf4316907a020e1324c606ea53da7b8a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184630
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 96863bb2e820..cde899879ae2 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -169,18 +169,6 @@ ScQueryItem::ScQueryItem( sal_uInt16
nWhichP,
mpQueryData.reset(new ScQueryParam);
}
-ScQueryItem::ScQueryItem( sal_uInt16 nWhichP,
- const ScQueryParam* pQueryData ) :
- SfxPoolItem ( nWhichP ),
- pViewData ( nullptr ),
- bIsAdvanced ( false )
-{
- if (pQueryData)
- mpQueryData.reset(new ScQueryParam(*pQueryData));
- else
- mpQueryData.reset(new ScQueryParam);
-}
-
ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) :
SfxPoolItem ( rItem ),
mpQueryData(new ScQueryParam(*rItem.mpQueryData)),
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 317f7f3a9165..c3c8f15b2a05 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -726,7 +726,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
// only set the three - reset everything else
- pOutItem.reset( new ScQueryItem( nWhichQuery, &theParam ) );
+ pOutItem.reset( new ScQueryItem( nWhichQuery, pViewData, &theParam ) );
return pOutItem.get();
}
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 3da6b50ebe52..47a2c729d262 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -368,7 +368,7 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
theParam.bCaseSens = m_xBtnCase->get_active();
theParam.eSearchType = m_xBtnRegExp->get_active() ?
utl::SearchParam::SearchType::Regexp : utl::SearchParam::SearchType::Normal;
- pOutItem.reset( new ScQueryItem( nWhichQuery, &theParam ) );
+ pOutItem.reset( new ScQueryItem( nWhichQuery, pViewData, &theParam ) );
return *pOutItem;
}
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 33c1955e6e0d..e0527121ce89 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -236,7 +236,7 @@ void ScSpecialFilterDlg::SetActive()
ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam,
const ScRange& rSource )
{
- pOutItem.reset(new ScQueryItem( nWhichQuery, &rParam ));
+ pOutItem.reset(new ScQueryItem( nWhichQuery, pViewData, &rParam ));
pOutItem->SetAdvancedQuerySource( &rSource );
return pOutItem.get();
}
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index c51f9f0e1fec..5ea756dd409b 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -149,8 +149,6 @@ public:
ScQueryItem( sal_uInt16 nWhich,
ScViewData* ptrViewData,
const ScQueryParam* pQueryData );
- ScQueryItem( sal_uInt16 nWhich,
- const ScQueryParam* pQueryData );
ScQueryItem( const ScQueryItem& rItem );
virtual ~ScQueryItem() override;
