editeng/source/editeng/editeng.cxx | 18 ++++--------------
editeng/source/editeng/editview.cxx | 4 ++--
editeng/source/editeng/impedit.hxx | 6 +++---
editeng/source/editeng/impedit3.cxx | 8 ++++----
editeng/source/outliner/outlin2.cxx | 8 ++++----
editeng/source/outliner/outlvw.cxx | 4 ++--
forms/source/richtext/richtextimplcontrol.cxx | 2 +-
forms/source/richtext/richtextviewport.cxx | 2 +-
include/editeng/editeng.hxx | 6 ++----
include/editeng/editview.hxx | 2 +-
include/editeng/outliner.hxx | 6 +++---
sc/source/ui/dbgui/csvgrid.cxx | 2 +-
sc/source/ui/drawfunc/drtxtob.cxx | 2 +-
sc/source/ui/view/gridwin4.cxx | 6 +++---
sc/source/ui/view/output2.cxx | 16 ++++++++--------
sc/source/ui/view/preview.cxx | 2 +-
sc/source/ui/view/printfun.cxx | 10 +++++-----
sd/source/ui/view/DocumentRenderer.cxx | 2 +-
sd/source/ui/view/NotesPanelView.cxx | 2 +-
sd/source/ui/view/outlview.cxx | 2 +-
svx/source/dialog/weldeditview.cxx | 6 +++---
svx/source/svdraw/svdedxv.cxx | 2 +-
svx/source/svdraw/svdotext.cxx | 2 +-
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2 +-
24 files changed, 55 insertions(+), 67 deletions(-)
New commits:
commit 1457699096a5f6b25f7a32582e5bdec9deeb0898
Author: Armin Le Grand (allotropia) <armin.legr...@collabora.com>
AuthorDate: Mon Jul 7 16:18:33 2025 +0200
Commit: Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Tue Jul 8 01:15:30 2025 +0200
StripPortions: Sort out & reduce ::Paint methods
At EditEngine, ImpEditEngine, Outliner, OutlinerView
and EditView. Changed to more explaining names. Checked
parameters.
Change-Id: Iccf8ce82d2772cbd769269014e920739a11bece2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187483
Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>
Tested-by: Jenkins
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 3ffbecc83842..3a0a0eb2eb24 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -194,24 +194,14 @@ const SfxItemSet& EditEngine::GetEmptyItemSet() const
return getImpl().GetEmptyItemSet();
}
-void EditEngine::Draw( OutputDevice& rOutDev, const tools::Rectangle& rOutRect
)
+void EditEngine::DrawText_ToPosition( OutputDevice& rOutDev, const Point&
rStartPos, Degree10 nOrientation )
{
- Draw( rOutDev, rOutRect, Point( 0, 0 ) );
+ getImpl().DrawText_ToPosition(rOutDev, rStartPos, nOrientation);
}
-void EditEngine::Draw( OutputDevice& rOutDev, const Point& rStartPos, Degree10
nOrientation )
+void EditEngine::DrawText_ToRectangle( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect, const Point& rStartDocPos, bool bHardClip )
{
- getImpl().Draw(rOutDev, rStartPos, nOrientation);
-}
-
-void EditEngine::Draw( OutputDevice& rOutDev, const tools::Rectangle&
rOutRect, const Point& rStartDocPos )
-{
- Draw( rOutDev, rOutRect, rStartDocPos, true );
-}
-
-void EditEngine::Draw( OutputDevice& rOutDev, const tools::Rectangle&
rOutRect, const Point& rStartDocPos, bool bClip )
-{
- getImpl().Draw(rOutDev, rOutRect, rStartDocPos, bClip);
+ getImpl().DrawText_ToRectangle(rOutDev, rOutRect, rStartDocPos, bHardClip);
}
void EditEngine::InsertView(EditView* pEditView, size_t nIndex)
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 253eea7d7f43..3429ec7717f1 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -401,9 +401,9 @@ Point EditView::CalculateTextPaintStartPosition() const
return getImpEditEngine().CalculateTextPaintStartPosition(getImpl());
}
-void EditView::Paint( const tools::Rectangle& rRect, OutputDevice*
pTargetDevice )
+void EditView::DrawText_ToEditView( const tools::Rectangle& rRect,
OutputDevice* pTargetDevice )
{
- getImpEditEngine().Paint(&getImpl(), rRect, pTargetDevice);
+ getImpEditEngine().DrawText_ToEditView(&getImpl(), rRect, pTargetDevice);
}
void EditView::setEditEngine(EditEngine& rEditEngine)
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 1119d9b064f9..eca225e8ca0c 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -999,11 +999,11 @@ public:
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 );
+ void DrawText_ToPosition( OutputDevice& rOutDev, const
Point& rStartPos, Degree10 nOrientation );
+ void DrawText_ToRectangle( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect, const Point& rStartDocPos, bool bHardClip );
void UpdateViews( EditView* pCurView = nullptr );
Point CalculateTextPaintStartPosition(ImpEditView& rView) const;
- void Paint( ImpEditView* pView, const tools::Rectangle&
rRect, OutputDevice* pTargetDevice );
+ void DrawText_ToEditView( ImpEditView* pView, const
tools::Rectangle& rRect, OutputDevice* pTargetDevice );
void PaintOrStrip( OutputDevice& rOutDev, tools::Rectangle aClipRect,
Point aStartPos, Degree10 nOrientation = 0_deg10, StripPortionsHelper*
pStripPortionsHelper = nullptr);
bool MouseButtonUp( const MouseEvent& rMouseEvent,
EditView* pView );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 70035d9bc9f0..373967943123 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3352,7 +3352,7 @@ Point ImpEditEngine::MoveToNextLine(
return rMovePos - aOld;
}
-void ImpEditEngine::Draw( OutputDevice& rOutDev, const Point& rStartPos,
Degree10 nOrientation )
+void ImpEditEngine::DrawText_ToPosition( OutputDevice& rOutDev, const Point&
rStartPos, Degree10 nOrientation )
{
// Create with 2 points, as with positive points it will end up with
// LONGMAX as Size, Bottom and Right in the range > LONGMAX.
@@ -3370,7 +3370,7 @@ void ImpEditEngine::Draw( OutputDevice& rOutDev, const
Point& rStartPos, Degree1
rOutDev.Pop();
}
-void ImpEditEngine::Draw( OutputDevice& rOutDev, const tools::Rectangle&
rOutRect, const Point& rStartDocPos, bool bClip )
+void ImpEditEngine::DrawText_ToRectangle( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect, const Point& rStartDocPos, bool bHardClip )
{
#if defined( DBG_UTIL ) || (OSL_DEBUG_LEVEL > 1)
if ( bDebugPaint )
@@ -3404,7 +3404,7 @@ void ImpEditEngine::Draw( OutputDevice& rOutDev, const
tools::Rectangle& rOutRec
rOutDev.Push();
// Always use the Intersect method, it is a must for Metafile!
- if ( bClip )
+ if ( bHardClip )
{
// Clip only if necessary...
if (!IsFormatted())
@@ -4311,7 +4311,7 @@ Point
ImpEditEngine::CalculateTextPaintStartPosition(ImpEditView& rView) const
return aStartPos;
}
-void ImpEditEngine::Paint( ImpEditView* pView, const tools::Rectangle& rRect,
OutputDevice* pTargetDevice )
+void ImpEditEngine::DrawText_ToEditView( ImpEditView* pView, const
tools::Rectangle& rRect, OutputDevice* pTargetDevice )
{
if ( !IsUpdateLayout() || IsInUndo() )
return;
diff --git a/editeng/source/outliner/outlin2.cxx
b/editeng/source/outliner/outlin2.cxx
index eb9d54c849a9..2305d85b50f0 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -163,14 +163,14 @@ OUString Outliner::GetWord(const EPaM& rPos)
return pEditEngine->GetWord(rPos);
}
-void Outliner::Draw( OutputDevice& rOutDev, const tools::Rectangle& rOutRect )
+void Outliner::DrawText_ToRectangle( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect )
{
- pEditEngine->Draw( rOutDev, rOutRect );
+ pEditEngine->DrawText_ToRectangle( rOutDev, rOutRect, Point( 0, 0 ), true
);
}
-void Outliner::Draw( OutputDevice& rOutDev, const Point& rStartPos )
+void Outliner::DrawText_ToPosition( OutputDevice& rOutDev, const Point&
rStartPos )
{
- pEditEngine->Draw( rOutDev, rStartPos );
+ pEditEngine->DrawText_ToPosition( rOutDev, rStartPos );
}
void Outliner::SetPaperSize( const Size& rSize )
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 5ca0cec7d5f0..e1e28f04fcad 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -59,14 +59,14 @@ OutlinerView::~OutlinerView()
{
}
-void OutlinerView::Paint( const tools::Rectangle& rRect, OutputDevice*
pTargetDevice )
+void OutlinerView::DrawText_ToEditView( const tools::Rectangle& rRect,
OutputDevice* pTargetDevice )
{
// For the first Paint/KeyInput/Drop an empty Outliner is turned into
// an Outliner with exactly one paragraph.
if( rOwner.bFirstParaIsEmpty )
rOwner.Insert( OUString() );
- pEditView->Paint( rRect, pTargetDevice );
+ pEditView->DrawText_ToEditView( rRect, pTargetDevice );
}
bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const *
pFrameWin )
diff --git a/forms/source/richtext/richtextimplcontrol.cxx
b/forms/source/richtext/richtextimplcontrol.cxx
index 40f51b3422f4..83a810cab780 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -601,7 +601,7 @@ namespace frm
lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
// actually draw the content
- m_pEngine->Draw(*_pDev, aPlayground, Point(), true);
+ m_pEngine->DrawText_ToRectangle(*_pDev, aPlayground, Point(), true);
_pDev->Pop();
}
diff --git a/forms/source/richtext/richtextviewport.cxx
b/forms/source/richtext/richtextviewport.cxx
index b4fda6652c91..629d2317cca9 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -37,7 +37,7 @@ namespace frm
void RichTextViewPort::Paint( vcl::RenderContext& rRenderContext, const
tools::Rectangle& _rRect )
{
- m_pView->Paint(_rRect, &rRenderContext);
+ m_pView->DrawText_ToEditView(_rRect, &rRenderContext);
}
void RichTextViewPort::GetFocus()
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index c50203fe4665..593fce2a59be 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -379,10 +379,8 @@ public:
SAL_DLLPRIVATE bool IsTextPos( const Point& rPaperPos,
sal_uInt16 nBorder );
// StartDocPos corresponds to VisArea.TopLeft().
- SAL_DLLPRIVATE void Draw( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect );
- SAL_DLLPRIVATE void Draw( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect, const Point& rStartDocPos );
- void Draw( OutputDevice& rOutDev, const tools::Rectangle&
rOutRect, const Point& rStartDocPos, bool bClip );
- void Draw( OutputDevice& rOutDev, const Point& rStartPos,
Degree10 nOrientation = 0_deg10 );
+ void DrawText_ToRectangle( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect, const Point& rStartDocPos, bool bHardClip );
+ void DrawText_ToPosition( OutputDevice& rOutDev, const Point&
rStartPos, Degree10 nOrientation = 0_deg10 );
ErrCode Read( SvStream& rInput, const OUString& rBaseURL,
EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = nullptr );
void Write( SvStream& rOutput, EETextFormat );
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index ad8087c26e65..c725cdbda71c 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -203,7 +203,7 @@ public:
bool RemoveOtherViewWindow( vcl::Window* pWin );
Point CalculateTextPaintStartPosition() const;
- void Paint( const tools::Rectangle& rRect, OutputDevice*
pTargetDevice = nullptr );
+ void DrawText_ToEditView( const tools::Rectangle& rRect,
OutputDevice* pTargetDevice = nullptr );
tools::Rectangle GetInvalidateRect() const;
SAL_DLLPRIVATE void InvalidateWindow(const tools::Rectangle&
rClipRect);
void InvalidateOtherViewWindows( const tools::Rectangle&
rInvRect );
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 179e678a2add..df22cbe70fa3 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -215,7 +215,7 @@ public:
void Scroll( tools::Long nHorzScroll, tools::Long nVertScroll );
- void Paint( const tools::Rectangle& rRect, OutputDevice*
pTargetDevice = nullptr );
+ void DrawText_ToEditView( const tools::Rectangle& rRect,
OutputDevice* pTargetDevice = nullptr );
bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window const *
pFrameWin = nullptr );
bool MouseButtonDown( const MouseEvent& );
bool MouseButtonUp( const MouseEvent& );
@@ -713,8 +713,8 @@ public:
void SetStatusEventHdl( const Link<EditStatus&, void>& rLink );
Link<EditStatus&, void> const & GetStatusEventHdl() const;
- void Draw( OutputDevice& rOutDev, const tools::Rectangle&
rOutRect );
- void Draw( OutputDevice& rOutDev, const Point& rStartPos );
+ void DrawText_ToRectangle( OutputDevice& rOutDev, const
tools::Rectangle& rOutRect );
+ void DrawText_ToPosition( OutputDevice& rOutDev, const Point&
rStartPos );
const Size& GetPaperSize() const;
void SetPaperSize( const Size& rSize );
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 0790f43b459a..fe29e4464975 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1131,7 +1131,7 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos,
const OUString& rText )
aPlainText = aPlainText.replaceAll( "
", " " );
mpEditEngine->SetPaperSize( maEdEngSize );
mpEditEngine->SetTextCurrentDefaults(aPlainText);
- mpEditEngine->Draw(*mpBackgrDev, rPos);
+ mpEditEngine->DrawText_ToPosition(*mpBackgrDev, rPos);
sal_Int32 nCharIx = 0;
while( (nCharIx = rText.indexOf( ' ', nCharIx )) != -1 )
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index 0b416b6b1bb4..3e1ecfabcc70 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -799,7 +799,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
OutlinerView* pOutView = pView->IsTextEdit() ?
pView->GetTextEditOutlinerView() : nullptr;
if ( pOutView )
- pOutView->Paint( tools::Rectangle() );
+ pOutView->DrawText_ToEditView( tools::Rectangle() );
SfxItemSetFixed<EE_ITEMS_START, EE_ITEMS_END> aEmptyAttr(
*aEditAttr.GetPool() );
SfxItemSetFixed<SDRATTR_TEXT_MINFRAMEHEIGHT,
SDRATTR_TEXT_MINFRAMEHEIGHT,
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7e938db95e5c..b66208c5ebe4 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1249,7 +1249,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
if (aNewOutputArea.IsEmpty())
{
// same zoom level and not RTL: no need to change the output
area before painting
- pOtherEditView->Paint(rDevice.PixelToLogic(aTileRectPx),
&rDevice);
+
pOtherEditView->DrawText_ToEditView(rDevice.PixelToLogic(aTileRectPx),
&rDevice);
}
else
{
@@ -1264,7 +1264,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
SuppressEditViewMessagesGuard aGuard(*pOtherEditView);
pOtherEditView->SetOutputArea(rDevice.PixelToLogic(aNewOutputArea));
- pOtherEditView->Paint(rDevice.PixelToLogic(aTileRectPx),
&rDevice);
+
pOtherEditView->DrawText_ToEditView(rDevice.PixelToLogic(aTileRectPx),
&rDevice);
// EditView will do the cursor notifications correctly if
we're in
// print-twips messaging mode.
@@ -2003,7 +2003,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1,
SCCOL nX2, SCROW nY2,
Size aTextSize( pEditEng->CalcTextWidth(),
pEditEng->GetTextHeight() );
Point aPos(
(aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2,
(aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 );
- pEditEng->Draw(rRenderContext, aPos);
+ pEditEng->DrawText_ToPosition(rRenderContext,
aPos);
}
else
{
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ea9501d0b86f..bfa5f844dbe5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3311,11 +3311,11 @@ void ScOutputData::DrawEditStandard(DrawEditParam&
rParam)
// no hard clip, only draw the affected rows
Point aDocStart = aClip.getRect().TopLeft();
aDocStart -= aLogicStart;
- rParam.mpEngine->Draw(*mpDev, aClip.getRect(), aDocStart, false);
+ rParam.mpEngine->DrawText_ToRectangle(*mpDev, aClip.getRect(),
aDocStart, false);
}
else
{
- rParam.mpEngine->Draw(*mpDev, aLogicStart);
+ rParam.mpEngine->DrawText_ToPosition(*mpDev, aLogicStart);
}
}
@@ -3662,7 +3662,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam&
rParam)
}
}
- rParam.mpEngine->Draw(*mpDev, aLogicStart, 900_deg10);
+ rParam.mpEngine->DrawText_ToPosition(*mpDev, aLogicStart, 900_deg10);
}
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
@@ -3899,7 +3899,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam&
rParam)
// bMoveClipped handling has been replaced by complete alignment
// handling (also extending to the left).
- rParam.mpEngine->Draw(*mpDev, aLogicStart, 2700_deg10);
+ rParam.mpEngine->DrawText_ToPosition(*mpDev, aLogicStart, 2700_deg10);
}
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
@@ -4178,11 +4178,11 @@ void ScOutputData::DrawEditStacked(DrawEditParam&
rParam)
// no hard clip, only draw the affected rows
Point aDocStart = aClip.getRect().TopLeft();
aDocStart -= aLogicStart;
- rParam.mpEngine->Draw(*mpDev, aClip.getRect(), aDocStart, false);
+ rParam.mpEngine->DrawText_ToRectangle(*mpDev, aClip.getRect(),
aDocStart, false);
}
else
{
- rParam.mpEngine->Draw(*mpDev, aLogicStart);
+ rParam.mpEngine->DrawText_ToPosition(*mpDev, aLogicStart);
}
}
@@ -4448,7 +4448,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam&
rParam)
// the whole output area, not the text itself
aLogicStart.AdjustX( -(rParam.mpEngine->GetPaperSize().Width()) );
- rParam.mpEngine->Draw(*mpDev, aLogicStart);
+ rParam.mpEngine->DrawText_ToPosition(*mpDev, aLogicStart);
}
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
@@ -5311,7 +5311,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
// bSimClip is not used here (because nOriVal
is set)
- mxOutputEditEngine->Draw(*mpDev, aLogicStart,
nOriVal);
+
mxOutputEditEngine->DrawText_ToPosition(*mpDev, aLogicStart, nOriVal);
if (bMetaFile)
mpDev->Pop();
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 3340d75b9ebf..ae18b997cd91 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -522,7 +522,7 @@ void ScPreview::DoPrint( ScPreviewLocationData*
pFillLocation )
(aWinEnd.X() - pEditEng->CalcTextWidth())/2,
(aWinEnd.Y() - pEditEng->GetTextHeight())/2);
- pEditEng->Draw(*GetOutDev(), aCenter);
+ pEditEng->DrawText_ToPosition(*GetOutDev(), aCenter);
return;
}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index da24ff798dab..4b4769a2a697 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1882,7 +1882,7 @@ void ScPrintFunc::PrintHF( tools::Long nPageNo, bool
bHeader, tools::Long nStart
tools::Long nDif = aPaperSize.Height() -
static_cast<tools::Long>(pEditEngine->GetTextHeight());
if (nDif > 0)
aDraw.AdjustY(nDif / 2 );
- pEditEngine->Draw(*pDev, aDraw);
+ pEditEngine->DrawText_ToPosition(*pDev, aDraw);
}
// center
@@ -1896,7 +1896,7 @@ void ScPrintFunc::PrintHF( tools::Long nPageNo, bool
bHeader, tools::Long nStart
tools::Long nDif = aPaperSize.Height() -
static_cast<tools::Long>(pEditEngine->GetTextHeight());
if (nDif > 0)
aDraw.AdjustY(nDif / 2 );
- pEditEngine->Draw(*pDev, aDraw);
+ pEditEngine->DrawText_ToPosition(*pDev, aDraw);
}
// right
@@ -1910,7 +1910,7 @@ void ScPrintFunc::PrintHF( tools::Long nPageNo, bool
bHeader, tools::Long nStart
tools::Long nDif = aPaperSize.Height() -
static_cast<tools::Long>(pEditEngine->GetTextHeight());
if (nDif > 0)
aDraw.AdjustY(nDif / 2 );
- pEditEngine->Draw(*pDev, aDraw);
+ pEditEngine->DrawText_ToPosition(*pDev, aDraw);
}
pDev->SetClipRegion();
@@ -1970,13 +1970,13 @@ tools::Long ScPrintFunc::DoNotes( tools::Long
nNoteStart, bool bDoPrint, ScPrevi
{
if (bDoPrint)
{
- pEditEngine->Draw(*pDev, Point(nPosX, nPosY));
+ pEditEngine->DrawText_ToPosition(*pDev, Point(nPosX,
nPosY));
OUString aMarkStr(rPos.Format(ScRefFlags::VALID,
&rDoc, rDoc.GetAddressConvention()) + ":");
// cell position also via EditEngine, for correct
positioning
pEditEngine->SetTextCurrentDefaults(aMarkStr);
- pEditEngine->Draw(*pDev, Point(aPageRect.Left(),
nPosY));
+ pEditEngine->DrawText_ToPosition(*pDev,
Point(aPageRect.Left(), nPosY));
}
if ( pLocationData )
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 53b9737f5e8b..eca3a27bc3ef 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1446,7 +1446,7 @@ namespace {
pOutliner->Clear();
pOutliner->SetText(*mpParaObject);
- pOutliner->Draw(rPrinter, aOutRect);
+ pOutliner->DrawText_ToRectangle(rPrinter, aOutRect);
PrintMessage(
rPrinter,
diff --git a/sd/source/ui/view/NotesPanelView.cxx
b/sd/source/ui/view/NotesPanelView.cxx
index 241765d9c280..41aee10897e6 100644
--- a/sd/source/ui/view/NotesPanelView.cxx
+++ b/sd/source/ui/view/NotesPanelView.cxx
@@ -137,7 +137,7 @@ void NotesPanelView::setNotesToDoc()
void NotesPanelView::Paint(const ::tools::Rectangle& rRect, ::sd::Window
const* /*pWin*/)
{
- maOutlinerView.Paint(rRect);
+ maOutlinerView.DrawText_ToEditView(rRect);
}
OutlinerView* NotesPanelView::GetOutlinerView() { return &maOutlinerView; }
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index d095eb030d2f..768f32dff6d9 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -190,7 +190,7 @@ void OutlineView::Paint(const ::tools::Rectangle& rRect,
::sd::Window const * pW
if (pOlView)
{
pOlView->HideCursor();
- pOlView->Paint(rRect);
+ pOlView->DrawText_ToEditView(rRect);
pOlView->ShowCursor(mbFirstPaint);
diff --git a/svx/source/dialog/weldeditview.cxx
b/svx/source/dialog/weldeditview.cxx
index 6630432d8808..59fc48350000 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -231,9 +231,9 @@ void WeldEditView::DoPaint(vcl::RenderContext&
rRenderContext, const tools::Rect
rRenderContext.Push(vcl::PushFlags::ALL);
rRenderContext.SetClipRegion();
- pEditView->Paint(comphelper::LibreOfficeKit::isActive() ?
rRenderContext.PixelToLogic(rRect)
- : rRect,
- &rRenderContext);
+ pEditView->DrawText_ToEditView(
+ comphelper::LibreOfficeKit::isActive() ?
rRenderContext.PixelToLogic(rRect) : rRect,
+ &rRenderContext);
if (HasFocus())
{
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 9f5ad0ea3695..77ac5c6a5e2b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -990,7 +990,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView&
rOutlView, const tools::
aBlankRect.Intersection(rRect);
rOutlView.GetOutliner().SetUpdateLayout(true); // Bugfix #22596#
- rOutlView.Paint(aBlankRect, &rTargetDevice);
+ rOutlView.DrawText_ToEditView(aBlankRect, &rTargetDevice);
if (!bModified)
{
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7f1c55b2f467..31fe9103a92d 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1785,7 +1785,7 @@ GDIMetaFile*
SdrTextObj::GetTextScrollMetaFileAndRectangle(
pRetval->Record(pBlackHole);
Point aPaintPos = aPaintRect.TopLeft();
- rOutliner.Draw(*pBlackHole, aPaintPos);
+ rOutliner.DrawText_ToPosition(*pBlackHole, aPaintPos);
pRetval->Stop();
pRetval->WindStart();
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx
b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 56554988499c..acb72005eaba 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -233,7 +233,7 @@ void SidebarTextControl::DrawForPage(OutputDevice* pDev,
const Point& rPt)
if (OutlinerView* pOutlinerView = mrSidebarWin.GetOutlinerView())
{
- pOutlinerView->GetOutliner().Draw(*pDev, tools::Rectangle(rPt, aSize));
+ pOutlinerView->GetOutliner().DrawText_ToRectangle(*pDev,
tools::Rectangle(rPt, aSize));
}
if ( mrSidebarWin.GetLayoutStatus()!=SwPostItHelper::DELETED )
