diff options
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/framelink.cxx | 6 | ||||
-rw-r--r-- | svx/source/dialog/framelinkarray.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/galctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontactofpageview.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 190858bdc9fe..fec46f81bc2c 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -746,7 +746,7 @@ vcl::Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& r */ void lclSetColorToOutDev( OutputDevice& rDev, const Color& rColor, const Color* pForceColor ) { - rDev.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); + rDev.Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); rDev.SetLineColor( pForceColor ? *pForceColor : rColor ); rDev.SetFillColor( pForceColor ? *pForceColor : rColor ); } @@ -958,7 +958,7 @@ void lclPushDiagClipRect( OutputDevice& rDev, const Rectangle& rRect, const Diag if( (aClipRect.GetWidth() < 1) ||(aClipRect.GetHeight() < 1) ) aClipRect.SetEmpty(); - rDev.Push( PUSH_CLIPREGION ); + rDev.Push( PushFlags::CLIPREGION ); rDev.IntersectClipRegion( aClipRect ); } @@ -1005,7 +1005,7 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool aRPoints.maBeg, aRPoints.maEnd, rRect.BottomLeft(), rRect.BottomRight(), rRect.TopRight() ) ); } - rDev.Push( PUSH_CLIPREGION ); + rDev.Push( PushFlags::CLIPREGION ); rDev.IntersectClipRegion( aClipReg ); } diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 9ad80ccc53b0..6a3371941812 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -1126,7 +1126,7 @@ void Array::DrawRange( OutputDevice& rDev, // *** diagonal frame borders *** // set clipping region to clip partly visible merged cells - rDev.Push( PUSH_CLIPREGION ); + rDev.Push( PushFlags::CLIPREGION ); rDev.IntersectClipRegion( GetClipRangeRectangle() ); for( nRow = nFirstRow; nRow <= nLastRow; ++nRow ) { diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 42930b756cf0..72b815a9a1c7 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1031,7 +1031,7 @@ void FmFilterItemsString::Paint( const bool bIsCurrentFilter = pForm->GetChildren()[ pForm->GetFilterController()->getActiveTerm() ] == pRow; if ( bIsCurrentFilter ) { - rDev.Push( PUSH_LINECOLOR ); + rDev.Push( PushFlags::LINECOLOR ); rDev.SetLineColor( rDev.GetTextColor() ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 9b9c71824428..74d97120c86f 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -506,7 +506,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 /*nColumnId*/ ) const { - rDev.Push( PUSH_CLIPREGION ); + rDev.Push( PushFlags::CLIPREGION ); rDev.IntersectClipRegion( rRect ); if( mpTheme && ( mnCurRow < mpTheme->GetObjectCount() ) ) diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index f778df103307..c9d9366c24ca 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -161,7 +161,7 @@ namespace sdr if(!rRedrawArea.IsEmpty()) { bClipRegionPushed = true; - pOutDev->Push(PUSH_CLIPREGION); + pOutDev->Push(PushFlags::CLIPREGION); pOutDev->IntersectClipRegion(rRedrawArea); } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 7712e625c55f..9a3d88262d9f 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -191,7 +191,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) { const Rectangle aRect = rUDEvt.GetRect(); OutputDevice* pDev = rUDEvt.GetDevice(); - pDev->Push( PUSH_ALL ); + pDev->Push( PushFlags::ALL ); const sal_uInt16 nItemId = rUDEvt.GetItemId(); const long nRectHeight = aRect.GetHeight(); |