summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/output2.cxx16
-rw-r--r--sc/source/ui/view/preview.cxx2
-rw-r--r--sc/source/ui/view/printfun.cxx34
4 files changed, 27 insertions, 27 deletions
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a32ca723b446..9c1ff475449a 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1797,7 +1797,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->Draw(rRenderContext, aPos);
}
else
{
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index e2726517a874..2d45fa62eaa7 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -3175,11 +3175,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->Draw(*mpDev, aClip.getRect(), aDocStart, false);
}
else
{
- rParam.mpEngine->Draw(mpDev, aLogicStart);
+ rParam.mpEngine->Draw(*mpDev, aLogicStart);
}
}
@@ -3497,7 +3497,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam)
}
}
- rParam.mpEngine->Draw(mpDev, aLogicStart, 900_deg10);
+ rParam.mpEngine->Draw(*mpDev, aLogicStart, 900_deg10);
}
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
@@ -3734,7 +3734,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->Draw(*mpDev, aLogicStart, 2700_deg10);
}
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
@@ -4012,11 +4012,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->Draw(*mpDev, aClip.getRect(), aDocStart, false);
}
else
{
- rParam.mpEngine->Draw( mpDev, aLogicStart );
+ rParam.mpEngine->Draw(*mpDev, aLogicStart);
}
}
@@ -4281,7 +4281,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->Draw(*mpDev, aLogicStart);
}
rParam.adjustForHyperlinkInPDF(aURLStart, mpDev);
@@ -5101,7 +5101,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
// bSimClip is not used here (because nOriVal is set)
- pEngine->Draw( mpDev, aLogicStart, nOriVal );
+ pEngine->Draw(*mpDev, aLogicStart, nOriVal);
if (bMetaFile)
mpDev->Pop();
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index f5477989f73f..0ac87b887c08 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -530,7 +530,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
(aWinEnd.X() - pEditEng->CalcTextWidth())/2,
(aWinEnd.Y() - pEditEng->GetTextHeight())/2);
- pEditEng->Draw(GetOutDev(), aCenter);
+ pEditEng->Draw(*GetOutDev(), aCenter);
return;
}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 128f726d1c76..dc084ec75689 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1114,23 +1114,23 @@ void ScPrintFunc::SetDateTime( const DateTime& rDateTime )
aFieldData.aDateTime = rDateTime;
}
-static void lcl_DrawGraphic( const Graphic &rGraphic, vcl::RenderContext *pOut,
+static void lcl_DrawGraphic( const Graphic &rGraphic, vcl::RenderContext& rOutDev,
const tools::Rectangle &rGrf, const tools::Rectangle &rOut )
{
const bool bNotInside = !rOut.IsInside( rGrf );
if ( bNotInside )
{
- pOut->Push();
- pOut->IntersectClipRegion( rOut );
+ rOutDev.Push();
+ rOutDev.IntersectClipRegion( rOut );
}
- rGraphic.Draw( pOut, rGrf.TopLeft(), rGrf.GetSize() );
+ rGraphic.Draw(rOutDev, rGrf.TopLeft(), rGrf.GetSize());
if ( bNotInside )
- pOut->Pop();
+ rOutDev.Pop();
}
-static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext *pOut, const OutputDevice* pRefDev,
+static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext& rOutDev, const OutputDevice* pRefDev,
const tools::Rectangle &rOrg, const tools::Rectangle &rOut,
OUString const & referer )
{
@@ -1197,7 +1197,7 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext *pOu
GraphicObject aObject( *pGraphic );
- if( pOut->GetOutDevType() == OUTDEV_PDF &&
+ if( rOutDev.GetOutDevType() == OUTDEV_PDF &&
(aObject.GetType() == GraphicType::Bitmap || aObject.GetType() == GraphicType::Default) )
{
// For PDF export, every draw
@@ -1227,12 +1227,12 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext *pOu
const Size aSize( rOrg.GetSize() );
const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() );
- aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0),
+ aObject.DrawTiled( rOutDev, rOrg, aGrfSize, Size(0,0),
::std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) );
}
else
{
- aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0) );
+ aObject.DrawTiled( rOutDev, rOrg, aGrfSize, Size(0,0) );
}
bDraw = false;
@@ -1243,12 +1243,12 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, vcl::RenderContext *pOu
bDraw = false;
break;
- default: OSL_ENSURE( !pOut, "new Graphic position?" );
+ default: OSL_ENSURE( false, "new Graphic position?" );
}
tools::Rectangle aGrf( aPos,aDrawSize );
if ( bDraw && aGrf.IsOver( rOut ) )
{
- lcl_DrawGraphic( *pGraphic, pOut, aGrf, rOut );
+ lcl_DrawGraphic( *pGraphic, rOutDev, aGrf, rOut );
}
}
@@ -1310,7 +1310,7 @@ void ScPrintFunc::DrawBorder( tools::Long nScrX, tools::Long nScrY, tools::Long
if (pDocShell->HasName()) {
referer = pDocShell->GetMedium()->GetName();
}
- lcl_DrawGraphic( *pBackground, pDev, pRefDev, aFrameRect, aFrameRect, referer );
+ lcl_DrawGraphic(*pBackground, *pDev, pRefDev, aFrameRect, aFrameRect, referer);
}
else
{
@@ -1831,7 +1831,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->Draw(*pDev, aDraw);
}
// center
@@ -1845,7 +1845,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->Draw(*pDev, aDraw);
}
// right
@@ -1859,7 +1859,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->Draw(*pDev, aDraw);
}
pDev->SetClipRegion();
@@ -1916,13 +1916,13 @@ tools::Long ScPrintFunc::DoNotes( tools::Long nNoteStart, bool bDoPrint, ScPrevi
{
if (bDoPrint)
{
- pEditEngine->Draw( pDev, Point( nPosX, nPosY ) );
+ pEditEngine->Draw(*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->Draw(*pDev, Point(aPageRect.Left(), nPosY));
}
if ( pLocationData )
generated by cgit (git 2.34.1) at 2024-06-29 15:46:44 +0000