diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-18 13:36:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
commit | 25a47c5cd54c73e754de988bde8ec8a202d27717 (patch) | |
tree | 479c07ba52f718f03770fba60121d2a0ef3a3b08 /sd | |
parent | 7a0af37989d1f1b508a61f28e785c5b1f27d58af (diff) |
convert TEXT_DRAW constants to scoped enum
Change-Id: Ic0f7f8fa236bb478b3598ae3fd3c1b30ebbf1a01
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/html/htmlattr.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 10 |
7 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 4a7732f88315..fe709ff7bea4 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -58,19 +58,19 @@ void SdHtmlAttrPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangl aTextRect.Bottom() = nHeight + aTextRect.Top(); rRenderContext.SetTextColor(m_aTextColor); - rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_TEXT), TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER); + rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_TEXT), DrawTextFlags::Center | DrawTextFlags::VCenter); aTextRect.Move(0,nHeight); rRenderContext.SetTextColor(m_aLinkColor); - rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_LINK), TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER); + rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_LINK), DrawTextFlags::Center | DrawTextFlags::VCenter); aTextRect.Move(0,nHeight); rRenderContext.SetTextColor(m_aALinkColor); - rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_ALINK), TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER); + rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_ALINK), DrawTextFlags::Center | DrawTextFlags::VCenter); aTextRect.Move(0,nHeight); rRenderContext.SetTextColor(m_aVLinkColor); - rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_VLINK), TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER); + rRenderContext.DrawText(aTextRect, SD_RESSTR(STR_HTMLATTR_VLINK), DrawTextFlags::Center | DrawTextFlags::VCenter); } void SdHtmlAttrPreview::SetColors(Color& aBack, Color& aText, Color& aLink, diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 5fa9de5a7258..333baa7b0b35 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -129,7 +129,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) pDev->DrawPixel( Point(aOutRect.Right(), aOutRect.Bottom())); // draw the category title - pDev->DrawText (aOutRect, GetEntry(nItem), TEXT_DRAW_CENTER ); + pDev->DrawText (aOutRect, GetEntry(nItem), DrawTextFlags::Center ); } else { diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 6f93769dfc3a..90735cd40a6f 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -951,7 +951,7 @@ void CustomAnimationList::Paint(vcl::RenderContext& rRenderContext, const Rectan aRect.Bottom() -= aOffset.Y(); rRenderContext.DrawText(aRect, SD_RESSTR(STR_CUSTOMANIMATION_LIST_HELPTEXT), - TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK | TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER ); + DrawTextFlags::MultiLine | DrawTextFlags::WordBreak | DrawTextFlags::Center | DrawTextFlags::VCenter ); rRenderContext.SetTextColor(aOldColor); } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 24a5821bf390..06ac9c383441 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -342,7 +342,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const Rectangle& rRe if (rEntry->m_bActive) { OUString sPinText(SD_RESSTR(STR_ENTER_PIN)); - DrawText(m_sPinTextRect, sPinText, 0); + DrawText(m_sPinTextRect, sPinText); } rRenderContext.SetLineColor(Color(COL_LIGHTGRAY)); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 51565b02101d..c1428c874c59 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -649,7 +649,7 @@ void SlideSorterView::CompleteRedraw ( mrSlideSorter.GetContentWindow()->DrawText( gFrameTimeBox, OUString::number(1 / (gFrameTimeSum / gFrameTimeCount)), - TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); + DrawTextFlags::Right | DrawTextFlags::VCenter); // mrSlideSorter.GetContentWindow()->Invalidate(gFrameTimeBox); #endif } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 4aebbbef8a9a..52020df71b9a 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -264,7 +264,7 @@ void PageObjectPainter::PaintPageNumber ( const OUString sPageNumber(OUString::number(nPageNumber)); rDevice.SetFont(*mpPageNumberFont); rDevice.SetTextColor(aPageNumberColor); - rDevice.DrawText(aBox, sPageNumber, TEXT_DRAW_RIGHT | TEXT_DRAW_VCENTER); + rDevice.DrawText(aBox, sPageNumber, DrawTextFlags::Right | DrawTextFlags::VCenter); } void PageObjectPainter::PaintTransitionEffect ( diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 774cf1d50d08..e6034a87482c 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -340,11 +340,11 @@ void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText) Point(0,0), mpPreviewDevice->PixelToLogic( mpPreviewDevice->GetOutputSizePixel())); - sal_uInt16 nTextStyle = - TEXT_DRAW_CENTER - | TEXT_DRAW_VCENTER - | TEXT_DRAW_MULTILINE - | TEXT_DRAW_WORDBREAK; + DrawTextFlags nTextStyle = + DrawTextFlags::Center + | DrawTextFlags::VCenter + | DrawTextFlags::MultiLine + | DrawTextFlags::WordBreak; mpPreviewDevice->DrawText (aTextBox, rSubstitutionText, nTextStyle); // Restore the font. |