loplugin:singlevalfields in sc(part1)

Change-Id: I25760def2c12e4ca87843c2f3ce1a60b5a9b2e44
Reviewed-on: https://gerrit.libreoffice.org/26680
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

21 files changed, 19 insertions, 118 deletions

diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index d6b7d361988a..8622dcf3d0ea 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -93,8 +93,7 @@ void FormulaTemplate::applyNumber(const OUString& aVariable, sal_Int32 aValue)
 AddressWalker::AddressWalker(ScAddress aInitialAddress) :
     mCurrentAddress(aInitialAddress),
     mMinimumAddress(aInitialAddress),
-    mMaximumAddress(aInitialAddress),
-    mTrackRange(true)
+    mMaximumAddress(aInitialAddress)
 {
     mAddressStack.push_back(mCurrentAddress);
 }
@@ -132,21 +131,15 @@ void AddressWalker::nextColumn()
 {
     mCurrentAddress.IncCol();
 
-    if (mTrackRange)
-    {
-        if(mMaximumAddress.Col() < mCurrentAddress.Col())
-            mMaximumAddress.SetCol(mCurrentAddress.Col());
-    }
+    if(mMaximumAddress.Col() < mCurrentAddress.Col())
+        mMaximumAddress.SetCol(mCurrentAddress.Col());
 }
 
 void AddressWalker::nextRow()
 {
     mCurrentAddress.IncRow();
-    if (mTrackRange)
-    {
-        if(mMaximumAddress.Row() < mCurrentAddress.Row())
-            mMaximumAddress.SetRow(mCurrentAddress.Row());
-    }
+    if(mMaximumAddress.Row() < mCurrentAddress.Row())
+        mMaximumAddress.SetRow(mCurrentAddress.Row());
 }
 
 void AddressWalker::push(SCCOL aRelativeCol, SCROW aRelativeRow, SCTAB aRelativeTab)
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index cac2d488c131..bc8319424c55 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -100,7 +100,6 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl
     Image                    maSliderButton;
     Image                    maIncreaseButton;
     Image                    maDecreaseButton;
-    bool                     mbValuesSet;
     bool                     mbOmitPaint;
 
     explicit ScZoomSliderWnd_Impl( sal_uInt16 nCurrentZoom ) :
@@ -113,10 +112,8 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl
         maSliderButton(),
         maIncreaseButton(),
         maDecreaseButton(),
-        mbValuesSet( true ),
         mbOmitPaint( false )
         {
-
         }
 };
 
@@ -244,8 +241,6 @@ void ScZoomSliderWnd::dispose()
 
 void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    if ( !mpImpl->mbValuesSet )
-        return ;
     Size aSliderWindowSize = GetOutputSizePixel();
 
     const Point aPoint = rMEvt.GetPosPixel();
@@ -300,9 +295,6 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
 
 void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt )
 {
-    if ( !mpImpl->mbValuesSet )
-        return ;
-
     Size aSliderWindowSize   = GetOutputSizePixel();
     const long nControlWidth = aSliderWindowSize.Width();
     const short nButtons     = rMEvt.GetButtons();
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index c095810fb735..15d53eef9ef6 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -133,8 +133,6 @@ void ScTabPageSortFields::Init()
     OSL_ENSURE( pViewData, "ViewData not found!" );
 
     nFieldArr.push_back( 0 );
-    nFirstCol = 0;
-    nFirstRow = 0;
 
     // Create three sort key dialogs by default
     for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
@@ -269,9 +267,7 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet* rArgSet )
         if ( pDlg && bSortByRows != pDlg->GetByRows() )
         {
             for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
-                aNewSortData.maKeyState[i].nField = ( bSortByRows ?
-                        static_cast<SCCOLROW>(nFirstRow) :
-                        static_cast<SCCOLROW>(nFirstCol) );
+                aNewSortData.maKeyState[i].nField = 0;
         }
         else
         {
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 9cb144bde0d4..c151c97c62d7 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -65,8 +65,7 @@ using namespace com::sun::star;
 
 FuSelection::FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
                SdrModel* pDoc, SfxRequest& rReq ) :
-    FuDraw(pViewSh, pWin, pViewP, pDoc, rReq),
-    bVCAction(false)
+    FuDraw(pViewSh, pWin, pViewP, pDoc, rReq)
 {
 }
 
@@ -103,7 +102,6 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
         return true;
     }
 
-    bVCAction = false;
     bIsInDragMode = false;      //  irgendwo muss es ja zurueckgesetzt werden (#50033#)
 
     bool bReturn = FuDraw::MouseButtonDown(rMEvt);
