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 /sw/source/uibase | |
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 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/docvw/AnnotationWin2.cxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarTxtControl.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/frmdlg/colex.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/utlui/unotools.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index a736bd0291df..64ea2a7de872 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -132,9 +132,9 @@ void SwAnnotationWin::PaintTile(vcl::RenderContext& rRenderContext, const tools: if (mpTextRangeOverlay) pProcessor->process(mpTextRangeOverlay->getOverlayObjectPrimitive2DSequence()); - rRenderContext.Push(PushFlags::NONE); + rRenderContext.Push(vcl::PushFlags::NONE); pProcessor.reset(); - rRenderContext.Push(PushFlags::NONE); + rRenderContext.Push(vcl::PushFlags::NONE); if (bMenuButtonVisible) mxMenuButton->show(); @@ -173,7 +173,7 @@ void SwAnnotationWin::DrawForPage(OutputDevice* pDev, const Point& rPt) Point aPos(rPt + PixelToLogic(Point(x, y))); Size aSize(PixelToLogic(Size(width, height))); - pDev->Push(PushFlags::CLIPREGION); + pDev->Push(vcl::PushFlags::CLIPREGION); pDev->IntersectClipRegion(tools::Rectangle(aPos, aSize)); pDev->DrawText(aPos, mxMetadataAuthor->get_label()); pDev->Pop(); @@ -188,7 +188,7 @@ void SwAnnotationWin::DrawForPage(OutputDevice* pDev, const Point& rPt) Point aPos(rPt + PixelToLogic(Point(x, y))); Size aSize(PixelToLogic(Size(width, height))); - pDev->Push(PushFlags::CLIPREGION); + pDev->Push(vcl::PushFlags::CLIPREGION); pDev->IntersectClipRegion(tools::Rectangle(aPos, aSize)); pDev->DrawText(aPos, mxMetadataDate->get_label()); pDev->Pop(); @@ -201,7 +201,7 @@ void SwAnnotationWin::DrawForPage(OutputDevice* pDev, const Point& rPt) Point aPos(rPt + PixelToLogic(Point(x, y))); Size aSize(PixelToLogic(Size(width, height))); - pDev->Push(PushFlags::CLIPREGION); + pDev->Push(vcl::PushFlags::CLIPREGION); pDev->IntersectClipRegion(tools::Rectangle(aPos, aSize)); pDev->DrawText(aPos, mxMetadataResolved->get_label()); pDev->Pop(); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 85e9fd91e5ff..3dd0944d052f 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -974,7 +974,7 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext) bool bEnableMapMode = !mpEditWin->IsMapModeEnabled(); mpEditWin->EnableMapMode(); - rRenderContext.Push(PushFlags::MAPMODE); + rRenderContext.Push(vcl::PushFlags::MAPMODE); Point aOffset(mpEditWin->PixelToLogic(pPostIt->GetPosPixel())); MapMode aMapMode(rRenderContext.GetMapMode()); aMapMode.SetOrigin(aMapMode.GetOrigin() + aOffset); diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index ba544b7c88dd..f520501c13f1 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -212,7 +212,7 @@ void SidebarTextControl::DrawForPage(OutputDevice* pDev, const Point& rPt) if ( mrSidebarWin.GetLayoutStatus()!=SwPostItHelper::DELETED ) return; - pDev->Push(PushFlags::LINECOLOR); + pDev->Push(vcl::PushFlags::LINECOLOR); pDev->SetLineColor(mrSidebarWin.GetChangeColor()); Point aBottomRight(rPt); diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 9ecfb798b484..f6488420f42b 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -330,7 +330,7 @@ SwColumnOnlyExample::SwColumnOnlyExample() void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/) { - rRenderContext.Push(PushFlags::MAPMODE); + rRenderContext.Push(vcl::PushFlags::MAPMODE); Fraction aScale(m_aWinSize.Height(), m_aFrameSize.Height()); MapMode aMapMode(MapUnit::MapTwip); @@ -481,7 +481,7 @@ void SwColumnOnlyExample::SetDrawingArea(weld::DrawingArea* pDrawingArea) void SwColumnOnlyExample::Resize() { OutputDevice& rRefDevice = GetDrawingArea()->get_ref_device(); - rRefDevice.Push(PushFlags::MAPMODE); + rRefDevice.Push(vcl::PushFlags::MAPMODE); rRefDevice.SetMapMode(MapMode(MapUnit::MapTwip)); m_aWinSize = GetOutputSizePixel(); m_aWinSize.AdjustHeight( -4 ); diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index a0066904e0a1..1d17a279674f 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -161,7 +161,7 @@ void SwOneExampleFrame::Paint(vcl::RenderContext& rRenderContext, const tools::R double fZoom = 100.0 / nZoom; - m_xVirDev->Push(PushFlags::ALL); + m_xVirDev->Push(vcl::PushFlags::ALL); m_xVirDev->SetMapMode(MapMode(MapUnit::MapTwip)); SwDoc *pDoc = pCursor->GetDoc(); SwDocShell* pShell = pDoc->GetDocShell(); |