summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2021-09-03 02:19:33 +1000
committerTomaž Vajngerl <quikee@gmail.com>2021-09-28 08:20:32 +0200
commit4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch)
treec67ddea9c5551e069cb75fe0901cdcfa3f00b054 /sfx2
parent1734e97222324c137ecd084ad2464abdff2698d1 (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 'sfx2')
-rw-r--r--sfx2/source/appl/newhelp.cxx2
-rw-r--r--sfx2/source/control/recentdocsview.cxx2
-rw-r--r--sfx2/source/control/thumbnailview.cxx2
-rw-r--r--sfx2/source/dialog/StyleList.cxx4
-rw-r--r--sfx2/source/dialog/titledockwin.cxx2
-rw-r--r--sfx2/source/view/lokcharthelper.cxx4
6 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 2f935388f068..bc3848821d2a 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -431,7 +431,7 @@ IMPL_LINK(IndexTabPage_Impl, CustomRenderHdl, weld::TreeView::render_args, aPayl
bool bSelected = std::get<2>(aPayload);
const OUString& rId = std::get<3>(aPayload);
- rRenderContext.Push(PushFlags::TEXTCOLOR);
+ rRenderContext.Push(vcl::PushFlags::TEXTCOLOR);
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
if (bSelected)
rRenderContext.SetTextColor(rStyleSettings.GetHighlightTextColor());
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index dd38fb8dc7ea..3da4bfb88818 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -360,7 +360,7 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
}
// No recent files to be shown yet. Show a welcome screen.
- rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
+ rRenderContext.Push(vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR);
SetMessageFont(rRenderContext);
rRenderContext.SetTextColor(maTextColor);
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index ef97894f9162..7d48b674f4c5 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -878,7 +878,7 @@ void ThumbnailView::SetDrawingArea(weld::DrawingArea* pDrawingArea)
void ThumbnailView::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& /*rRect*/)
{
- rRenderContext.Push(PushFlags::ALL);
+ rRenderContext.Push(vcl::PushFlags::ALL);
rRenderContext.SetTextFillColor();
rRenderContext.SetBackground(maFillColor);
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx
index e2b80c1e71d7..5d2b778ada92 100644
--- a/sfx2/source/dialog/StyleList.cxx
+++ b/sfx2/source/dialog/StyleList.cxx
@@ -1573,7 +1573,7 @@ IMPL_LINK(StyleList, CustomRenderHdl, weld::TreeView::render_args, aPayload, voi
bool bSelected = std::get<2>(aPayload);
const OUString& rId = std::get<3>(aPayload);
- rRenderContext.Push(PushFlags::TEXTCOLOR);
+ rRenderContext.Push(vcl::PushFlags::TEXTCOLOR);
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
if (bSelected)
rRenderContext.SetTextColor(rStyleSettings.GetHighlightTextColor());
@@ -1592,7 +1592,7 @@ IMPL_LINK(StyleList, CustomRenderHdl, weld::TreeView::render_args, aPayload, voi
if (pStyleSheet)
{
- rRenderContext.Push(PushFlags::ALL);
+ rRenderContext.Push(vcl::PushFlags::ALL);
sal_Int32 nSize = aRect.GetHeight();
std::unique_ptr<sfx2::StylePreviewRenderer> pStylePreviewRenderer(
pStyleManager->CreateStylePreviewRenderer(rRenderContext, pStyleSheet, nSize));
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index e060a343a8a4..69f530c49592 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -135,7 +135,7 @@ namespace sfx2
SfxDockingWindow::Paint(rRenderContext, i_rArea);
- rRenderContext.Push(PushFlags::FONT | PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+ rRenderContext.Push(vcl::PushFlags::FONT | vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR);
rRenderContext.SetFillColor(rStyleSettings.GetDialogColor());
rRenderContext.SetLineColor();
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index 789a497f9593..5f29a9981904 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -214,7 +214,7 @@ void LokChartHelper::PaintTile(VirtualDevice& rRenderContext, const tools::Recta
bool bRenderContextEnableMapMode = !rRenderContext.IsMapModeEnabled();
rRenderContext.EnableMapMode();
- rRenderContext.Push(PushFlags::MAPMODE);
+ rRenderContext.Push(vcl::PushFlags::MAPMODE);
MapMode aCWMapMode = pChartWindow->GetMapMode();
aCWMapMode.SetScaleX(rRenderContext.GetMapMode().GetScaleX());
@@ -244,7 +244,7 @@ void LokChartHelper::PaintAllChartsOnTile(VirtualDevice& rDevice,
// Resizes the virtual device so to contain the entries context
rDevice.SetOutputSizePixel(Size(nOutputWidth, nOutputHeight));
- rDevice.Push(PushFlags::MAPMODE);
+ rDevice.Push(vcl::PushFlags::MAPMODE);
MapMode aMapMode(rDevice.GetMapMode());
// Scaling. Must convert from pixels to twips. We know