diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-03 02:19:33 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-09-28 08:20:32 +0200 |
commit | 4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch) | |
tree | c67ddea9c5551e069cb75fe0901cdcfa3f00b054 /svx/source/tbxctrls | |
parent | 1734e97222324c137ecd084ad2464abdff2698d1 (diff) |
vcl: rename OutDevState to Stack
I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.
State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.
Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'svx/source/tbxctrls')
-rw-r--r-- | svx/source/tbxctrls/StylesPreviewWindow.cxx | 3 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxcolorupdate.cxx | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index a90612c0b3c8..fc31ea9444b8 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -110,7 +110,8 @@ StyleItemController::StyleItemController(const std::pair<OUString, OUString>& aS void StyleItemController::Paint(vcl::RenderContext& rRenderContext) { - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::FONT + | vcl::PushFlags::TEXTCOLOR); DrawEntry(rRenderContext); diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index dcc567e0112e..3741402f1143 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -252,7 +252,7 @@ bool TableWidget::MouseButtonDown(const MouseEvent&) void TableWidget::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { - rRenderContext.Push(PushFlags::FONT); + rRenderContext.Push(vcl::PushFlags::FONT); rRenderContext.SetBackground( aBackgroundColor ); vcl::Font aFont = rRenderContext.GetFont(); @@ -595,7 +595,7 @@ bool ColumnsWidget::MouseButtonUp(const MouseEvent&) void ColumnsWidget::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) { - rRenderContext.Push(PushFlags::FONT); + rRenderContext.Push(vcl::PushFlags::FONT); rRenderContext.SetBackground(); vcl::Font aFont( rRenderContext.GetFont() ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 36fa3ad7faf2..a65e3281bd54 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1286,7 +1286,7 @@ IMPL_LINK(SvxStyleBox_Base, CustomRenderHdl, weld::ComboBox::render_args, aPaylo OUString aStyleName(m_xWidget->get_text(nIndex)); - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR); SetupEntry(rRenderContext, nIndex, rRect, aStyleName, !bSelected); @@ -1318,7 +1318,7 @@ void SvxStyleBox_Base::CalcOptimalExtraUserWidth(vcl::RenderContext& rRenderCont { OUString sStyleName(get_text(i)); - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR); SetupEntry(rRenderContext, i, tools::Rectangle(0, 0, RECT_MAX, ITEM_HEIGHT), sStyleName, true); tools::Rectangle aTextRectForActualFont; rRenderContext.GetTextBoundRect(aTextRectForActualFont, sStyleName); diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index cc36596a90e8..f9ca173d6fe2 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -177,7 +177,7 @@ namespace svx else maUpdRect = tools::Rectangle(Point( maBmpSize.Height() + 2, 2), Point(maBmpSize.Width() - 3, maBmpSize.Height() - 3)); - pVirDev->Push(PushFlags::CLIPREGION); + pVirDev->Push(vcl::PushFlags::CLIPREGION); // tdf#135121 don't include the part of the image which we will // overwrite with the target color so that for the transparent color |