[Libreoffice-commits] core.git: sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jul 5 06:35:13 UTC 2017
sw/inc/view.hxx | 2 +-
sw/source/core/inc/frmtool.hxx | 4 ++--
sw/source/core/layout/flowfrm.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 8 ++++----
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 4 ++--
sw/source/core/text/txtfly.cxx | 4 ++--
sw/source/uibase/uiview/viewling.cxx | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 1db4ada4fc3a3bf1bd6b6d27bb17867cfb7b4709
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jul 4 13:28:55 2017 +0200
rename some Kontext methods to Context
Change-Id: Ida1a75672d12a053dbc4fb2739d2ba6f1417463c
Reviewed-on: https://gerrit.libreoffice.org/39502
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 67e024ed3e16..7181997dd24c 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -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
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index 2f4f2d8d9e6c..31f96590cd8b 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -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 );
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 0d80955af0bd..aa11035d2a3c 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -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 )
{
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index ab0091f2efcd..13ff43808217 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -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;
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 72b878876c94..a865228d5b4f 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -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();
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 7d3beb76f5c3..d4695488382e 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -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() ) &&
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index bda2d5cf53d1..37e62f4f2450 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -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
More information about the Libreoffice-commits
mailing list