@@ -315,8 +313,8 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
 
     if (!bIsInDragMode)
     {
-        if (!bVCAction)                 // VC rufen selber CaptureMouse
-            pWindow->CaptureMouse();
+        // VC rufen selber CaptureMouse
+        pWindow->CaptureMouse();
         ForcePointer(&rMEvt);
     }
 
@@ -352,13 +350,6 @@ bool FuSelection::MouseMove(const MouseEvent& rMEvt)
         bReturn = true;
     }
 
-    // Ein VCControl ist aktiv
-    // Event an den Manager weiterleiten
-    if( bVCAction )
-    {
-        bReturn = true;
-    }
-
     ForcePointer(&rMEvt);
 
     return bReturn;
@@ -554,14 +545,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
             bReturn = true;
     }
 
-    // Ein VCControl ist aktiv
-    // Event an den Manager weiterleiten
-    if( bVCAction )
-    {
-        bVCAction = false;
-        bReturn = true;
-    }
-
     ForcePointer(&rMEvt);
 
     if (pWindow->IsMouseCaptured())
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index 72adb6dd0335..a59a32dce08a 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -50,7 +50,6 @@ ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId)
 
     aWinPointer=GetPointer();
 
-    aMovingFlag=false;
     aWinPointer=Pointer(PointerStyle::VSplit);
     SetPointer(aWinPointer);
 }
diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
index f1fe8e563243..8d0bbfe23fea 100644
--- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
+++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
@@ -60,7 +60,6 @@ public:
     ScAddress mCurrentAddress;
     ScAddress mMinimumAddress;
     ScAddress mMaximumAddress;
-    bool      mTrackRange;
 
     AddressWalker(ScAddress aInitialAddress);
 
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index c5ce73de1693..6ec0d79d3f6d 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -87,7 +87,6 @@ private:
     sal_uLong                   nRejectCount;
     bool                    bAcceptEnableFlag:1;
     bool                    bRejectEnableFlag:1;
-    bool                    bNeedsUpdate:1;
     bool                    bIgnoreMsg:1;
     bool                    bNoSelection:1;
     bool                    bHasFilterEntry:1;
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 2353f154e6ec..e043c636227b 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -102,7 +102,6 @@ class ScContentTree : public SvTreeListBox
     DECL_LINK_TYPED( ExecDragHdl, void*, void );
 public:
     SvTreeListEntry* pTmpEntry;
-    bool m_bFirstPaint;
 
 protected:
 
diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx
index c70fec09003f..32bff11625d2 100644
--- a/sc/source/ui/inc/fusel.hxx
+++ b/sc/source/ui/inc/fusel.hxx
@@ -44,9 +44,6 @@ public:
 
     void    ActivateNoteHandles(SdrObject* pObj);
 
-protected:
-    bool            bVCAction;
-
 private:
     bool TestDetective( SdrPageView* pPV, const Point& rPos );  // -> fusel2
 
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 53c03b51093f..326441a3637d 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -166,8 +166,6 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou
     SCROW                   nDragEndY;
     InsCellCmd              meDragInsertMode;
 
-    sal_uInt16              nCurrentPointer;
-
     ScDDComboBoxButton      aComboButton;
 
     Point                   aCurMousePos;
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index a1824a819e2d..8b164c052ea3 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -84,10 +84,7 @@ private:
     bool              bUsedShortCut;
 
     InsertDeleteFlags nShortCutInsContentsCmdBits;
-    ScPasteFunc       nShortCutFormulaCmdBits;
-    bool              bShortCutSkipEmptyCells;
     bool              bShortCutTranspose;
-    bool              bShortCutIsLink;
     InsCellCmd        nShortCutMoveMode;
 
     static bool         bPreviousAllCheck;
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index 84c3e66b0956..0b7211cf3dd3 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -27,7 +27,6 @@ class ScPrivatSplit : public Control
 private:
 
         Link<ScPrivatSplit&,void> aCtrModifiedLink;
-        bool                aMovingFlag;
         Pointer             aWinPointer;
         short               nOldX;
         short               nOldY;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 1dc17536be4e..b937da880376 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -152,7 +152,6 @@ private:
 
     bool                    bIsActive;
 
-    bool                    bChartAreaValid; // if chart is drawn
     bool                    bForceFocusOnCurCell; // #i123629#
 
     ScRangeListRef          aChartSource;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index c579c2b65d7e..8410250871ee 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -79,8 +79,6 @@ private:
     sal_uInt16          nFieldCount;
     sal_uInt16          nSortKeyCount;
 
-    SCCOL               nFirstCol;
-    SCROW               nFirstRow;
     bool                bHasHeader;
     bool                bSortByRows;
 
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 98157823cb38..611fbc8ac20d 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -72,7 +72,6 @@ private:
     ScPatternAttr*  pApplyPattern;
     std::shared_ptr<EditTextObject> pOldEditData;
     std::shared_ptr<EditTextObject> pNewEditData;
