[Libreoffice-commits] core.git: sfx2/source

[Stephan Bergmann]

 sfx2/source/dialog/backingwindow.cxx |   14 +++++---------
 sfx2/source/dialog/backingwindow.hxx |    1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 6abdd2d963740afaac0b744f7b96d75ce375bd49
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 3 16:02:43 2014 +0100

    Redundant mpCurrentView (always = mpLocalView)
    
    Change-Id: Ida05d4cb97ace166472ee9f256065e4c420c3a7a

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 95084be..f121c21 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -146,7 +146,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 
     get(mpAllRecentThumbnails, "all_recent");
     get(mpLocalView, "local_view");
-    mpCurrentView = mpLocalView;
 
     maDndWindows.push_back(mpAllRecentThumbnails);
 
@@ -265,9 +264,6 @@ void BackingWindow::initControls()
     mpLocalView->Hide();
     mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
 
-
-    mpCurrentView = mpLocalView;
-
     mpTemplateButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 
     //set handlers
@@ -556,7 +552,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
     else if( pButton == mpTemplateButton )
     {
         mpAllRecentThumbnails->Hide();
-        mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
+        mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
         mpLocalView->Show();
         mpLocalView->reload();
         mpLocalView->GrabFocus();
@@ -570,19 +566,19 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton )
 
     if( sId == "filter_writer" )
     {
-        mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_WRITER));
+        mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_WRITER));
     }
     else if( sId == "filter_calc" )
     {
-        mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_CALC));
+        mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_CALC));
     }
     else if( sId == "filter_impress" )
     {
-        mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
+        mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
     }
     else if( sId == "filter_draw" )
     {
-        mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
+        mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
     }
     else if( sId == "edit" )
     {
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index cc1e9e5..3c96626 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -87,7 +87,6 @@ class BackingWindow
 
     RecentDocsView*                 mpAllRecentThumbnails;
     TemplateDefaultView*              mpLocalView;
-    TemplateAbstractView*           mpCurrentView;
 
     std::vector<vcl::Window*>            maDndWindows;