[Libreoffice-commits] core.git: sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jan 10 20:43:07 UTC 2021
sc/source/ui/app/uiitems.cxx | 8 --------
sc/source/ui/dbgui/tpsubt.cxx | 4 ++--
sc/source/ui/inc/uiitems.hxx | 2 --
3 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 070084c4d62bc05d7d9fdd7b4368b91ccd9c1e8b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jan 10 19:28:56 2021 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Jan 10 21:42:23 2021 +0100
merge ScSubTotalItem ctors
Change-Id: Id71c56eb96abc80a1038a9d6cf12bc5124aa8529
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109060
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 0e0c2c502d9c..91cb50b079b2 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -251,14 +251,6 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP,
if ( pSubTotalData ) theSubTotalData = *pSubTotalData;
}
-ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP,
- const ScSubTotalParam* pSubTotalData ) :
- SfxPoolItem ( nWhichP ),
- pViewData ( nullptr )
-{
- if ( pSubTotalData ) theSubTotalData = *pSubTotalData;
-}
-
bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index e99e56bf8d33..a12eff3ba6e9 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -237,7 +237,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo,
}
- rArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, &theSubTotalData ) );
+ rArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, nullptr, &theSubTotalData ) );
return true;
}
@@ -532,7 +532,7 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet* rArgSet )
? m_xLbUserDef->get_active()
: 0;
- rArgSet->Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) );
+ rArgSet->Put( ScSubTotalItem( nWhichSubTotals, nullptr, &theSubTotalData ) );
return true;
}
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 180e8e71a887..5bc566181c41 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -179,8 +179,6 @@ public:
ScSubTotalItem( sal_uInt16 nWhich,
ScViewData* ptrViewData,
const ScSubTotalParam* pSubTotalData );
- ScSubTotalItem( sal_uInt16 nWhich,
- const ScSubTotalParam* pSubTotalData );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual ScSubTotalItem* Clone( SfxItemPool *pPool = nullptr ) const override;
More information about the Libreoffice-commits
mailing list