-    bool            bIsAutomatic;
 
     void            DoChange( const ScPatternAttr* pWhichPattern, const std::shared_ptr<EditTextObject>& pEditData ) const;
 };
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index ade5249347ee..94fe85c7ed4a 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -100,7 +100,6 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window
         aUnknown("Unknown"),
         bAcceptEnableFlag(true),
         bRejectEnableFlag(true),
-        bNeedsUpdate(false),
         bIgnoreMsg(false),
         bNoSelection(false),
         bHasFilterEntry(false),
@@ -178,7 +177,6 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData)
         pDoc=nullptr;
 
     bNoSelection=false;
-    bNeedsUpdate=false;
     bIgnoreMsg=false;
     nAcceptCount=0;
     nRejectCount=0;
@@ -750,19 +748,11 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC
 
 bool ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt )
 {
-    if(rNEvt.GetType()==MouseNotifyEvent::GETFOCUS && bNeedsUpdate)
-    {
-        ClearView();
-        UpdateView();
-        bNoSelection=false;
-    }
-
     return SfxModelessDialog::PreNotify(rNEvt);
 }
 
 void ScAcceptChgDlg::UpdateView()
 {
-    bNeedsUpdate=false;
     SvTreeListEntry* pParent=nullptr;
     ScChangeTrack* pChanges=nullptr;
     const ScChangeAction* pScChangeAction=nullptr;
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 31f3ea3f486f..fe284c48d54b 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -41,10 +41,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     bMoveRightDisabled( false ),
     bUsedShortCut   ( false ),
     nShortCutInsContentsCmdBits( InsertDeleteFlags::NONE ),
-    nShortCutFormulaCmdBits(ScPasteFunc::NONE),
-    bShortCutSkipEmptyCells(false),
     bShortCutTranspose(false),
-    bShortCutIsLink(false),
     nShortCutMoveMode(INS_NONE)
 {
     get( mpBtnInsAll, "paste_all" );
@@ -170,7 +167,7 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode()
 bool ScInsertContentsDlg::IsSkipEmptyCells() const
 {
     if (bUsedShortCut)
-        return bShortCutSkipEmptyCells;
+        return false;
     return mpBtnSkipEmptyCells->IsChecked();
 }
 
@@ -184,7 +181,7 @@ bool ScInsertContentsDlg::IsTranspose() const
 bool ScInsertContentsDlg::IsLink() const
 {
     if (bUsedShortCut)
-        return bShortCutIsLink;
+        return false;
     return mpBtnLink->IsChecked();
 }
 
@@ -312,10 +309,7 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void )
     {
         bUsedShortCut = true;
         nShortCutInsContentsCmdBits = InsertDeleteFlags::STRING | InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME;
-        nShortCutFormulaCmdBits = ScPasteFunc::NONE;
-        bShortCutSkipEmptyCells = false;
         bShortCutTranspose = false;
-        bShortCutIsLink = false;
         nShortCutMoveMode = INS_NONE;
         EndDialog(RET_OK);
     }
@@ -323,10 +317,7 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void )
     {
         bUsedShortCut = true;
         nShortCutInsContentsCmdBits = InsertDeleteFlags::STRING | InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::ATTRIB;
-        nShortCutFormulaCmdBits = ScPasteFunc::NONE;
-        bShortCutSkipEmptyCells = false;
         bShortCutTranspose = false;
-        bShortCutIsLink = false;
         nShortCutMoveMode = INS_NONE;
         EndDialog(RET_OK);
     }
@@ -334,10 +325,7 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void )
     {
         bUsedShortCut = true;
         nShortCutInsContentsCmdBits = InsertDeleteFlags::ALL;
-        nShortCutFormulaCmdBits = ScPasteFunc::NONE;
-        bShortCutSkipEmptyCells = false;
         bShortCutTranspose = true;
-        bShortCutIsLink = false;
         nShortCutMoveMode = INS_NONE;
         EndDialog(RET_OK);
     }
@@ -415,7 +403,7 @@ ScPasteFunc  ScInsertContentsDlg::GetFormulaCmdBits() const
     else if(mpRbDiv->IsChecked())
         ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::DIV;
     if (bUsedShortCut)
-        return nShortCutFormulaCmdBits;
+        return ScPasteFunc::NONE;
     return ScInsertContentsDlg::nPreviousFormulaChecks;
 }
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 1817750be525..0f2a4d4df236 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -134,7 +134,6 @@ ScContentTree::ScContentTree( vcl::Window* pParent, const ResId& rResId ) :
     SetDoubleClickHdl( LINK( this, ScContentTree, ContentDoubleClickHdl ) );
 
     pTmpEntry= nullptr;
