sw/source/ui/inc/view.hxx | 1 - sw/source/ui/ribbar/workctrl.cxx | 1 - sw/source/ui/uiview/viewmdi.cxx | 20 -------------------- sw/source/ui/uiview/viewsrch.cxx | 2 -- 4 files changed, 24 deletions(-)
New commits: commit a50a2111a31e4d9dd5e2659a146e9de8e292de75 Author: Stephan Bergmann <[email protected]> Date: Thu Nov 21 10:19:42 2013 +0100 Appears SwView::SetMoveType no longer really does anything ...after 3e8fe4d8e19be2ccd8f5bb898530e2f615a90321 "Remove the Navigator buttons below the scrollbar in Writer." Change-Id: Iafef7e3ae1bd1c272c25759cf5abcaf96d6aeb94 diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index f9481bd..3cdd59c 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -483,7 +483,6 @@ public: static Dialog* GetSearchDialog(); static sal_uInt16 GetMoveType(); - static void SetMoveType(sal_uInt16 nSet); DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416# static void SetActMark(sal_Int32 nSet); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index a9c96c7..f9fccd5 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -546,7 +546,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet) sal_uInt16 nSet = pSet->GetCurItemId(); if( nSet != NID_PREV && nSet != NID_NEXT ) { - SwView::SetMoveType(nSet); aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]); aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + NID_COUNT]); aInfoField.SetText(aToolBox.GetItemText(nSet)); diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index b8fc3e0..5934bc3 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -57,9 +57,6 @@ sal_uInt16 SwView::m_nMoveType = NID_PGE; sal_Int32 SwView::m_nActMark = 0; - -#define VIEW_IMAGECOLOR COL_LIGHTBLUE - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -563,23 +560,6 @@ sal_uInt16 SwView::GetMoveType() return m_nMoveType; } -void SwView::SetMoveType(sal_uInt16 nSet) -{ - sal_Bool bLastPage = m_nMoveType == NID_PGE; - m_nMoveType = nSet; - sal_Bool bNewPage = m_nMoveType == NID_PGE; - if(bNewPage != bLastPage) - { - Color aColor(bNewPage ? COL_BLACK : VIEW_IMAGECOLOR); - const TypeId aTypeId = TYPE(SwView); - SwView* pView = (SwView*)SfxViewShell::GetFirst(&aTypeId); - while( pView ) - { - pView = (SwView*)SfxViewShell::GetNext(*pView, &aTypeId); - } - } -} - void SwView::SetActMark(sal_Int32 nSet) { m_nActMark = nSet; diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index e81b4b7..a280dc7 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -165,8 +165,6 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) case FID_SEARCH_NOW: { { - if(FID_SEARCH_NOW == nSlot && !rReq.IsAPI()) - SwView::SetMoveType(NID_SRCH_REP); if ( pWrp ) { m_pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog ()); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
