summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox2.cxx8
-rw-r--r--svtools/source/control/ctrlbox.cxx4
-rw-r--r--svtools/source/control/ruler.cxx2
-rw-r--r--svtools/source/control/scriptedtext.cxx4
-rw-r--r--svtools/source/control/tabbar.cxx2
-rw-r--r--svtools/source/table/gridtablerenderer.cxx10
6 files changed, 15 insertions, 15 deletions
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index cba104827c8d..504af9f6fdd9 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -606,7 +606,7 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
}
else
{
- rRenderContext.Push(PushFlags::FILLCOLOR);
+ rRenderContext.Push(vcl::PushFlags::FILLCOLOR);
rRenderContext.SetFillColor(COL_BLACK);
rRenderContext.DrawRect(tools::Rectangle(Point(nX, 0), Size(pCol->Width(), GetTitleHeight() - 1)));
rRenderContext.Pop();
@@ -621,7 +621,7 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
{
const StyleSettings &rSettings = rRenderContext.GetSettings().GetStyleSettings();
Color aColFace(rSettings.GetFaceColor());
- rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+ rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR);
rRenderContext.SetFillColor(aColFace);
rRenderContext.SetLineColor(aColFace);
rRenderContext.DrawRect(tools::Rectangle(Point(nX, 0),
@@ -724,7 +724,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlag
pFirstCol->Title(), !IsEnabled());
aButtonFrame.Draw( *pDev );
- pDev->Push( PushFlags::LINECOLOR );
+ pDev->Push( vcl::PushFlags::LINECOLOR );
pDev->SetLineColor( COL_BLACK );
pDev->DrawLine( Point( aRealPos.X(), aRealPos.Y() + nTitleHeight-1 ),
@@ -932,7 +932,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
{
// draw horizontal delimitation lines
_rOut.SetClipRegion();
- _rOut.Push( PushFlags::LINECOLOR );
+ _rOut.Push( vcl::PushFlags::LINECOLOR );
_rOut.SetLineColor( aDelimiterLineColor );
tools::Long nY = aPos.Y() + nDataRowHeigt - 1;
if (nY <= aOverallAreaBRPos.Y())
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 33218f9cb9ed..ac00e4a377a3 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -568,7 +568,7 @@ IMPL_LINK_NOARG(FontNameBox, UpdateHdl, Timer*, void)
static void DrawPreview(const FontMetric& rFontMetric, const Point& rTopLeft, OutputDevice& rDevice, bool bSelected)
{
- rDevice.Push(PushFlags::TEXTCOLOR);
+ rDevice.Push(vcl::PushFlags::TEXTCOLOR);
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
if (bSelected)
@@ -1618,7 +1618,7 @@ void SvtLineListBox::UpdatePreview()
Image aImage(m_xLineSet->GetItemImage(m_xLineSet->GetSelectedItemId()));
m_xControl->set_label("");
const auto nPos = (aVirDev->GetOutputSizePixel().Height() - aImage.GetSizePixel().Height()) / 2;
- aVirDev->Push(PushFlags::MAPMODE);
+ aVirDev->Push(vcl::PushFlags::MAPMODE);
aVirDev->SetMapMode(MapMode(MapUnit::MapPixel));
aVirDev->Erase();
aVirDev->DrawImage(Point(0, nPos), aImage);
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 467b6d8a7534..f17d60a03765 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2686,7 +2686,7 @@ void Ruler::DrawTab(vcl::RenderContext& rRenderContext, const Color &rFillColor,
Point aPos(rPos);
sal_uInt16 nTabStyle = nStyle & (RULER_TAB_STYLE | RULER_TAB_RTL);
- rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
+ rRenderContext.Push(vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR);
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(rFillColor);
ImplCenterTabPos(aPos, nTabStyle);
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 4c7155dea8dc..fc7e3e8a703e 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -105,7 +105,7 @@ void SvtScriptedTextHelper_Impl::CalculateSizes()
{
maTextSize.setWidth(0);
maTextSize.setHeight(0);
- mrOutDevice.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
+ mrOutDevice.Push(vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR);
// calculate text portion widths and total width
maWidthVec.clear();
@@ -247,7 +247,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos )
DBG_ASSERT( maPosVec.size() - 1 == maScriptVec.size(), "SvtScriptedTextHelper_Impl::DrawText - invalid vectors" );
DBG_ASSERT( maScriptVec.size() == maWidthVec.size(), "SvtScriptedTextHelper_Impl::DrawText - invalid vectors" );
- mrOutDevice.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
+ mrOutDevice.Push(vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR);
Point aCurrPos( _rPos );
sal_Int32 nThisPos = maPosVec[ 0 ];
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 66f1fc67552e..4e0cc77e1040 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1114,7 +1114,7 @@ void TabBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& r
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
ImplGetColors(rStyleSettings, aFaceColor, aFaceTextColor, aSelectColor, aSelectTextColor);
- rRenderContext.Push(PushFlags::FONT | PushFlags::CLIPREGION);
+ rRenderContext.Push(vcl::PushFlags::FONT | vcl::PushFlags::CLIPREGION);
rRenderContext.SetClipRegion(vcl::Region(GetPageArea()));
// select font
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index a0bcc2bb30c8..f814fc64d708 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -219,7 +219,7 @@ namespace svt::table
{
OSL_PRECOND(_bIsColHeaderArea || _bIsRowHeaderArea, "GridTableRenderer::PaintHeaderArea: invalid area flags!");
- rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+ rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR);
Color const background = lcl_getEffectiveColor(m_pImpl->rModel.getHeaderBackgroundColor(),
_rStyle, &StyleSettings::GetDialogColor);
@@ -244,7 +244,7 @@ namespace svt::table
vcl::RenderContext& rRenderContext,
const tools::Rectangle& _rArea, const StyleSettings& _rStyle)
{
- rRenderContext.Push(PushFlags::LINECOLOR);
+ rRenderContext.Push(vcl::PushFlags::LINECOLOR);
OUString sHeaderText;
PColumnModel const pColumn = m_pImpl->rModel.getColumnModel( _nCol );
@@ -305,7 +305,7 @@ namespace svt::table
// remember the row for subsequent calls to the other ->ITableRenderer methods
m_pImpl->nCurrentRow = _nRow;
- rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+ rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR);
Color backgroundColor = _rStyle.GetFieldColor();
@@ -363,7 +363,7 @@ namespace svt::table
void GridTableRenderer::PaintRowHeader(vcl::RenderContext& rRenderContext,
const tools::Rectangle& _rArea, const StyleSettings& _rStyle)
{
- rRenderContext.Push( PushFlags::LINECOLOR | PushFlags::TEXTCOLOR );
+ rRenderContext.Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::TEXTCOLOR );
std::optional<Color> const aLineColor( m_pImpl->rModel.getLineColor() );
Color const lineColor = !aLineColor ? _rStyle.GetSeparatorColor() : *aLineColor;
@@ -415,7 +415,7 @@ namespace svt::table
void GridTableRenderer::PaintCell(ColPos const i_column, bool _bSelected, bool i_hasControlFocus,
vcl::RenderContext& rRenderContext, const tools::Rectangle& _rArea, const StyleSettings& _rStyle)
{
- rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR);
+ rRenderContext.Push(vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR);
tools::Rectangle const aContentArea(lcl_getContentArea(*m_pImpl, _rArea));
CellRenderContext const aCellRenderContext(rRenderContext, aContentArea, _rStyle, i_column, _bSelected, i_hasControlFocus);
generated by cgit (git 2.34.1) at 2024-07-12 04:35:34 +0000