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 /sc | |
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 'sc')
-rw-r--r-- | sc/source/ui/cctrl/dpcontrol.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvcontrol.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/autofmt.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabsplit.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 0419b785b712..4b0bcc449f5b 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -127,7 +127,7 @@ void ScDPFieldButton::draw() aTextPos.setX(maPos.getX() + 2); // 2 = Margin aTextPos.setY(maPos.getY() + (maSize.Height()-nTHeight)/2); - mpOutDev->Push(PushFlags::CLIPREGION); + mpOutDev->Push(vcl::PushFlags::CLIPREGION); mpOutDev->IntersectClipRegion(aRect); mpOutDev->DrawText(aTextPos, maText); mpOutDev->Pop(); diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 921a1491d022..409e898b46a3 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -241,7 +241,7 @@ sal_Int32 ScCsvControl::GetLineFromY( sal_Int32 nY ) const void ScCsvControl::ImplInvertRect( OutputDevice& rOutDev, const tools::Rectangle& rRect ) { - rOutDev.Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR | PushFlags::RASTEROP ); + rOutDev.Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR | vcl::PushFlags::RASTEROP ); rOutDev.SetLineColor( COL_BLACK ); rOutDev.SetFillColor( COL_BLACK ); rOutDev.SetRasterOp( RasterOp::Invert ); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 3730cc10ae15..6ccf37a924b4 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2162,8 +2162,8 @@ void ScDocShell::Draw( OutputDevice* pDev, const JobSetup & /* rSetup */, sal_uI if (!m_aDocument.HasTable(nVisTab)) return; - ComplexTextLayoutFlags nOldLayoutMode = pDev->GetLayoutMode(); - pDev->SetLayoutMode( ComplexTextLayoutFlags::Default ); // even if it's the same, to get the metafile action + vcl::text::ComplexTextLayoutFlags nOldLayoutMode = pDev->GetLayoutMode(); + pDev->SetLayoutMode( vcl::text::ComplexTextLayoutFlags::Default ); // even if it's the same, to get the metafile action if ( nAspect == ASPECT_THUMBNAIL ) { diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 7246a4009426..60ccec1fe9bf 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -366,7 +366,7 @@ void ScAutoFmtPreview::DrawBackground(vcl::RenderContext& rRenderContext) const SvxBrushItem* pItem = pCurData->GetItem( GetFormatIndex( nCol, nRow ), ATTR_BACKGROUND ); - rRenderContext.Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); + rRenderContext.Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR ); rRenderContext.SetLineColor(); rRenderContext.SetFillColor( pItem->GetColor() ); @@ -492,7 +492,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext) { - rRenderContext.Push(PushFlags::ALL); + rRenderContext.Push(vcl::PushFlags::ALL); DrawModeFlags nOldDrawMode = aVD->GetDrawMode(); Size aWndSize(GetOutputSizePixel()); diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index e2ed5f86c265..fb8435b2712a 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -55,7 +55,7 @@ void ScTabSplitter::SetFixed(bool bSet) void ScTabSplitter::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) { - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR); const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); if (IsHorizontal()) |