loplugin:singlevalfields in sc..vcl

Change-Id: I68752a3daf5ddd8581c07759b8be2c1dabbb9258

5 files changed, 1 insertions, 33 deletions

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 7357d79780c2..0df9c0e893d2 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -115,8 +115,6 @@ struct SfxDispatcher_Impl
         for (SfxRequestPtrArray::iterator aI = aReqArr.begin(), aEnd = aReqArr.end(); aI != aEnd; ++aI)
             delete *aI;
     }
-    const SfxSlotServer* pCachedServ1;  // last called message
-    const SfxSlotServer* pCachedServ2;  // penultimate called Message
     SfxShellStack_Impl   aStack;        // active functionality
     Idle                 aIdle;        // for Flush
     std::deque<SfxToDo_Impl> aToDoStack;    // not processed Push/Pop
@@ -425,8 +423,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
     xImp.reset(new SfxDispatcher_Impl);
     xImp->bFlushed = true;
 
-    xImp->pCachedServ1 = nullptr;
-    xImp->pCachedServ2 = nullptr;
     xImp->bFlushing = false;
     xImp->bUpdated = false;
     xImp->bLocked = false;
@@ -1579,12 +1575,6 @@ void SfxDispatcher::FlushImpl()
     // Invalidate bindings, if possible
     if ( !pSfxApp->IsDowning() )
     {
-        if ( bModify )
-        {
-            xImp->pCachedServ1 = nullptr;
-            xImp->pCachedServ2 = nullptr;
-        }
-
         InvalidateBindings_Impl( bModify );
     }
 
@@ -2187,8 +2177,6 @@ void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell )
     if ( !SfxGetpApp()->IsDowning() )
     {
         xImp->bUpdated = false;
-        xImp->pCachedServ1 = nullptr;
-        xImp->pCachedServ2 = nullptr;
         InvalidateBindings_Impl(true);
     }
 }
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index d9b0bc1ef4ec..b10302044c4b 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -128,8 +128,8 @@ namespace {
 class WaitWindow_Impl : public WorkWindow
 {
     Rectangle     maRect;
-    DrawTextFlags mnTextStyle;
     OUString      maText;
+    static const DrawTextFlags mnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine;
 
 public:
     WaitWindow_Impl();
@@ -2351,7 +2351,6 @@ void SAL_CALL SfxDocTplService::update()
 WaitWindow_Impl::WaitWindow_Impl() : WorkWindow(nullptr, WB_BORDER | WB_3DLOOK)
 {
     Rectangle aRect = Rectangle(0, 0, 300, 30000);
-    mnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine;
     maText = SfxResId(RID_CNT_STR_WAITING).toString();
     maRect = GetTextRect(aRect, maText, mnTextStyle);
     aRect = maRect;
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 201664b1c705..5dfaf72859fd 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1149,8 +1149,6 @@ void SfxObjectShell::FinishedLoading( SfxLoadedFlags nFlags )
         pImpl->nFlagsInProgress |= SfxLoadedFlags::MAINDOCUMENT;
         static_cast<SfxHeaderAttributes_Impl*>(GetHeaderAttributes())->SetAttributes();
         pImpl->bImportDone = true;
-        if( !IsAbortingImport() )
-            PositionView_Impl();
 
         if ( ( GetModifyPasswordHash() || GetModifyPasswordInfo().getLength() ) && !IsModifyPasswordEntered() )
             SetReadOnly();
@@ -1324,21 +1322,6 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
 }
 
 
-void SfxObjectShell::PositionView_Impl()
-{
-    MarkData_Impl *pMark = Get_Impl()->pMarkData;
-    if( pMark )
-    {
-        SfxViewShell* pSh = pMark->pFrame->GetViewShell();
-        if( !pMark->aUserData.isEmpty() )
-            pSh->ReadUserData( pMark->aUserData, true );
-        else if( !pMark->aMark.isEmpty() )
-            pSh->JumpToMark( pMark->aMark );
-        DELETEZ( Get_Impl()->pMarkData );
-    }
-}
-
-
 bool SfxObjectShell::IsLoading() const
 /*  [Description]
 
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 5ce07891d709..7f92db707fc3 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -243,7 +243,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
     ,lErr(ERRCODE_NONE)
     ,nEventId ( 0)
     ,pReloadTimer ( nullptr)
-    ,pMarkData( nullptr )
     ,nLoadedFlags ( SfxLoadedFlags::ALL )
     ,nFlagsInProgress( SfxLoadedFlags::NONE )
     ,bModalMode( false )
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 22cb4c660e39..ca9c81a8b1e3 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -109,7 +109,6 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
     sal_uInt16          nEventId;           // If Open/Create as to be sent
                                             // before Activate
     AutoReloadTimer_Impl *pReloadTimer;
-    MarkData_Impl*      pMarkData;
     SfxLoadedFlags      nLoadedFlags;
     SfxLoadedFlags      nFlagsInProgress;
     bool                bModalMode;