strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move ensureDocumentFormatted from EditEngine to ImpEditEngine

Browse source 
so we have the implementation in one class, instead of bouncing
back and forth between two.

Change-Id: I851578ff553b01fb7d48cf5aa8f7a2d795496751
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169340
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin 2024-06-21 17:36:06 +02:00 committed by Noel Grandin
parent 76c96ca7c9
commit 6e3cefc89e
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editeng/source/editeng/editeng.cxx
View file

@ -420,12 +420,6 @@ sal_Int32 EditEngine::GetParagraphCount() const
return getImpl().maEditDoc.Count();
}
void EditEngine::ensureDocumentFormatted() const
{
if (!getImpl().IsFormatted())
getImpl().FormatDoc();
}
sal_Int32 EditEngine::GetLineCount( sal_Int32 nParagraph ) const
{
return getImpl().GetLineCount(nParagraph);
@ -459,7 +453,7 @@ tools::Rectangle EditEngine::GetParaBounds( sal_Int32 nPara )
sal_uInt32 EditEngine::GetTextHeight( sal_Int32 nParagraph ) const
{
ensureDocumentFormatted();
getImpl().EnsureDocumentFormatted();
sal_uInt32 nHeight = getImpl().GetParaHeight(nParagraph);
return nHeight;
}
@ -801,14 +795,14 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
sal_uInt32 EditEngine::GetTextHeight() const
{
ensureDocumentFormatted();
getImpl().EnsureDocumentFormatted();
sal_uInt32 nHeight = !IsEffectivelyVertical() ? getImpl().GetTextHeight() : getImpl().CalcTextWidth( true );
return nHeight;
}
sal_uInt32 EditEngine::CalcTextWidth()
{
ensureDocumentFormatted();
getImpl().EnsureDocumentFormatted();
sal_uInt32 nWidth = !IsEffectivelyVertical() ? getImpl().CalcTextWidth(true) : getImpl().GetTextHeight();
return nWidth;
}
@ -1147,7 +1141,7 @@ tools::Long EditEngine::GetFirstLineStartX( sal_Int32 nParagraph )
if ( pPPortion )
{
DBG_ASSERT(getImpl().IsFormatted() || !getImpl().IsFormatting(), "GetFirstLineStartX: Doc not formatted - unable to format!");
ensureDocumentFormatted();
getImpl().EnsureDocumentFormatted();
const EditLine& rFirstLine = pPPortion->GetLines()[0];
nX = rFirstLine.GetStartPosX();
}
@ -1192,7 +1186,7 @@ bool EditEngine::IsRightToLeft( sal_Int32 nPara ) const
bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
{
ensureDocumentFormatted();
getImpl().EnsureDocumentFormatted();
// take unrotated positions for calculation here
Point aDocPos = GetDocPos( rPaperPos );
@ -1580,7 +1574,7 @@ tools::Rectangle EditEngine::GetCharacterBounds( const EPosition& rPos ) const
ParagraphInfos EditEngine::GetParagraphInfos( sal_Int32 nPara )
{
// This only works if not already in the format ...
ensureDocumentFormatted();
getImpl().EnsureDocumentFormatted();
ParagraphInfos aInfos;
aInfos.bValid = getImpl().IsFormatted();

1
editeng/source/editeng/impedit.hxx
View file

@ -988,6 +988,7 @@ public:
void ScaleContentToFitWindow(o3tl::sorted_vector<sal_Int32>& rRepaintParagraphs);
void FormatDoc();
void FormatFullDoc();
void EnsureDocumentFormatted();
void Draw( OutputDevice& rOutDev, const Point& rStartPos, Degree10 nOrientation );
void Draw( OutputDevice& rOutDev, const tools::Rectangle& rOutRect, const Point& rStartDocPos, bool bClip );

6
editeng/source/editeng/impedit3.cxx
View file

@ -500,6 +500,12 @@ void ImpEditEngine::ScaleContentToFitWindow(o3tl::sorted_vector<sal_Int32>& aRep
}
}
void ImpEditEngine::EnsureDocumentFormatted()
{
if (!IsFormatted())
FormatDoc();
}
void ImpEditEngine::FormatDoc()
{
if (!IsUpdateLayout() || IsFormatting())

1
include/editeng/editeng.hxx
View file

@ -196,7 +196,6 @@ private:
SAL_DLLPRIVATE bool HasText() const;
SAL_DLLPRIVATE const EditSelectionEngine& GetSelectionEngine() const;
SAL_DLLPRIVATE void SetInSelectionMode(bool b);
SAL_DLLPRIVATE void ensureDocumentFormatted() const;
public:
EditEngine(SfxItemPool* pItemPool);