-    m_bFirstPaint=true;
 
     SetStyle( GetStyle() | WB_QUICK_SEARCH );
 }
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index f24330881910..74711df2388a 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -76,8 +76,7 @@ ScUndoCursorAttr::ScUndoCursorAttr( ScDocShell* pNewDocShell,
     nRow( nNewRow ),
     nTab( nNewTab ),
     pOldEditData( static_cast<EditTextObject*>(nullptr) ),
-    pNewEditData( static_cast<EditTextObject*>(nullptr) ),
-    bIsAutomatic( false )
+    pNewEditData( static_cast<EditTextObject*>(nullptr) )
 {
     ScDocumentPool* pPool = pDocShell->GetDocument().GetPool();
     pNewPattern = const_cast<ScPatternAttr*>(static_cast<const ScPatternAttr*>( &pPool->Put( *pNewPat ) ));
@@ -141,17 +140,6 @@ void ScUndoCursorAttr::Undo()
 {
     BeginUndo();
     DoChange(pOldPattern, pOldEditData);
-
-    if ( bIsAutomatic )
-    {
-        // if automatic formatting is reversed, then
-        // automatic formatting should also not continue to be done
-
-        ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-        if (pViewShell)
-            pViewShell->ForgetFormatArea();
-    }
-
     EndUndo();
 }
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6d17141a85af..10759313f1e2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -211,11 +211,9 @@ private:
     VclPtr<ScGridWindow>   pGridWin;
     SCCOL           nCol;
     SCROW           nRow;
-    bool            bButtonDown;
     bool            bInit;
     bool            bCancelled;
     bool            bInSelect;
-    bool            mbListHasDates;
     sal_uLong           nSel;
     ScFilterBoxMode eMode;
 
@@ -238,7 +236,6 @@ public:
     bool            IsInInit() const        { return bInit; }
     void            SetCancelled()          { bCancelled = true; }
     bool            IsInSelect() const      { return bInSelect; }
-    bool            HasDates() const        { return mbListHasDates; }
 };
 
 //  ListBox in a FloatingWindow (pParent)
@@ -248,11 +245,9 @@ ScFilterListBox::ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid,
     pGridWin( pGrid ),
     nCol( nNewCol ),
     nRow( nNewRow ),
-    bButtonDown( false ),
     bInit( true ),
     bCancelled( false ),
     bInSelect( false ),
-    mbListHasDates(false),
     nSel( 0 ),
     eMode( eNewMode )
 {
@@ -322,13 +317,10 @@ void ScFilterListBox::SelectHdl()
         if ( LISTBOX_ENTRY_NOTFOUND != nPos )
         {
             nSel = nPos;
-            if (!bButtonDown)
-            {
-                // #i81298# set bInSelect flag, so the box isn't deleted from modifications within FilterSelect
-                bInSelect = true;
-                pGridWin->FilterSelect( nSel );
-                bInSelect = false;
-            }
+            // #i81298# set bInSelect flag, so the box isn't deleted from modifications within FilterSelect
+            bInSelect = true;
+            pGridWin->FilterSelect( nSel );
+            bInSelect = false;
         }
     }
 }
@@ -465,7 +457,6 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos
             nDragEndX( -1 ),
             nDragEndY( -1 ),
             meDragInsertMode( INS_NONE ),
-            nCurrentPointer( 0 ),
             aComboButton( this ),
             aCurMousePos( 0,0 ),
             nPaintCount( 0 ),
@@ -1244,7 +1235,7 @@ void ScGridWindow::FilterSelect( sal_uLong nSel )
             ExecDataSelect(nCol, nRow, aString);
             break;
         case SC_FILTERBOX_FILTER:
-            ExecFilter(nSel, nCol, nRow, aString, mpFilterBox->HasDates());
+            ExecFilter(nSel, nCol, nRow, aString, false/*bHasDates*/);
             break;
         case SC_FILTERBOX_SCENARIO:
             pViewData->GetView()->UseScenario(aString);
@@ -1401,7 +1392,6 @@ void ScGridWindow::ExecFilter( sal_uLong nSel,
 
 void ScGridWindow::SetPointer( const Pointer& rPointer )
 {
-    nCurrentPointer = 0;
     Window::SetPointer( rPointer );
 }
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 2af8395915a3..51837a3c443d 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1666,7 +1666,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
     bDontSwitch(false),
     bInFormatDialog(false),
     bReadOnly(false),
-    bChartAreaValid(false),
     bForceFocusOnCurCell(false),
     nCurRefDlgId(0),
     pAccessibilityBroadcaster(nullptr),
@@ -1815,7 +1814,7 @@ bool ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SC
     rSource = aChartSource;
     rDest   = aChartPos;
     rTab    = nChartDestTab;
-    return bChartAreaValid;
+    return false;
 }
 
 ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings()