Kaydet (Commit) a874d2a9 authored tarafından Michael Stahl's avatar Michael Stahl

sw: remove unused CrsrFlag::NOCALRECT

Change-Id: I985ac3eea9ebb780821ab4fffd460935be5e536d
üst 238e07dd
......@@ -156,8 +156,7 @@ public:
UPDOWN = (1 << 0), ///< keep Up/Down on columns
SCROLLWIN = (1 << 1), ///< scroll window
CHKRANGE = (1 << 2), ///< check overlapping PaMs
NOCALRECT = (1 << 3), ///< don't recalculate CharRect
READONLY = (1 << 4) ///< make visible in spite of Readonly
READONLY = (1 << 3) ///< make visible in spite of Readonly
};
private:
......
......@@ -1724,44 +1724,36 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
}
} while( bAgainst );
if( !( eFlags & SwCrsrShell::NOCALRECT ))
{
SwCrsrMoveState aTmpState( m_eMvState );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
aTmpState.bRealHeight = true;
aTmpState.bRealWidth = IsOverwriteCrsr();
aTmpState.nCursorBidiLevel = pShellCrsr->GetCrsrBidiLevel();
// #i27615#,#i30453#
SwSpecialPos aSpecialPos;
aSpecialPos.nExtendRange = SwSPExtendRange::BEFORE;
if (pShellCrsr->IsInFrontOfLabel())
{
aTmpState.pSpecialPos = &aSpecialPos;
}
SwCrsrMoveState aTmpState( m_eMvState );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
aTmpState.bRealHeight = true;
aTmpState.bRealWidth = IsOverwriteCrsr();
aTmpState.nCursorBidiLevel = pShellCrsr->GetCrsrBidiLevel();
++mnStartAction; // tdf#91602 prevent recursive Action!
if( !pFrm->GetCharRect( m_aCharRect, *pShellCrsr->GetPoint(), &aTmpState ) )
{
Point& rPt = pShellCrsr->GetPtPos();
rPt = m_aCharRect.Center();
pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
}
--mnStartAction;
// #i27615#,#i30453#
SwSpecialPos aSpecialPos;
aSpecialPos.nExtendRange = SwSPExtendRange::BEFORE;
if (pShellCrsr->IsInFrontOfLabel())
{
aTmpState.pSpecialPos = &aSpecialPos;
}
if( !pShellCrsr->HasMark() )
m_aCrsrHeight = aTmpState.aRealHeight;
else
{
m_aCrsrHeight.setX(0);
m_aCrsrHeight.setY(aTmpState.aRealHeight.getY() < 0 ?
-m_aCharRect.Width() : m_aCharRect.Height());
}
++mnStartAction; // tdf#91602 prevent recursive Action!
if( !pFrm->GetCharRect( m_aCharRect, *pShellCrsr->GetPoint(), &aTmpState ) )
{
Point& rPt = pShellCrsr->GetPtPos();
rPt = m_aCharRect.Center();
pFrm->GetCrsrOfst( pShellCrsr->GetPoint(), rPt, &aTmpState );
}
--mnStartAction;
if( !pShellCrsr->HasMark() )
m_aCrsrHeight = aTmpState.aRealHeight;
else
{
m_aCrsrHeight.setX(0);
m_aCrsrHeight.setY(m_aCharRect.Height());
m_aCrsrHeight.setY(aTmpState.aRealHeight.getY() < 0 ?
-m_aCharRect.Width() : m_aCharRect.Height());
}
if( !bFirst && aOld == m_aCharRect )
......
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