diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-02-25 22:21:52 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-02-26 13:09:41 +0100 |
commit | c4727a06fe16ed88f2c293aaa3506df8e6523678 (patch) | |
tree | 70062c1264179457a2b880c895ab5c292b21071e /sw | |
parent | bf250abe262a25e6508a6dd0c0b7f3275d93e216 (diff) |
sw: we don't have space to spell out "focus" in ShLooseFcs...
...but we *do* have the space to mis-spell "lose".
Change-Id: I0cb55d616dfee614e82975b7b3c25a0dcc37d0d7
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/crsrsh.hxx | 6 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/frmedt/fews.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/layout/layact.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view1.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 6 |
8 files changed, 19 insertions, 19 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index aefacf20b9b4..f3850ebf6852 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -448,9 +448,9 @@ public: * On the other hand, on receiving the focus all selected ranges are displayed again * (ranges must be recalculated!). */ - bool HasShFcs() const { return m_bHasFocus; } - void ShLooseFcs(); - void ShGetFcs( bool bUpdate = true ); + bool HasShellFocus() const { return m_bHasFocus; } + void ShellLoseFocus(); + void ShellGetFocus( bool bUpdate = true ); // Methods for displaying or hiding the visible text cursor. void ShowCursor(); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 3ee18574b0c8..27ce4a6b768d 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -591,8 +591,8 @@ public: Point GetRelativePagePosition(const Point& rDocPos); /// Hide or show layout-selection and pass call to CursorSh. - void ShLooseFcs(); - void ShGetFcs( bool bUpdate = true ); + void ShellLoseFocus(); + void ShellGetFocus( bool bUpdate = true ); /// PageDescriptor-interface void ChgCurPageDesc( const SwPageDesc& ); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index d4bff232657f..88f7fe26727b 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2176,14 +2176,14 @@ void SwCursorShell::HideCursor() } } -void SwCursorShell::ShLooseFcs() +void SwCursorShell::ShellLoseFocus() { if( !m_bBasicHideCursor ) HideCursors(); m_bHasFocus = false; } -void SwCursorShell::ShGetFcs( bool bUpdate ) +void SwCursorShell::ShellGetFocus( bool bUpdate ) { m_bHasFocus = true; if( !m_bBasicHideCursor && VisArea().Width() ) diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index dc7939dfbdde..5c95c4d43e6c 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -567,7 +567,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, } } - if( this != pDestShell && !pDestShell->HasShFcs() ) + if (this != pDestShell && !pDestShell->HasShellFocus()) pDestShell->Imp()->GetDrawView()->hideMarkHandles(); } } diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index b5fb02327a68..658b0bb174d9 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -275,10 +275,10 @@ FrameTypeFlags SwFEShell::GetFrameType( const Point *pPt, bool bStopAtFly ) cons return nReturn; } -void SwFEShell::ShGetFcs( bool bUpdate ) +void SwFEShell::ShellGetFocus( bool bUpdate ) { ::SetShell( this ); - SwCursorShell::ShGetFcs( bUpdate ); + SwCursorShell::ShellGetFocus( bUpdate ); if ( HasDrawView() ) { @@ -288,9 +288,9 @@ void SwFEShell::ShGetFcs( bool bUpdate ) } } -void SwFEShell::ShLooseFcs() +void SwFEShell::ShellLoseFocus() { - SwCursorShell::ShLooseFcs(); + SwCursorShell::ShellLoseFocus(); if ( HasDrawView() && Imp()->GetDrawView()->AreObjectsMarked() ) { diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 4b026079ac87..66a914e7385b 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2236,9 +2236,9 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) : // to fill the virtual device. This fill don't have // paint the selection! -> Set the focus flag at // CursorShell and it doesn't paint the selection. - pCursorShell->ShLooseFcs(); + pCursorShell->ShellLoseFocus(); pCursorShell->UnlockPaint( true ); - pCursorShell->ShGetFcs( false ); + pCursorShell->ShellGetFocus( false ); } else rSh.UnlockPaint( true ); diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index 3f9b047da6a7..a65e31d7f966 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -71,7 +71,7 @@ void SwView::Activate(bool bMDIActivate) if ( bMDIActivate ) { - m_pWrtShell->ShGetFcs(false); // Selections visible + m_pWrtShell->ShellGetFocus(false); // Selections visible if( !m_sSwViewData.isEmpty() ) { @@ -123,7 +123,7 @@ void SwView::Deactivate(bool bMDIActivate) if( bMDIActivate ) { - m_pWrtShell->ShLooseFcs(); // Selections invisible + m_pWrtShell->ShellLoseFocus(); // Selections invisible m_pHRuler->SetActive( false ); m_pVRuler->SetActive( false ); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 075802f97d52..84f06ec923f3 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1925,9 +1925,9 @@ bool SwView::JumpToSwMark( const OUString& rMark ) SetCursorAtTop( true ); // For scrolling the FrameSet, the corresponding shell needs to have the focus. - bool bHasShFocus = m_pWrtShell->HasShFcs(); + bool bHasShFocus = m_pWrtShell->HasShellFocus(); if( !bHasShFocus ) - m_pWrtShell->ShGetFcs( false ); + m_pWrtShell->ShellGetFocus( false ); const SwFormatINetFormat* pINet; OUString sCmp; @@ -2047,7 +2047,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) SetCursorAtTop( bSaveCT, bSaveCC ); if( !bHasShFocus ) - m_pWrtShell->ShLooseFcs(); + m_pWrtShell->ShellLoseFocus(); } return bRet; } |