diff options
| author | Bryan Quigley <gquigs@gmail.com> | 2016-01-27 12:19:28 -0500 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-02-03 13:25:24 +0000 |
| commit | 2503a1e99df463aef1bf87c94b7b4a8ee3554efe (patch) | |
| tree | 7a4e5412188f578f2e5ac05b08292e65fc69b8d5 /sd/source/ui/view/drviewsd.cxx | |
| parent | 8db902785ed40ef388218bd5068f14f5d4bedd69 (diff) | |
tdf#96414 Remove showing navigator during slideshow
This isn't very user-friendly and the presenter console
does a much better job of this.
Change-Id: I621863b585d763fb65ed8637c3dab7b7f5ea7aed
Reviewed-on: https://gerrit.libreoffice.org/22062
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sd/source/ui/view/drviewsd.cxx')
| -rw-r--r-- | sd/source/ui/view/drviewsd.cxx | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index bfc7d1db0666..9c0129531b32 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -35,7 +35,6 @@ #include "sdpage.hxx" #include "drawdoc.hxx" #include "DrawDocShell.hxx" -#include "slideshow.hxx" #include "pgjump.hxx" #include "NavigatorChildWindow.hxx" #include "navigatr.hxx" @@ -71,12 +70,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) case SID_NAVIGATOR_PAGE: case SID_NAVIGATOR_OBJECT: { - rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); - if (xSlideshow.is() && xSlideshow->isRunning() ) - { - xSlideshow->receiveRequest( rReq ); - } - else if (nSId == SID_NAVIGATOR_PAGE) + if (nSId == SID_NAVIGATOR_PAGE) { if ( mpDrawView->IsTextEdit() ) mpDrawView->SdrEndTextEdit(); @@ -166,36 +160,15 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) bool bEndless = false; OUString aPageName; - rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); - if( xSlideshow.is() && xSlideshow->isRunning() ) - { - // pen activated? - nState |= xSlideshow->isDrawingPossible() ? NAVBTN_PEN_CHECKED : NAVBTN_PEN_UNCHECKED; - - nCurrentPage = (sal_uInt16)xSlideshow->getCurrentPageNumber(); - nFirstPage = (sal_uInt16)xSlideshow->getFirstPageNumber(); - nLastPage = (sal_uInt16)xSlideshow->getLastPageNumber(); - bEndless = xSlideshow->isEndless(); - - // Get the page for the current page number. - SdPage* pPage = nullptr; - if( nCurrentPage < GetDoc()->GetSdPageCount( PK_STANDARD ) ) - pPage = GetDoc()->GetSdPage (nCurrentPage, PK_STANDARD); + nState |= NAVBTN_PEN_DISABLED | NAVTLB_UPDATE; - if(pPage) - aPageName = pPage->GetName(); - } - else + if (mpActualPage != nullptr) { - nState |= NAVBTN_PEN_DISABLED | NAVTLB_UPDATE; - - if (mpActualPage != nullptr) - { - nCurrentPage = ( mpActualPage->GetPageNum() - 1 ) / 2; - aPageName = mpActualPage->GetName(); - } - nLastPage = GetDoc()->GetSdPageCount( mePageKind ) - 1; + nCurrentPage = ( mpActualPage->GetPageNum() - 1 ) / 2; + aPageName = mpActualPage->GetName(); } + nLastPage = GetDoc()->GetSdPageCount( mePageKind ) - 1; + // first page / previous page if( nCurrentPage == nFirstPage ) |