Kaydet (Commit) 6abdd2d9 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Redundant mpCurrentView (always = mpLocalView)

Change-Id: Ida05d4cb97ace166472ee9f256065e4c420c3a7a
üst 2dfcbfbd
...@@ -146,7 +146,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : ...@@ -146,7 +146,6 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
get(mpAllRecentThumbnails, "all_recent"); get(mpAllRecentThumbnails, "all_recent");
get(mpLocalView, "local_view"); get(mpLocalView, "local_view");
mpCurrentView = mpLocalView;
maDndWindows.push_back(mpAllRecentThumbnails); maDndWindows.push_back(mpAllRecentThumbnails);
...@@ -265,9 +264,6 @@ void BackingWindow::initControls() ...@@ -265,9 +264,6 @@ void BackingWindow::initControls()
mpLocalView->Hide(); mpLocalView->Hide();
mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_NONE)); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
mpCurrentView = mpLocalView;
mpTemplateButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED ); mpTemplateButton->SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
//set handlers //set handlers
...@@ -556,7 +552,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) ...@@ -556,7 +552,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
else if( pButton == mpTemplateButton ) else if( pButton == mpTemplateButton )
{ {
mpAllRecentThumbnails->Hide(); mpAllRecentThumbnails->Hide();
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_NONE)); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_NONE));
mpLocalView->Show(); mpLocalView->Show();
mpLocalView->reload(); mpLocalView->reload();
mpLocalView->GrabFocus(); mpLocalView->GrabFocus();
...@@ -570,19 +566,19 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton ) ...@@ -570,19 +566,19 @@ IMPL_LINK( BackingWindow, MenuSelectHdl, MenuButton*, pButton )
if( sId == "filter_writer" ) if( sId == "filter_writer" )
{ {
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_WRITER)); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_WRITER));
} }
else if( sId == "filter_calc" ) else if( sId == "filter_calc" )
{ {
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_CALC)); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_CALC));
} }
else if( sId == "filter_impress" ) else if( sId == "filter_impress" )
{ {
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS)); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_IMPRESS));
} }
else if( sId == "filter_draw" ) else if( sId == "filter_draw" )
{ {
mpCurrentView->filterItems(ViewFilter_Application(FILTER_APP_DRAW)); mpLocalView->filterItems(ViewFilter_Application(FILTER_APP_DRAW));
} }
else if( sId == "edit" ) else if( sId == "edit" )
{ {
......
...@@ -87,7 +87,6 @@ class BackingWindow ...@@ -87,7 +87,6 @@ class BackingWindow
RecentDocsView* mpAllRecentThumbnails; RecentDocsView* mpAllRecentThumbnails;
TemplateDefaultView* mpLocalView; TemplateDefaultView* mpLocalView;
TemplateAbstractView* mpCurrentView;
std::vector<vcl::Window*> maDndWindows; std::vector<vcl::Window*> maDndWindows;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment