diff options
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.hxx | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 95084beb5504..f121c2139475 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 cc1e9e53c20d..3c966267e2bf 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; |