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

Appears SwView::SetMoveType no longer really does anything

...after 3e8fe4d8 "Remove the Navigator buttons
below the scrollbar in Writer."

Change-Id: Iafef7e3ae1bd1c272c25759cf5abcaf96d6aeb94
üst 09e2349c
...@@ -483,7 +483,6 @@ public: ...@@ -483,7 +483,6 @@ public:
static Dialog* GetSearchDialog(); static Dialog* GetSearchDialog();
static sal_uInt16 GetMoveType(); static sal_uInt16 GetMoveType();
static void SetMoveType(sal_uInt16 nSet);
DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416# DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416#
static void SetActMark(sal_Int32 nSet); static void SetActMark(sal_Int32 nSet);
......
...@@ -546,7 +546,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet) ...@@ -546,7 +546,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
sal_uInt16 nSet = pSet->GetCurItemId(); sal_uInt16 nSet = pSet->GetCurItemId();
if( nSet != NID_PREV && nSet != NID_NEXT ) if( nSet != NID_PREV && nSet != NID_NEXT )
{ {
SwView::SetMoveType(nSet);
aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]); aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]);
aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + NID_COUNT]); aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + NID_COUNT]);
aInfoField.SetText(aToolBox.GetItemText(nSet)); aInfoField.SetText(aToolBox.GetItemText(nSet));
......
...@@ -57,9 +57,6 @@ ...@@ -57,9 +57,6 @@
sal_uInt16 SwView::m_nMoveType = NID_PGE; sal_uInt16 SwView::m_nMoveType = NID_PGE;
sal_Int32 SwView::m_nActMark = 0; sal_Int32 SwView::m_nActMark = 0;
#define VIEW_IMAGECOLOR COL_LIGHTBLUE
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame; using namespace ::com::sun::star::frame;
...@@ -563,23 +560,6 @@ sal_uInt16 SwView::GetMoveType() ...@@ -563,23 +560,6 @@ sal_uInt16 SwView::GetMoveType()
return m_nMoveType; 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) void SwView::SetActMark(sal_Int32 nSet)
{ {
m_nActMark = nSet; m_nActMark = nSet;
......
...@@ -165,8 +165,6 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) ...@@ -165,8 +165,6 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage)
case FID_SEARCH_NOW: case FID_SEARCH_NOW:
{ {
{ {
if(FID_SEARCH_NOW == nSlot && !rReq.IsAPI())
SwView::SetMoveType(NID_SRCH_REP);
if ( pWrp ) if ( pWrp )
{ {
m_pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog ()); m_pSrchDlg = static_cast <SvxSearchDialog*> (pWrp->getDialog ());
......
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