Kaydet (Commit) 1db4ada4 authored tarafından Noel Grandin's avatar Noel Grandin

rename some Kontext methods to Context

Change-Id: Ida1a75672d12a053dbc4fb2739d2ba6f1417463c
Reviewed-on: https://gerrit.libreoffice.org/39502Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 2b487c2a
......@@ -308,7 +308,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs );
SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
SAL_DLLPRIVATE void SpellKontext(bool bOn = true)
SAL_DLLPRIVATE void SpellContext(bool bOn = true)
{ m_bCenterCursor = bOn; }
// for readonly switching
......
......@@ -148,9 +148,9 @@ const SwFrame* GetVirtualUpper( const SwFrame* pFrame, const Point& rPos );
bool Is_Lower_Of( const SwFrame *pCurrFrame, const SdrObject* pObj );
// FIXME: EasyHack (refactoring): rename method and parameter name in all files
const SwFrame *FindKontext( const SwFrame *pFrame, SwFrameType nAdditionalKontextTyp );
const SwFrame *FindContext( const SwFrame *pFrame, SwFrameType nAdditionalContextTyp );
bool IsFrameInSameKontext( const SwFrame *pInnerFrame, const SwFrame *pFrame );
bool IsFrameInSameContext( const SwFrame *pInnerFrame, const SwFrame *pFrame );
const SwFrame * FindPage( const SwRect &rRect, const SwFrame *pPage );
......
......@@ -325,7 +325,7 @@ sal_uInt8 SwFlowFrame::BwdMoveNecessary( const SwPageFrame *pPage, const SwRect
// Don't do this if the object is anchored behind me in the text
// flow, because then I wouldn't evade it.
if ( ::IsFrameInSameKontext( pAnchor, &m_rThis ) )
if ( ::IsFrameInSameContext( pAnchor, &m_rThis ) )
{
if ( rFormat.GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PARA )
{
......
......@@ -3058,7 +3058,7 @@ bool Is_Lower_Of(const SwFrame *pCurrFrame, const SdrObject* pObj)
}
/// provides the area of a frame in that no Fly from another area can overlap
const SwFrame *FindKontext( const SwFrame *pFrame, SwFrameType nAdditionalContextType )
const SwFrame *FindContext( const SwFrame *pFrame, SwFrameType nAdditionalContextType )
{
const SwFrameType nTyp = SwFrameType::Root | SwFrameType::Header | SwFrameType::Footer | SwFrameType::FtnCont |
SwFrameType::Ftn | SwFrameType::Fly |
......@@ -3072,9 +3072,9 @@ const SwFrame *FindKontext( const SwFrame *pFrame, SwFrameType nAdditionalContex
return pFrame;
}
bool IsFrameInSameKontext( const SwFrame *pInnerFrame, const SwFrame *pFrame )
bool IsFrameInSameContext( const SwFrame *pInnerFrame, const SwFrame *pFrame )
{
const SwFrame *pKontext = FindKontext( pInnerFrame, SwFrameType::None );
const SwFrame *pContext = FindContext( pInnerFrame, SwFrameType::None );
const SwFrameType nTyp = SwFrameType::Root | SwFrameType::Header | SwFrameType::Footer | SwFrameType::FtnCont |
SwFrameType::Ftn | SwFrameType::Fly |
......@@ -3082,7 +3082,7 @@ bool IsFrameInSameKontext( const SwFrame *pInnerFrame, const SwFrame *pFrame )
do
{ if ( pFrame->GetType() & nTyp )
{
if( pFrame == pKontext )
if( pFrame == pContext )
return true;
if( pFrame->IsCellFrame() )
return false;
......
......@@ -928,7 +928,7 @@ SwTwips SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside(
const sal_uInt32 nObjOrdNum = GetObject().GetOrdNum();
const SwPageFrame* pObjPage = rFlyAtContentFrame.FindPageFrame();
const SwFrame* pObjContext = ::FindKontext( &rAnchorTextFrame, SwFrameType::Column );
const SwFrame* pObjContext = ::FindContext( &rAnchorTextFrame, SwFrameType::Column );
sal_uLong nObjIndex = rAnchorTextFrame.GetTextNode()->GetIndex();
SwOrderIter aIter( pObjPage );
const SwFlyFrame* pFly = static_cast<const SwVirtFlyDrawObj*>(aIter.Bottom())->GetFlyFrame();
......@@ -1037,7 +1037,7 @@ bool SwAnchoredObjectPosition::DrawAsideFly( const SwFlyFrame* _pFly,
if ( _pFly->IsFlyAtContentFrame() &&
aRectFnSet.BottomDist( _pFly->Frame(), aRectFnSet.GetTop(_rObjRect) ) < 0 &&
aRectFnSet.BottomDist( _rObjRect, aRectFnSet.GetTop(_pFly->Frame()) ) < 0 &&
::FindKontext( _pFly->GetAnchorFrame(), SwFrameType::Column ) == _pObjContext )
::FindContext( _pFly->GetAnchorFrame(), SwFrameType::Column ) == _pObjContext )
{
sal_uLong nOtherIndex =
static_cast<const SwTextFrame*>(_pFly->GetAnchorFrame())->GetTextNode()->GetIndex();
......
......@@ -791,14 +791,14 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj,
const IDocumentSettingAccess* pIDSA = pCurrFrame->GetTextNode()->getIDocumentSettingAccess();
if ( ( pIDSA->get(DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION) ||
!pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) ) &&
::FindKontext( pTmp, SwFrameType::None ) == ::FindKontext( pCurrFrame, SwFrameType::None ) )
::FindContext( pTmp, SwFrameType::None ) == ::FindContext( pCurrFrame, SwFrameType::None ) )
{
return true;
}
const SwFrame* pHeader = nullptr;
if ( pCurrFrame->GetNext() != pTmp &&
( IsFrameInSameKontext( pTmp, pCurrFrame ) ||
( IsFrameInSameContext( pTmp, pCurrFrame ) ||
// #i13832#, #i24135# wrap around objects in page header
( !pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) &&
nullptr != ( pHeader = pTmp->FindFooterOrHeader() ) &&
......
......@@ -234,7 +234,7 @@ void SwView::StartTextConversion(
return;
}
SpellKontext();
SpellContext();
const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions();
const bool bOldIdle = pVOpt->IsIdle();
......@@ -260,7 +260,7 @@ void SwView::StartTextConversion(
m_pWrtShell->SetInsMode( bOldIns );
pVOpt->SetIdle( bOldIdle );
SpellKontext(false);
SpellContext(false);
}
// spellcheck and text conversion related stuff
......
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