1 files changed, 5 insertions, 30 deletions

diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index bddd0c689aea..03968d863c18 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -38,8 +38,7 @@ ScInputStatusItem::ScInputStatusItem(
     aStartPos   ( rStartPos ),
     aEndPos     ( rEndPos ),
     aString     (std::move( _aString )),
-    pEditData   ( pData ? pData->Clone() : nullptr ),
-    mpMisspellRanges(nullptr)
+    pEditData   ( pData ? pData->Clone() : nullptr )
 {
 }
 
@@ -50,7 +49,7 @@ ScInputStatusItem::ScInputStatusItem( const ScInputStatusItem& rItem ) :
     aEndPos     ( rItem.aEndPos ),
     aString     ( rItem.aString ),
     pEditData   ( rItem.pEditData ? rItem.pEditData->Clone() : nullptr ),
-    mpMisspellRanges(rItem.mpMisspellRanges)
+    maMisspellRanges(rItem.maMisspellRanges)
 {
 }
 
@@ -74,9 +73,9 @@ ScInputStatusItem* ScInputStatusItem::Clone( SfxItemPool * ) const
     return new ScInputStatusItem( *this );
 }
 
-void ScInputStatusItem::SetMisspellRanges( const std::vector<editeng::MisspellRanges>* pRanges )
+void ScInputStatusItem::SetMisspellRanges( const sc::MisspellRangeResult& rRanges )
 {
-    mpMisspellRanges = pRanges;
+    maMisspellRanges = rRanges;
 }
 
 // ScPaintHint was moved to hints.cxx
@@ -132,14 +131,6 @@ ScSortItem::ScSortItem( sal_uInt16              nWhichP,
     if ( pSortData ) theSortData = *pSortData;
 }
 
-ScSortItem::ScSortItem( sal_uInt16              nWhichP,
-                        const ScSortParam*  pSortData ) :
-        SfxPoolItem ( nWhichP ),
-        pViewData   ( nullptr )
-{
-    if ( pSortData ) theSortData = *pSortData;
-}
-
 bool ScSortItem::operator==( const SfxPoolItem& rItem ) const
 {
     assert(SfxPoolItem::operator==(rItem));
@@ -166,22 +157,8 @@ bool ScSortItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) co
  * Data for the Filter dialog
  */
 ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
-                          ScViewData*           ptrViewData,
-                          const ScQueryParam*   pQueryData ) :
-        SfxPoolItem ( nWhichP ),
-        pViewData   ( ptrViewData ),
-        bIsAdvanced ( false )
-{
-    if (pQueryData)
-        mpQueryData.reset(new ScQueryParam(*pQueryData));
-    else
-        mpQueryData.reset(new ScQueryParam);
-}
-
-ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
                           const ScQueryParam*   pQueryData ) :
         SfxPoolItem ( nWhichP ),
-        pViewData   ( nullptr ),
         bIsAdvanced ( false )
 {
     if (pQueryData)
@@ -193,7 +170,6 @@ ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
 ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) :
         SfxPoolItem ( rItem ),
         mpQueryData(new ScQueryParam(*rItem.mpQueryData)),
-        pViewData   ( rItem.pViewData ),
         aAdvSource  ( rItem.aAdvSource ),
         bIsAdvanced ( rItem.bIsAdvanced )
 {
@@ -231,8 +207,7 @@ bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const
 
     const ScQueryItem& rQueryItem = static_cast<const ScQueryItem&>(rItem);
 
-    return (   (pViewData    == rQueryItem.pViewData)
-            && (bIsAdvanced  == rQueryItem.bIsAdvanced)
+    return ( (bIsAdvanced  == rQueryItem.bIsAdvanced)
             && (aAdvSource   == rQueryItem.aAdvSource)
             && (*mpQueryData == *rQueryItem.mpQueryData) );
 }