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 /sfx2 | |
| parent | 7a0af37989d1f1b508a61f28e785c5b1f27d58af (diff) | |
convert TEXT_DRAW constants to scoped enum
Change-Id: Ic0f7f8fa236bb478b3598ae3fd3c1b30ebbf1a01
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/sidebar/TitleBar.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 91623bfe6105..a80d77d6c1c0 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -210,7 +210,7 @@ namespace sfx2 rRenderContext.SetLineColor(rStyleSettings.GetActiveTextColor()); aTitleBarBox.Left() += 3; rRenderContext.DrawText(aTitleBarBox, impl_getTitle(), - TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER | TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK); + DrawTextFlags::Left | DrawTextFlags::VCenter | DrawTextFlags::MultiLine | DrawTextFlags::WordBreak); // Restore original values of the output device. rRenderContext.Pop(); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index bef67c9ddbe6..2c728c085020 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -127,9 +127,9 @@ namespace { class WaitWindow_Impl : public WorkWindow { - Rectangle maRect; - sal_uInt16 mnTextStyle; - OUString maText; + Rectangle maRect; + DrawTextFlags mnTextStyle; + OUString maText; public: WaitWindow_Impl(); @@ -2425,7 +2425,7 @@ void SAL_CALL Updater_Impl::onTerminated() WaitWindow_Impl::WaitWindow_Impl() : WorkWindow(NULL, WB_BORDER | WB_3DLOOK) { Rectangle aRect = Rectangle(0, 0, 300, 30000); - mnTextStyle = TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE; + mnTextStyle = DrawTextFlags::Center | DrawTextFlags::VCenter | DrawTextFlags::WordBreak | DrawTextFlags::MultiLine; maText = SfxResId(RID_CNT_STR_WAITING).toString(); maRect = GetTextRect(aRect, maText, mnTextStyle); aRect = maRect; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index 3e4d77584ac8..da27a66e828d 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -134,7 +134,7 @@ void TitleBar::PaintTitle(vcl::RenderContext& rRenderContext, const Rectangle& r // Paint title bar text. rRenderContext.SetTextColor(rRenderContext.GetTextColor()); - rRenderContext.DrawText(aTitleBox, msTitle, TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER); + rRenderContext.DrawText(aTitleBox, msTitle, DrawTextFlags::Left | DrawTextFlags::VCenter); rRenderContext.Pop(); } @@ -146,7 +146,7 @@ void TitleBar::PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& r aFont.SetWeight(WEIGHT_BOLD); rRenderContext.SetFont(aFont); - const Rectangle aTextBox(rRenderContext.GetTextRect(rFocusBox, msTitle, TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER)); + const Rectangle aTextBox(rRenderContext.GetTextRect(rFocusBox, msTitle, DrawTextFlags::Left | DrawTextFlags::VCenter)); const Rectangle aLargerTextBox(aTextBox.Left() - 2, aTextBox.Top() - 2, |