diff options
Diffstat (limited to 'vcl/source')
46 files changed, 196 insertions, 196 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index f1dddeb0e616..06851eae1589 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -264,8 +264,8 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal if( mnStyle & QuickHelpFlags::BiDiRtl ) { - ComplexTextLayoutFlags nLayoutMode = GetOutDev()->GetLayoutMode(); - nLayoutMode |= ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft; + vcl::text::ComplexTextLayoutFlags nLayoutMode = GetOutDev()->GetLayoutMode(); + nLayoutMode |= vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::TextOriginLeft; GetOutDev()->SetLayoutMode( nLayoutMode ); } SetHelpText( rText ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 87e128b819e2..44151223aac1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -795,7 +795,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice *pDev, SystemTextColorFl if (aInRect.Right() < aInRect.Left() || aInRect.Bottom() < aInRect.Top()) return; - pDev->Push(PushFlags::CLIPREGION); + pDev->Push(vcl::PushFlags::CLIPREGION); pDev->IntersectClipRegion(aInRect); if (nSystemTextColorFlags & SystemTextColorFlags::Mono) @@ -2093,7 +2093,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, SystemTextColorFlags nSystemText WinBits nWinStyle = GetStyle(); OUString aText( GetText() ); - pDev->Push( PushFlags::CLIPREGION ); + pDev->Push( vcl::PushFlags::CLIPREGION ); pDev->IntersectClipRegion( tools::Rectangle( rPos, rSize ) ); // no image radio button @@ -2849,7 +2849,7 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, DrawButtonFlags void RadioButton::ImplAdjustNWFSizes() { - GetOutDev()->Push( PushFlags::MAPMODE ); + GetOutDev()->Push( vcl::PushFlags::MAPMODE ); SetMapMode(MapMode(MapUnit::MapPixel)); ImplControlValue aControlValue; @@ -3093,7 +3093,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, SystemTextColorFlags nSystemTextCol WinBits nWinStyle = GetStyle(); OUString aText( GetText() ); - pDev->Push( PushFlags::CLIPREGION | PushFlags::LINECOLOR ); + pDev->Push( vcl::PushFlags::CLIPREGION | vcl::PushFlags::LINECOLOR ); pDev->IntersectClipRegion( tools::Rectangle( rPos, rSize ) ); if (!aText.isEmpty() || HasImage()) @@ -3651,7 +3651,7 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFl void CheckBox::ImplAdjustNWFSizes() { - GetOutDev()->Push( PushFlags::MAPMODE ); + GetOutDev()->Push( vcl::PushFlags::MAPMODE ); SetMapMode(MapMode(MapUnit::MapPixel)); ImplControlValue aControlValue; diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index cf221b2b02c7..00eb0035f1fd 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -64,8 +64,8 @@ void Control::dispose() void Control::EnableRTL( bool bEnable ) { // convenience: for controls also switch layout mode - GetOutDev()->SetLayoutMode( bEnable ? ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft : - ComplexTextLayoutFlags::TextOriginLeft ); + GetOutDev()->SetLayoutMode( bEnable ? vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::TextOriginLeft : + vcl::text::ComplexTextLayoutFlags::TextOriginLeft ); CompatStateChanged( StateChangedType::Mirroring ); Window::EnableRTL(bEnable); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 15ff238f32e8..a42ea92ba5c2 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -507,7 +507,7 @@ void Edit::ImplRepaint(vcl::RenderContext& rRenderContext, const tools::Rectangl if (mbForceControlBackground && IsControlBackground()) { // check if we need to set ControlBackground even in NWF case - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR); rRenderContext.SetLineColor(); rRenderContext.SetFillColor(GetControlBackground()); rRenderContext.DrawRect(tools::Rectangle(aPos, Size(GetOutputSizePixel().Width() - 2 * mnXOffset, GetOutputSizePixel().Height()))); @@ -2192,12 +2192,12 @@ void Edit::StateChanged( StateChangedType nType ) if (GetParent()->GetStyle() & WB_LEFT) mnAlign = EDIT_ALIGN_RIGHT; if (nType == StateChangedType::Mirroring) - GetOutDev()->SetLayoutMode(ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft); + GetOutDev()->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::TextOriginLeft); } else if (mbIsSubEdit && !GetParent()->IsRTLEnabled()) { if (nType == StateChangedType::Mirroring) - GetOutDev()->SetLayoutMode(ComplexTextLayoutFlags::TextOriginLeft); + GetOutDev()->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::TextOriginLeft); } if (nStyle & WB_RIGHT) diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a927f27af407..2977797b815a 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -504,7 +504,7 @@ void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext) else if (nWinStyle & WB_VERT) { tools::Long nWidth = rRenderContext.GetTextWidth(aText); - rRenderContext.Push(PushFlags::FONT); + rRenderContext.Push(vcl::PushFlags::FONT); vcl::Font aFont(rRenderContext.GetFont()); aFont.SetOrientation(900_deg10); SetFont(aFont); diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 691278f73b9b..ce983e088fa2 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -545,7 +545,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const too if (!nCount) return; - rRenderContext.Push(PushFlags::CLIPREGION); + rRenderContext.Push(vcl::PushFlags::CLIPREGION); rRenderContext.SetClipRegion(vcl::Region(rRect)); std::vector< SvxIconChoiceCtrlEntry* > aNewZOrderList; @@ -1399,7 +1399,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po if (eSelectionMode != SelectionMode::NONE) bSelected = pEntry->IsSelected(); - rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR); + rRenderContext.Push(vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR); OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry)); tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, &aEntryText)); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index e1e92b236f21..9a31a58fc4b3 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -843,7 +843,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) if (!IsMapModeEnabled() && GetMapMode().GetMapUnit() == MapUnit::MapTwip) { // rMEvt coordinates are in twips. - GetOutDev()->Push(PushFlags::MAPMODE); + GetOutDev()->Push(vcl::PushFlags::MAPMODE); EnableMapMode(); MapMode aMapMode = GetMapMode(); aMapMode.SetOrigin(Point(0, 0)); @@ -1016,7 +1016,7 @@ void ScrollBar::Tracking( const TrackingEvent& rTEvt ) if (!IsMapModeEnabled() && GetMapMode().GetMapUnit() == MapUnit::MapTwip) { // rTEvt coordinates are in twips. - GetOutDev()->Push(PushFlags::MAPMODE); + GetOutDev()->Push(vcl::PushFlags::MAPMODE); EnableMapMode(); MapMode aMapMode = GetMapMode(); aMapMode.SetOrigin(Point(0, 0)); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 96ad2c63bc80..5435865e4f04 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -2829,9 +2829,9 @@ tools::Long TextEngine::ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const * void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev ) { - ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode(); + vcl::text::ComplexTextLayoutFlags nLayoutMode = pOutDev->GetLayoutMode(); - nLayoutMode &= ~ComplexTextLayoutFlags(ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::BiDiStrong ); + nLayoutMode &= ~vcl::text::ComplexTextLayoutFlags(vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::BiDiStrong ); pOutDev->SetLayoutMode( nLayoutMode ); } diff --git a/vcl/source/filter/ieps/ieps.cxx b/vcl/source/filter/ieps/ieps.cxx index 7b5a0c96dd10..9c223d6cda90 100644 --- a/vcl/source/filter/ieps/ieps.cxx +++ b/vcl/source/filter/ieps/ieps.cxx @@ -479,7 +479,7 @@ static void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, aFont.SetColor( COL_LIGHTRED ); - pVDev->Push( PushFlags::FONT ); + pVDev->Push( vcl::PushFlags::FONT ); pVDev->SetFont( aFont ); tools::Rectangle aRect( Point( 1, 1 ), Size( nWidth - 2, nHeight - 2 ) ); diff --git a/vcl/source/filter/imet/ios2met.cxx b/vcl/source/filter/imet/ios2met.cxx index d80a8e5d1cc7..39d48deecfaa 100644 --- a/vcl/source/filter/imet/ios2met.cxx +++ b/vcl/source/filter/imet/ios2met.cxx @@ -532,7 +532,7 @@ void OS2METReader::DrawPolygon( const tools::Polygon& rPolygon ) { if ( IsLineInfo() ) { - pVirDev->Push( PushFlags::LINECOLOR ); + pVirDev->Push( vcl::PushFlags::LINECOLOR ); pVirDev->SetLineColor( COL_TRANSPARENT ); pVirDev->DrawPolygon( rPolygon ); pVirDev->Pop(); @@ -546,7 +546,7 @@ void OS2METReader::DrawPolyPolygon( const tools::PolyPolygon& rPolyPolygon ) { if ( IsLineInfo() ) { - pVirDev->Push( PushFlags::LINECOLOR ); + pVirDev->Push( vcl::PushFlags::LINECOLOR ); pVirDev->SetLineColor( COL_TRANSPARENT ); pVirDev->DrawPolyPolygon( rPolyPolygon ); pVirDev->Pop(); @@ -989,7 +989,7 @@ void OS2METReader::ReadBox(bool bGivenPos) tools::Polygon aPolygon( aBoxRect, nHRound, nVRound ); if ( nFlags & 0x40 ) { - pVirDev->Push( PushFlags::LINECOLOR ); + pVirDev->Push( vcl::PushFlags::LINECOLOR ); pVirDev->SetLineColor( COL_TRANSPARENT ); pVirDev->DrawRect( aBoxRect, nHRound, nVRound ); pVirDev->Pop(); diff --git a/vcl/source/filter/svm/SvmConverter.cxx b/vcl/source/filter/svm/SvmConverter.cxx index 8a34baa976a6..40ed636dd011 100644 --- a/vcl/source/filter/svm/SvmConverter.cxx +++ b/vcl/source/filter/svm/SvmConverter.cxx @@ -503,7 +503,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { const tools::Polygon aPoly( aRect.Center(), aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 ); - rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::LINECOLOR ) ); rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aPoly ) ); rMtf.AddAction( new MetaPopAction() ); @@ -524,7 +524,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { const tools::Polygon aPoly( aRect, aPt, aPt1, PolyStyle::Arc ); - rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::LINECOLOR ) ); rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aPoly ) ); rMtf.AddAction( new MetaPopAction() ); @@ -545,7 +545,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { const tools::Polygon aPoly( aRect, aPt, aPt1, PolyStyle::Pie ); - rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::LINECOLOR ) ); rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aPoly ) ); rMtf.AddAction( new MetaPopAction() ); @@ -560,7 +560,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case GDI_HIGHLIGHTRECT_ACTION: { ImplReadRect( rIStm, aRect ); - rMtf.AddAction( new MetaPushAction( PushFlags::RASTEROP ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::RASTEROP ) ); rMtf.AddAction( new MetaRasterOpAction( RasterOp::Invert ) ); rMtf.AddAction( new MetaRectAction( aRect ) ); rMtf.AddAction( new MetaPopAction() ); @@ -587,7 +587,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { if( bFatLine ) { - rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::LINECOLOR ) ); rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aActionPoly ) ); rMtf.AddAction( new MetaPopAction() ); @@ -610,7 +610,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { if( bFatLine ) { - rMtf.AddAction( new MetaPushAction( PushFlags::LINECOLOR ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::LINECOLOR ) ); rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolyPolygonAction( aPolyPoly ) ); rMtf.AddAction( new MetaPopAction() ); @@ -1005,7 +1005,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case GDI_PUSH_ACTION: { aLIStack.push(aLineInfo); - rMtf.AddAction( new MetaPushAction( PushFlags::ALL ) ); + rMtf.AddAction( new MetaPushAction( vcl::PushFlags::ALL ) ); // #106172# Track font relevant data in shadow VDev aFontVDev->Push(); diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx index 7e0780b93e1a..31636fa23362 100644 --- a/vcl/source/filter/svm/SvmReader.cxx +++ b/vcl/source/filter/svm/SvmReader.cxx @@ -1270,7 +1270,7 @@ rtl::Reference<MetaAction> SvmReader::PushHandler() sal_uInt16 nTmp(0); mrStream.ReadUInt16(nTmp); - pAction->SetPushFlags(static_cast<PushFlags>(nTmp)); + pAction->SetPushFlags(static_cast<vcl::PushFlags>(nTmp)); return pAction; } @@ -1424,7 +1424,7 @@ rtl::Reference<MetaAction> SvmReader::LayoutModeHandler() sal_uInt32 tmp(0); mrStream.ReadUInt32(tmp); - pAction->SetLayoutMode(static_cast<ComplexTextLayoutFlags>(tmp)); + pAction->SetLayoutMode(static_cast<vcl::text::ComplexTextLayoutFlags>(tmp)); return pAction; } diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 69c7be43a57e..33d41da4ad0d 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -1459,15 +1459,15 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case MetaActionType::LAYOUTMODE: { - ComplexTextLayoutFlags nLayoutMode = static_cast<const MetaLayoutModeAction*>(pAction)->GetLayoutMode(); + vcl::text::ComplexTextLayoutFlags nLayoutMode = static_cast<const MetaLayoutModeAction*>(pAction)->GetLayoutMode(); mnHorTextAlign = 0; - if ((nLayoutMode & ComplexTextLayoutFlags::BiDiRtl) != ComplexTextLayoutFlags::Default) + if ((nLayoutMode & vcl::text::ComplexTextLayoutFlags::BiDiRtl) != vcl::text::ComplexTextLayoutFlags::Default) { mnHorTextAlign = TA_RIGHT | TA_RTLREADING; } - if ((nLayoutMode & ComplexTextLayoutFlags::TextOriginRight) != ComplexTextLayoutFlags::Default) + if ((nLayoutMode & vcl::text::ComplexTextLayoutFlags::TextOriginRight) != vcl::text::ComplexTextLayoutFlags::Default) mnHorTextAlign |= TA_RIGHT; - else if ((nLayoutMode & ComplexTextLayoutFlags::TextOriginLeft) != ComplexTextLayoutFlags::Default) + else if ((nLayoutMode & vcl::text::ComplexTextLayoutFlags::TextOriginLeft) != vcl::text::ComplexTextLayoutFlags::Default) mnHorTextAlign &= ~TA_RIGHT; break; } diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index bc88ba62dc84..93bc6e29ee07 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1490,27 +1490,27 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) { aDstLineInfo = pAt->aLineInfo; aDstLineColor = pAt->aLineColor; - if ( pAt->nFlags & PushFlags::LINECOLOR ) + if ( pAt->nFlags & vcl::PushFlags::LINECOLOR ) aSrcLineColor = pAt->aLineColor; aDstFillColor = pAt->aFillColor; - if ( pAt->nFlags & PushFlags::FILLCOLOR ) + if ( pAt->nFlags & vcl::PushFlags::FILLCOLOR ) aSrcFillColor = pAt->aFillColor; eDstROP2 = pAt->eRasterOp; - if ( pAt->nFlags & PushFlags::RASTEROP ) + if ( pAt->nFlags & vcl::PushFlags::RASTEROP ) eSrcRasterOp = pAt->eRasterOp; aDstFont = pAt->aFont; - if ( pAt->nFlags & PushFlags::FONT ) + if ( pAt->nFlags & vcl::PushFlags::FONT ) aSrcFont = pAt->aFont; eDstTextAlign = pAt->eTextAlign; - if ( pAt->nFlags & ( PushFlags::FONT | PushFlags::TEXTALIGN ) ) + if ( pAt->nFlags & ( vcl::PushFlags::FONT | vcl::PushFlags::TEXTALIGN ) ) eSrcTextAlign = pAt->eTextAlign; aDstTextColor = pAt->aTextColor; - if ( pAt->nFlags & ( PushFlags::FONT | PushFlags::TEXTCOLOR ) ) + if ( pAt->nFlags & ( vcl::PushFlags::FONT | vcl::PushFlags::TEXTCOLOR ) ) aSrcTextColor = pAt->aTextColor; - if ( pAt->nFlags & PushFlags::MAPMODE ) + if ( pAt->nFlags & vcl::PushFlags::MAPMODE ) aSrcMapMode = pAt->aMapMode; aDstClipRegion = pAt->aClipRegion; - if ( pAt->nFlags & PushFlags::CLIPREGION ) + if ( pAt->nFlags & vcl::PushFlags::CLIPREGION ) aSrcClipRegion = pAt->aClipRegion; WMFRecord_RestoreDC(); @@ -1589,15 +1589,15 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case MetaActionType::LAYOUTMODE: { - ComplexTextLayoutFlags nLayoutMode = static_cast<const MetaLayoutModeAction*>(pMA)->GetLayoutMode(); + vcl::text::ComplexTextLayoutFlags nLayoutMode = static_cast<const MetaLayoutModeAction*>(pMA)->GetLayoutMode(); eSrcHorTextAlign = 0; // TA_LEFT - if ((nLayoutMode & ComplexTextLayoutFlags::BiDiRtl) != ComplexTextLayoutFlags::Default) + if ((nLayoutMode & vcl::text::ComplexTextLayoutFlags::BiDiRtl) != vcl::text::ComplexTextLayoutFlags::Default) { eSrcHorTextAlign = W_TA_RIGHT | W_TA_RTLREADING; } - if ((nLayoutMode & ComplexTextLayoutFlags::TextOriginRight) != ComplexTextLayoutFlags::Default) + if ((nLayoutMode & vcl::text::ComplexTextLayoutFlags::TextOriginRight) != vcl::text::ComplexTextLayoutFlags::Default) eSrcHorTextAlign |= W_TA_RIGHT; - else if ((nLayoutMode & ComplexTextLayoutFlags::TextOriginLeft) != ComplexTextLayoutFlags::Default) + else if ((nLayoutMode & vcl::text::ComplexTextLayoutFlags::TextOriginLeft) != vcl::text::ComplexTextLayoutFlags::Default) eSrcHorTextAlign &= ~W_TA_RIGHT; break; } diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index 36239dd73ae8..7be7e0bb3e7e 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -41,7 +41,7 @@ struct WMFWriterAttrStackMember vcl::Font aFont; MapMode aMapMode; vcl::Region aClipRegion; - PushFlags nFlags; + vcl::PushFlags nFlags; }; class StarSymbolToMSMultiFont; diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 9b3e26afb331..982cb0d7fbdc 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -273,7 +273,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) GDIMetaFile aTarget; bool bChanged(false); std::vector< basegfx::B2DPolyPolygon > aClips; - std::vector< PushFlags > aPushFlags; + std::vector< vcl::PushFlags > aPushFlags; std::vector< MapMode > aMapModes; // start with empty region @@ -368,16 +368,16 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case MetaActionType::PUSH : { const MetaPushAction* pA = static_cast< const MetaPushAction* >(pAction); - const PushFlags nFlags(pA->GetFlags()); + const vcl::PushFlags nFlags(pA->GetFlags()); aPushFlags.push_back(nFlags); - if(nFlags & PushFlags::CLIPREGION) + if(nFlags & vcl::PushFlags::CLIPREGION) { aClips.push_back(aClips.back()); } - if(nFlags & PushFlags::MAPMODE) + if(nFlags & vcl::PushFlags::MAPMODE) { aMapModes.push_back(aMapModes.back()); } @@ -389,10 +389,10 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) if(!aPushFlags.empty()) { - const PushFlags nFlags(aPushFlags.back()); + const vcl::PushFlags nFlags(aPushFlags.back()); aPushFlags.pop_back(); - if(nFlags & PushFlags::CLIPREGION) + if(nFlags & vcl::PushFlags::CLIPREGION) { if(aClips.size() > 1) { @@ -404,7 +404,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } - if(nFlags & PushFlags::MAPMODE) + if(nFlags & vcl::PushFlags::MAPMODE) { if(aMapModes.size() > 1) { diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index ebdef1127f6d..39fe64c33050 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -356,8 +356,8 @@ void GDIMetaFile::Play(OutputDevice& rOut, size_t nPos) // This is necessary, since old metafiles don't even know of these // recent add-ons. Newer metafiles must of course explicitly set // those states. - rOut.Push(PushFlags::TEXTLAYOUTMODE|PushFlags::TEXTLANGUAGE); - rOut.SetLayoutMode(ComplexTextLayoutFlags::Default); + rOut.Push(vcl::PushFlags::TEXTLAYOUTMODE|vcl::PushFlags::TEXTLANGUAGE); + rOut.SetLayoutMode(vcl::text::ComplexTextLayoutFlags::Default); rOut.SetDigitLanguage(LANGUAGE_SYSTEM); SAL_INFO( "vcl.gdi", "GDIMetaFile::Play on device of size: " << rOut.GetOutputSizePixel().Width() << " " << rOut.GetOutputSizePixel().Height()); @@ -506,7 +506,7 @@ void GDIMetaFile::Play(OutputDevice& rOut, const Point& rPos, // This is necessary, since old metafiles don't even know of these // recent add-ons. Newer metafiles must of course explicitly set // those states. - rOut.SetLayoutMode(ComplexTextLayoutFlags::Default); + rOut.SetLayoutMode(vcl::text::ComplexTextLayoutFlags::Default); rOut.SetDigitLanguage(LANGUAGE_SYSTEM); Play(rOut); @@ -1308,7 +1308,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R aMapVDev->SetMapMode( GetPrefMapMode() ); std::vector<tools::Rectangle> aClipStack( 1, tools::Rectangle() ); - std::vector<PushFlags> aPushFlagStack; + std::vector<vcl::PushFlags> aPushFlagStack; tools::Rectangle aBound; @@ -1695,7 +1695,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R { MetaPushAction* pAct = static_cast<MetaPushAction*>(pAction); aPushFlagStack.push_back( pAct->GetFlags() ); - if( aPushFlagStack.back() & PushFlags::CLIPREGION ) + if( aPushFlagStack.back() & vcl::PushFlags::CLIPREGION ) { tools::Rectangle aRect( aClipStack.back() ); aClipStack.push_back( aRect ); @@ -1706,7 +1706,7 @@ tools::Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, tools::R // sanity check if( ! aPushFlagStack.empty() ) { - if( aPushFlagStack.back() & PushFlags::CLIPREGION ) + if( aPushFlagStack.back() & vcl::PushFlags::CLIPREGION ) { if( aClipStack.size() > 1 ) aClipStack.pop_back(); diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index f03164873448..7141e2e2cb4f 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -346,9 +346,9 @@ const BitmapEx& Graphic::GetBitmapExRef() const return mxImpGraphic->getBitmapExRef(); } -uno::Reference<graphic::XGraphic> Graphic::GetXGraphic() const +uno::Reference<css::graphic::XGraphic> Graphic::GetXGraphic() const { - uno::Reference<graphic::XGraphic> xGraphic; + uno::Reference<css::graphic::XGraphic> xGraphic; if (GetType() != GraphicType::NONE) { diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 74f343ed9e9f..7ac2190235e2 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1662,13 +1662,13 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) MetaPushAction::MetaPushAction() : MetaAction ( MetaActionType::PUSH ), - mnFlags ( PushFlags::NONE ) + mnFlags ( vcl::PushFlags::NONE ) {} MetaPushAction::~MetaPushAction() {} -MetaPushAction::MetaPushAction( PushFlags nFlags ) : +MetaPushAction::MetaPushAction( vcl::PushFlags nFlags ) : MetaAction ( MetaActionType::PUSH ), mnFlags ( nFlags ) {} @@ -2038,13 +2038,13 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) MetaLayoutModeAction::MetaLayoutModeAction() : MetaAction ( MetaActionType::LAYOUTMODE ), - mnLayoutMode( ComplexTextLayoutFlags::Default ) + mnLayoutMode( vcl::text::ComplexTextLayoutFlags::Default ) {} MetaLayoutModeAction::~MetaLayoutModeAction() {} -MetaLayoutModeAction::MetaLayoutModeAction( ComplexTextLayoutFlags nLayoutMode ) : +MetaLayoutModeAction::MetaLayoutModeAction( vcl::text::ComplexTextLayoutFlags nLayoutMode ) : MetaAction ( MetaActionType::LAYOUTMODE ), mnLayoutMode( nLayoutMode ) {} diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx index 4ad870cb019c..a66de852d6ac 100644 --- a/vcl/source/gdi/mtfxmldump.cxx +++ b/vcl/source/gdi/mtfxmldump.cxx @@ -21,42 +21,42 @@ namespace { -OUString collectPushFlags(PushFlags nFlags) +OUString collectPushFlags(vcl::PushFlags nFlags) { - if ((nFlags & PushFlags::ALL) == PushFlags::ALL) + if ((nFlags & vcl::PushFlags::ALL) == vcl::PushFlags::ALL) return "PushAll"; else if ((nFlags & PUSH_ALLFONT) == PUSH_ALLFONT) return "PushAllFont"; std::vector<OUString> aStrings; - if (nFlags & PushFlags::LINECOLOR) + if (nFlags & vcl::PushFlags::LINECOLOR) aStrings.emplace_back("PushLineColor"); - if (nFlags & PushFlags::FILLCOLOR) + if (nFlags & vcl::PushFlags::FILLCOLOR) aStrings.emplace_back("PushFillColor"); - if (nFlags & PushFlags::FONT) + if (nFlags & vcl::PushFlags::FONT) aStrings.emplace_back("PushFont"); - if (nFlags & PushFlags::TEXTCOLOR) + if (nFlags & vcl::PushFlags::TEXTCOLOR) aStrings.emplace_back("PushTextColor"); - if (nFlags & PushFlags::MAPMODE) + if (nFlags & vcl::PushFlags::MAPMODE) aStrings.emplace_back("PushMapMode"); - if (nFlags & PushFlags::CLIPREGION) + if (nFlags & vcl::PushFlags::CLIPREGION) aStrings.emplace_back("PushClipRegion"); - if (nFlags & PushFlags::RASTEROP) + if (nFlags & vcl::PushFlags::RASTEROP) aStrings.emplace_back("PushRasterOp"); - if (nFlags & PushFlags::TEXTFILLCOLOR) + if (nFlags & vcl::PushFlags::TEXTFILLCOLOR) aStrings.emplace_back("PushTextFillColor"); - if (nFlags & PushFlags::TEXTALIGN) + if (nFlags & vcl::PushFlags::TEXTALIGN) aStrings.emplace_back("PushTextAlign"); - if (nFlags & PushFlags::REFPOINT) + if (nFlags & vcl::PushFlags::REFPOINT) aStrings.emplace_back("PushRefPoint"); - if (nFlags & PushFlags::TEXTLINECOLOR) + if (nFlags & vcl::PushFlags::TEXTLINECOLOR) aStrings.emplace_back("PushTextLineColor"); - if (nFlags & PushFlags::TEXTLAYOUTMODE) + if (nFlags & vcl::PushFlags::TEXTLAYOUTMODE) aStrings.emplace_back("PushTextLayoutMode"); - if (nFlags & PushFlags::TEXTLANGUAGE) + if (nFlags & vcl::PushFlags::TEXTLANGUAGE) aStrings.emplace_back("PushTextLanguage"); - if (nFlags & PushFlags::OVERLINECOLOR) + if (nFlags & vcl::PushFlags::OVERLINECOLOR) aStrings.emplace_back("PushOverlineColor"); OUString aString; @@ -437,16 +437,16 @@ OUString convertPixelFormatToString(vcl::PixelFormat ePixelFormat) return OUString(); } -OUString convertComplexTestLayoutFlags(ComplexTextLayoutFlags eComplexTestLayoutFlags) +OUString convertComplexTestLayoutFlags(vcl::text::ComplexTextLayoutFlags eComplexTestLayoutFlags) { switch(eComplexTestLayoutFlags) { default: - case ComplexTextLayoutFlags::Default: return "#0000"; - case ComplexTextLayoutFlags::BiDiRtl: return "#0001"; - case ComplexTextLayoutFlags::BiDiStrong: return "#0002"; - case ComplexTextLayoutFlags::TextOriginLeft: return "#0004"; - case ComplexTextLayoutFlags::TextOriginRight: return "#0008"; + case vcl::text::ComplexTextLayoutFlags::Default: return "#0000"; + case vcl::text::ComplexTextLayoutFlags::BiDiRtl: return "#0001"; + case vcl::text::ComplexTextLayoutFlags::BiDiStrong: return "#0002"; + case vcl::text::ComplexTextLayoutFlags::TextOriginLeft: return "#0004"; + case vcl::text::ComplexTextLayoutFlags::TextOriginRight: return "#0008"; } } diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 164b75f66868..40210eabcff3 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -274,7 +274,7 @@ void PDFWriter::IntersectClipRegion( const tools::Rectangle& rRect ) xImplementation->intersectClipRegion( rRect ); } -void PDFWriter::SetLayoutMode( ComplexTextLayoutFlags nMode ) +void PDFWriter::SetLayoutMode( vcl::text::ComplexTextLayoutFlags nMode ) { xImplementation->setLayoutMode( nMode ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 858f73f9d057..6b02a6d384fc 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7068,8 +7068,8 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, tools::Long nWidth, Fo } // strikeout string is left aligned non-CTL text - ComplexTextLayoutFlags nOrigTLM = GetLayoutMode(); - SetLayoutMode(ComplexTextLayoutFlags::BiDiStrong); + vcl::text::ComplexTextLayoutFlags nOrigTLM = GetLayoutMode(); + SetLayoutMode(vcl::text::ComplexTextLayoutFlags::BiDiStrong); push( PushFlags::CLIPREGION ); FontMetric aRefDevFontMetric = GetFontMetric(); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index df685efbcb13..9c6df8648276 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -262,7 +262,7 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, default: nMove = 0; break; } - Push( PushFlags::CLIPREGION | PushFlags::LINECOLOR ); + Push( vcl::PushFlags::CLIPREGION | vcl::PushFlags::LINECOLOR ); IntersectClipRegion(vcl::Region(rPolyPoly)); SetLineColor( GetFillColor() ); const bool bOldMap = mbMap; @@ -737,7 +737,7 @@ void Printer::DrawDeviceMask( const Bitmap& rMask, const Color& rMaskColor, mpMetaFile = nullptr; mbMap = false; - Push( PushFlags::FILLCOLOR | PushFlags::LINECOLOR ); + Push( vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR ); SetLineColor( rMaskColor ); SetFillColor( rMaskColor ); InitLineColor(); @@ -1623,7 +1623,7 @@ void Printer::ClipAndDrawGradientMetafile ( const Gradient &rGradient, const too { const tools::Rectangle aBoundRect( rPolyPoly.GetBoundRect() ); - Push( PushFlags::CLIPREGION ); + Push( vcl::PushFlags::CLIPREGION ); IntersectClipRegion(vcl::Region(rPolyPoly)); DrawGradient( aBoundRect, rGradient ); Pop(); diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 4f05a779efb4..85b39c683d6d 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -56,7 +56,7 @@ void Printer::DrawGradientEx( OutputDevice* pOut, const tools::Rectangle& rRect, ( static_cast<tools::Long>(rEndColor.GetBlue()) * rGradient.GetEndIntensity() ) / 100 ) >> 1; const Color aColor( static_cast<sal_uInt8>(nR), static_cast<sal_uInt8>(nG), static_cast<sal_uInt8>(nB) ); - pOut->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); + pOut->Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR ); pOut->SetLineColor( aColor ); pOut->SetFillColor( aColor ); pOut->DrawRect( rRect ); diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 5f4edb969e5c..94a24254f99a 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -244,9 +244,9 @@ namespace vcl return tools::Rectangle(); // determine text layout mode from the RTL-ness of the control whose text we render - ComplexTextLayoutFlags nTextLayoutMode = m_bRTLEnabled ? ComplexTextLayoutFlags::BiDiRtl : ComplexTextLayoutFlags::Default; + text::ComplexTextLayoutFlags nTextLayoutMode = m_bRTLEnabled ? text::ComplexTextLayoutFlags::BiDiRtl : text::ComplexTextLayoutFlags::Default; m_rReferenceDevice.SetLayoutMode( nTextLayoutMode ); - m_rTargetDevice.SetLayoutMode( nTextLayoutMode | ComplexTextLayoutFlags::TextOriginLeft ); + m_rTargetDevice.SetLayoutMode( nTextLayoutMode | text::ComplexTextLayoutFlags::TextOriginLeft ); // ComplexTextLayoutFlags::TextOriginLeft is because when we do actually draw the text (in DrawText( Point, ... )), then // our caller gives us the left border of the draw position, regardless of script type, text layout, @@ -298,9 +298,9 @@ namespace vcl return tools::Rectangle(); // determine text layout mode from the RTL-ness of the control whose text we render - ComplexTextLayoutFlags nTextLayoutMode = m_bRTLEnabled ? ComplexTextLayoutFlags::BiDiRtl : ComplexTextLayoutFlags::Default; + text::ComplexTextLayoutFlags nTextLayoutMode = m_bRTLEnabled ? text::ComplexTextLayoutFlags::BiDiRtl : text::ComplexTextLayoutFlags::Default; m_rReferenceDevice.SetLayoutMode( nTextLayoutMode ); - m_rTargetDevice.SetLayoutMode( nTextLayoutMode | ComplexTextLayoutFlags::TextOriginLeft ); + m_rTargetDevice.SetLayoutMode( nTextLayoutMode | text::ComplexTextLayoutFlags::TextOriginLeft ); // ComplexTextLayoutFlags::TextOriginLeft is because when we do actually draw the text (in DrawText( Point, ... )), then // our caller gives us the left border of the draw position, regardless of script type, text layout, diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 77f364aded4d..fb4f52625c09 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -342,7 +342,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const tools::Rectangle& rRect ) // Set line and fill color to black (->opaque), // fill rect with that (linecolor, too, because of // those pesky missing pixel problems) - Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); + Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR ); SetLineColor( COL_BLACK ); SetFillColor( COL_BLACK ); DrawRect( rRect ); diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx index 96f69b3c37df..9d79fcc6c5cc 100644 --- a/vcl/source/graphic/GraphicObject.cxx +++ b/vcl/source/graphic/GraphicObject.cxx @@ -491,7 +491,7 @@ bool GraphicObject::Draw(OutputDevice& rOut, const Point& rPt, const Size& rSz, bool bRectClip; const bool bCrop = ImplGetCropParams(rOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip); - rOut.Push(PushFlags::CLIPREGION); + rOut.Push(vcl::PushFlags::CLIPREGION); if( bCrop ) { @@ -562,7 +562,7 @@ bool GraphicObject::StartAnimation(OutputDevice& rOut, const Point& rPt, const S bool bRectClip; const bool bCrop = ImplGetCropParams(rOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip); - rOut.Push(PushFlags::CLIPREGION); + rOut.Push(vcl::PushFlags::CLIPREGION); if( bCrop ) { diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx index 2c377a96aa99..cfd343346b84 100644 --- a/vcl/source/graphic/GraphicObject2.cxx +++ b/vcl/source/graphic/GraphicObject2.cxx @@ -360,7 +360,7 @@ bool GraphicObject::ImplDrawTiled(OutputDevice& rOut, const tools::Rectangle& rA const Point aOutStart( aOutOrigin.X() + nInvisibleTilesX*rSizePixel.Width(), aOutOrigin.Y() + nInvisibleTilesY*rSizePixel.Height() ); - rOut.Push( PushFlags::CLIPREGION ); + rOut.Push( vcl::PushFlags::CLIPREGION ); rOut.IntersectClipRegion( rArea ); // Paint all tiles diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 6f548cbfc7a3..2cabf1898dea 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -80,7 +80,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, cCmpVal = 255; Color aCol( cCmpVal, cCmpVal, cCmpVal ); - Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); + Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR ); SetLineColor( aCol ); SetFillColor( aCol ); DrawRect( tools::Rectangle( rDestPt, rDestSize ) ); diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index ea10b6bcdf0a..d68542857cf6 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -60,7 +60,7 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly, { Color aColor = GetSingleColorGradientFill(); - Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); + Push( vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR ); SetLineColor( aColor ); SetFillColor( aColor ); DrawPolyPolygon( rPolyPoly ); @@ -97,7 +97,7 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly, return; // secure clip region - Push( PushFlags::CLIPREGION ); + Push( vcl::PushFlags::CLIPREGION ); IntersectClipRegion( aBoundRect ); if (mbInitClipRegion) @@ -160,7 +160,7 @@ void OutputDevice::ClipAndDrawGradientMetafile ( const Gradient &rGradient, cons const bool bOldOutput = IsOutputEnabled(); EnableOutput( false ); - Push( PushFlags::RASTEROP ); + Push( vcl::PushFlags::RASTEROP ); SetRasterOp( RasterOp::Xor ); DrawGradient( aBoundRect, rGradient ); SetFillColor( COL_BLACK ); @@ -1000,7 +1000,7 @@ void OutputDevice::AddGradientActions( const tools::Rectangle& rRect, const Grad GDIMetaFile* pOldMtf = mpMetaFile; mpMetaFile = &rMtf; - mpMetaFile->AddAction( new MetaPushAction( PushFlags::ALL ) ); + mpMetaFile->AddAction( new MetaPushAction( vcl::PushFlags::ALL ) ); mpMetaFile->AddAction( new MetaISectRectClipRegionAction( aRect ) ); mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) ); diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx index fbbab235fee4..89e89f8a1db4 100644 --- a/vcl/source/outdev/hatch.cxx +++ b/vcl/source/outdev/hatch.cxx @@ -85,7 +85,7 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& mpMetaFile = nullptr; EnableMapMode( false ); - Push( PushFlags::LINECOLOR ); + Push( vcl::PushFlags::LINECOLOR ); SetLineColor( aHatch.GetColor() ); InitLineColor(); DrawHatch( aPolyPoly, aHatch, false ); @@ -110,7 +110,7 @@ void OutputDevice::AddHatchActions( const tools::PolyPolygon& rPolyPoly, const H GDIMetaFile* pOldMtf = mpMetaFile; mpMetaFile = &rMtf; - mpMetaFile->AddAction( new MetaPushAction( PushFlags::ALL ) ); + mpMetaFile->AddAction( new MetaPushAction( vcl::PushFlags::ALL ) ); mpMetaFile->AddAction( new MetaLineColorAction( rHatch.GetColor(), true ) ); DrawHatch( aPolyPoly, rHatch, true ); mpMetaFile->AddAction( new MetaPopAction() ); diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 85a82fac0d03..cc734924540e 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -89,10 +89,10 @@ OutputDevice::OutputDevice(OutDevType eOutDevType) : mnEmphasisAscent = 0; mnEmphasisDescent = 0; mnDrawMode = DrawModeFlags::Default; - mnTextLayoutMode = ComplexTextLayoutFlags::Default; + mnTextLayoutMode = vcl::text::ComplexTextLayoutFlags::Default; if( AllSettings::GetLayoutRTL() ) //#i84553# tip BiDi preference to RTL - mnTextLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft; + mnTextLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiRtl | vcl::text::ComplexTextLayoutFlags::TextOriginLeft; meOutDevViewType = OutDevViewType::DontKnow; mbMap = false; diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index ead68bdfd2f7..554cf5ec6892 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -217,7 +217,7 @@ void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt3 const sal_uInt32 nMaxX(rPos.X() + rSize.Width()); const sal_uInt32 nMaxY(rPos.Y() + rSize.Height()); - Push(PushFlags::LINECOLOR|PushFlags::FILLCOLOR); + Push(vcl::PushFlags::LINECOLOR|vcl::PushFlags::FILLCOLOR); SetLineColor(); for(sal_uInt32 x(0), nX(rPos.X()); nX < nMaxX; x++, nX += nLen) diff --git a/vcl/source/outdev/stack.cxx b/vcl/source/outdev/stack.cxx index ee8eddf07fb1..23c9f92c1c8b 100644 --- a/vcl/source/outdev/stack.cxx +++ b/vcl/source/outdev/stack.cxx @@ -23,7 +23,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/metaact.hxx> -#include <vcl/outdevstate.hxx> +#include <vcl/rendercontext/State.hxx> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> @@ -31,59 +31,59 @@ #include <drawmode.hxx> #include <salgdi.hxx> -void OutputDevice::Push(PushFlags nFlags) +void OutputDevice::Push(vcl::PushFlags nFlags) { if (mpMetaFile) mpMetaFile->AddAction(new MetaPushAction(nFlags)); maOutDevStateStack.emplace_back(); - OutDevState& rState = maOutDevStateStack.back(); + vcl::State& rState = maOutDevStateStack.back(); rState.mnFlags = nFlags; - if (nFlags & PushFlags::LINECOLOR && mbLineColor) + if (nFlags & vcl::PushFlags::LINECOLOR && mbLineColor) rState.mpLineColor = maLineColor; - if (nFlags & PushFlags::FILLCOLOR && mbFillColor) + if (nFlags & vcl::PushFlags::FILLCOLOR && mbFillColor) rState.mpFillColor = maFillColor; - if (nFlags & PushFlags::FONT) + if (nFlags & vcl::PushFlags::FONT) rState.mpFont = maFont; - if (nFlags & PushFlags::TEXTCOLOR) + if (nFlags & vcl::PushFlags::TEXTCOLOR) rState.mpTextColor = GetTextColor(); - if (nFlags & PushFlags::TEXTFILLCOLOR && IsTextFillColor()) + if (nFlags & vcl::PushFlags::TEXTFILLCOLOR && IsTextFillColor()) rState.mpTextFillColor = GetTextFillColor(); - if (nFlags & PushFlags::TEXTLINECOLOR && IsTextLineColor()) + if (nFlags & vcl::PushFlags::TEXTLINECOLOR && IsTextLineColor()) rState.mpTextLineColor = GetTextLineColor(); - if (nFlags & PushFlags::OVERLINECOLOR && IsOverlineColor()) + if (nFlags & vcl::PushFlags::OVERLINECOLOR && IsOverlineColor()) rState.mpOverlineColor = GetOverlineColor(); - if (nFlags & PushFlags::TEXTALIGN) + if (nFlags & vcl::PushFlags::TEXTALIGN) rState.meTextAlign = GetTextAlign(); - if (nFlags & PushFlags::TEXTLAYOUTMODE) + if (nFlags & vcl::PushFlags::TEXTLAYOUTMODE) rState.mnTextLayoutMode = GetLayoutMode(); - if (nFlags & PushFlags::TEXTLANGUAGE) + if (nFlags & vcl::PushFlags::TEXTLANGUAGE) rState.meTextLanguage = GetDigitLanguage(); - if (nFlags & PushFlags::RASTEROP) + if (nFlags & vcl::PushFlags::RASTEROP) rState.meRasterOp = GetRasterOp(); - if (nFlags & PushFlags::MAPMODE) + if (nFlags & vcl::PushFlags::MAPMODE) { rState.mpMapMode = maMapMode; rState.mbMapActive = mbMap; } - if (nFlags & PushFlags::CLIPREGION && mbClipRegion) + if (nFlags & vcl::PushFlags::CLIPREGION && mbClipRegion) rState.mpClipRegion.reset(new vcl::Region(maRegion)); - if (nFlags & PushFlags::REFPOINT && mbRefPoint) + if (nFlags & vcl::PushFlags::REFPOINT && mbRefPoint) rState.mpRefPoint = maRefPoint; if (mpAlphaVDev) @@ -103,12 +103,12 @@ void OutputDevice::Pop() SAL_WARN( "vcl.gdi", "OutputDevice::Pop() without OutputDevice::Push()" ); return; } - const OutDevState& rState = maOutDevStateStack.back(); + const vcl::State& rState = maOutDevStateStack.back(); if( mpAlphaVDev ) mpAlphaVDev->Pop(); - if ( rState.mnFlags & PushFlags::LINECOLOR ) + if ( rState.mnFlags & vcl::PushFlags::LINECOLOR ) { if ( rState.mpLineColor ) SetLineColor( *rState.mpLineColor ); @@ -116,7 +116,7 @@ void OutputDevice::Pop() SetLineColor(); } - if ( rState.mnFlags & PushFlags::FILLCOLOR ) + if ( rState.mnFlags & vcl::PushFlags::FILLCOLOR ) { if ( rState.mpFillColor ) SetFillColor( *rState.mpFillColor ); @@ -124,13 +124,13 @@ void OutputDevice::Pop() SetFillColor(); } - if ( rState.mnFlags & PushFlags::FONT ) + if ( rState.mnFlags & vcl::PushFlags::FONT ) SetFont( *rState.mpFont ); - if ( rState.mnFlags & PushFlags::TEXTCOLOR ) + if ( rState.mnFlags & vcl::PushFlags::TEXTCOLOR ) SetTextColor( *rState.mpTextColor ); - if ( rState.mnFlags & PushFlags::TEXTFILLCOLOR ) + if ( rState.mnFlags & vcl::PushFlags::TEXTFILLCOLOR ) { if ( rState.mpTextFillColor ) SetTextFillColor( *rState.mpTextFillColor ); @@ -138,7 +138,7 @@ void OutputDevice::Pop() SetTextFillColor(); } - if ( rState.mnFlags & PushFlags::TEXTLINECOLOR ) + if ( rState.mnFlags & vcl::PushFlags::TEXTLINECOLOR ) { if ( rState.mpTextLineColor ) SetTextLineColor( *rState.mpTextLineColor ); @@ -146,7 +146,7 @@ void OutputDevice::Pop() SetTextLineColor(); } - if ( rState.mnFlags & PushFlags::OVERLINECOLOR ) + if ( rState.mnFlags & vcl::PushFlags::OVERLINECOLOR ) { if ( rState.mpOverlineColor ) SetOverlineColor( *rState.mpOverlineColor ); @@ -154,19 +154,19 @@ void OutputDevice::Pop() SetOverlineColor(); } - if ( rState.mnFlags & PushFlags::TEXTALIGN ) + if ( rState.mnFlags & vcl::PushFlags::TEXTALIGN ) SetTextAlign( rState.meTextAlign ); - if( rState.mnFlags & PushFlags::TEXTLAYOUTMODE ) + if( rState.mnFlags & vcl::PushFlags::TEXTLAYOUTMODE ) SetLayoutMode( rState.mnTextLayoutMode ); - if( rState.mnFlags & PushFlags::TEXTLANGUAGE ) + if( rState.mnFlags & vcl::PushFlags::TEXTLANGUAGE ) SetDigitLanguage( rState.meTextLanguage ); - if ( rState.mnFlags & PushFlags::RASTEROP ) + if ( rState.mnFlags & vcl::PushFlags::RASTEROP ) SetRasterOp( rState.meRasterOp ); - if ( rState.mnFlags & PushFlags::MAPMODE ) + if ( rState.mnFlags & vcl::PushFlags::MAPMODE ) { if ( rState.mpMapMode ) SetMapMode( *rState.mpMapMode ); @@ -175,10 +175,10 @@ void OutputDevice::Pop() mbMap = rState.mbMapActive; } - if ( rState.mnFlags & PushFlags::CLIPREGION ) + if ( rState.mnFlags & vcl::PushFlags::CLIPREGION ) SetDeviceClipRegion( rState.mpClipRegion.get() ); - if ( rState.mnFlags & PushFlags::REFPOINT ) + if ( rState.mnFlags & vcl::PushFlags::REFPOINT ) { if ( rState.mpRefPoint ) SetRefPoint( *rState.mpRefPoint ); diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index c62ab819759b..bab6b14cf53c 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -54,7 +54,7 @@ #define TEXT_DRAW_ELLIPSIS (DrawTextFlags::EndEllipsis | DrawTextFlags::PathEllipsis | DrawTextFlags::NewsEllipsis) -void OutputDevice::SetLayoutMode( ComplexTextLayoutFlags nTextLayoutMode ) +void OutputDevice::SetLayoutMode( vcl::text::ComplexTextLayoutFlags nTextLayoutMode ) { if( mpMetaFile ) mpMetaFile->AddAction( new MetaLayoutModeAction( nTextLayoutMode ) ); @@ -1138,11 +1138,11 @@ vcl::text::ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr, if( nEndIndex < nMinIndex ) nEndIndex = nMinIndex; - if( mnTextLayoutMode & ComplexTextLayoutFlags::BiDiRtl ) + if( mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::BiDiRtl ) nLayoutFlags |= SalLayoutFlags::BiDiRtl; - if( mnTextLayoutMode & ComplexTextLayoutFlags::BiDiStrong ) + if( mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::BiDiStrong ) nLayoutFlags |= SalLayoutFlags::BiDiStrong; - else if( !(mnTextLayoutMode & ComplexTextLayoutFlags::BiDiRtl) ) + else if( !(mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::BiDiRtl) ) { // Disable Bidi if no RTL hint and only known LTR codes used. bool bAllLtr = true; @@ -1168,7 +1168,7 @@ vcl::text::ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr, if( maFont.IsVertical() ) nLayoutFlags |= SalLayoutFlags::Vertical; - if( meTextLanguage ) //TODO: (mnTextLayoutMode & ComplexTextLayoutFlags::SubstituteDigits) + if( meTextLanguage ) //TODO: (mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::SubstituteDigits) { // disable character localization when no digits used const sal_Unicode* pBase = rStr.getStr(); @@ -1196,10 +1196,10 @@ vcl::text::ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr, } // right align for RTL text, DRAWPOS_REVERSED, RTL window style - bool bRightAlign = bool(mnTextLayoutMode & ComplexTextLayoutFlags::BiDiRtl); - if( mnTextLayoutMode & ComplexTextLayoutFlags::TextOriginLeft ) + bool bRightAlign = bool(mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::BiDiRtl); + if( mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::TextOriginLeft ) bRightAlign = false; - else if ( mnTextLayoutMode & ComplexTextLayoutFlags::TextOriginRight ) + else if ( mnTextLayoutMode & vcl::text::ComplexTextLayoutFlags::TextOriginRight ) bRightAlign = true; // SSA: hack for western office, ie text get right aligned // for debugging purposes of mirrored UI @@ -1556,7 +1556,7 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const tools::Recta // Set clipping if ( nStyle & DrawTextFlags::Clip ) { - rTargetDevice.Push( PushFlags::CLIPREGION ); + rTargetDevice.Push( vcl::PushFlags::CLIPREGION ); rTargetDevice.IntersectClipRegion( rRect ); } @@ -1673,7 +1673,7 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const tools::Recta if ( nStyle & DrawTextFlags::Clip ) { - rTargetDevice.Push( PushFlags::CLIPREGION ); + rTargetDevice.Push( vcl::PushFlags::CLIPREGION ); rTargetDevice.IntersectClipRegion( rRect ); _rLayout.DrawText( aPos, aStr, 0, aStr.getLength(), pVector, pDisplayText ); if ( bDrawMnemonics && nMnemonicPos != -1 ) diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index 2e8edc42f329..0b3ca866b37a 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -697,8 +697,8 @@ void OutputDevice::ImplDrawStrikeoutChar( tools::Long nBaseX, tools::Long nBaseY nBaseY += nDistY; // strikeout text has to be left aligned - ComplexTextLayoutFlags nOrigTLM = mnTextLayoutMode; - mnTextLayoutMode = ComplexTextLayoutFlags::BiDiStrong; + vcl::text::ComplexTextLayoutFlags nOrigTLM = mnTextLayoutMode; + mnTextLayoutMode = vcl::text::ComplexTextLayoutFlags::BiDiStrong; pLayout = ImplLayout( aStrikeoutText, 0, aStrikeoutText.getLength() ); mnTextLayoutMode = nOrigTLM; @@ -725,7 +725,7 @@ void OutputDevice::ImplDrawStrikeoutChar( tools::Long nBaseX, tools::Long nBaseY aPixelRect = aPoly.GetBoundRect(); } - Push( PushFlags::CLIPREGION ); + Push( vcl::PushFlags::CLIPREGION ); IntersectClipRegion( PixelToLogic(aPixelRect) ); if( mbInitClipRegion ) InitClipRegion(); diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 047723ff1a9c..7bec7d5fe4ec 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -200,7 +200,7 @@ void OutputDevice::DrawInvisiblePolygon( const tools::PolyPolygon& rPolyPoly ) return; // we assume that the border is NOT to be drawn transparently??? - Push( PushFlags::FILLCOLOR ); + Push( vcl::PushFlags::FILLCOLOR ); SetFillColor(); DrawPolyPolygon( rPolyPoly ); Pop(); @@ -505,7 +505,7 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, if( mbLineColor ) { - Push( PushFlags::FILLCOLOR ); + Push( vcl::PushFlags::FILLCOLOR ); SetFillColor(); DrawPolyPolygon( rPolyPoly ); Pop(); @@ -818,7 +818,7 @@ void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, // #i10613# Respect transparency for draw color if (nTransparency) { - o_rMtf.AddAction(new MetaPushAction(PushFlags::LINECOLOR|PushFlags::FILLCOLOR)); + o_rMtf.AddAction(new MetaPushAction(vcl::PushFlags::LINECOLOR|vcl::PushFlags::FILLCOLOR)); // assume white background for alpha blending Color aLineColor(rStateOutDev.GetLineColor()); @@ -1754,7 +1754,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ScopedVclPtrInstance<VirtualDevice> aPaintVDev; // into this one, we render. aPaintVDev->SetBackground( aBackgroundComponent.aBgColor ); - rOutMtf.AddAction( new MetaPushAction( PushFlags::MAPMODE ) ); + rOutMtf.AddAction( new MetaPushAction( vcl::PushFlags::MAPMODE ) ); rOutMtf.AddAction( new MetaMapModeAction() ); aPaintVDev->SetDrawMode( GetDrawMode() ); diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx index 2223eba4c6a2..a260af4d9596 100644 --- a/vcl/source/outdev/wallpaper.cxx +++ b/vcl/source/outdev/wallpaper.cxx @@ -202,7 +202,7 @@ void OutputDevice::DrawBitmapWallpaper( tools::Long nX, tools::Long nY, mpMetaFile = nullptr; EnableMapMode( false ); - Push( PushFlags::CLIPREGION ); + Push( vcl::PushFlags::CLIPREGION ); IntersectClipRegion( tools::Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) ); switch( eStyle ) @@ -376,7 +376,7 @@ void OutputDevice::DrawGradientWallpaper( tools::Long nX, tools::Long nY, mpMetaFile = nullptr; EnableMapMode( false ); - Push( PushFlags::CLIPREGION ); + Push( vcl::PushFlags::CLIPREGION ); IntersectClipRegion( tools::Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) ); DrawGradient( aBound, rWallpaper.GetGradient() ); diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx index aa1b8cf20dba..3bd6bbaa3120 100644 --- a/vcl/source/treelist/headbar.cxx +++ b/vcl/source/treelist/headbar.cxx @@ -444,7 +444,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos { if (aSelectionTextColor != COL_TRANSPARENT) { - rRenderContext.Push(PushFlags::TEXTCOLOR); + rRenderContext.Push(vcl::PushFlags::TEXTCOLOR); rRenderContext.SetTextColor(aSelectionTextColor); } if (IsEnabled()) diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index 077e897a46a2..f5d48c4073cc 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -1015,7 +1015,7 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext) DBG_ASSERT(pFirstDynamicTab,"No Tree!"); - rRenderContext.Push(PushFlags::LINECOLOR); + rRenderContext.Push(vcl::PushFlags::LINECOLOR); const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); Color aCol = rStyleSettings.GetFaceColor(); diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index b43b13788f09..793435822b1d 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -172,7 +172,7 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp aTriangle.SetPoint(Point(nRect.Left(), aCenter.Y()), 1); aTriangle.SetPoint(Point(nRect.Left() + n2, aCenter.Y() + n2), 2); - pDev->Push(PushFlags::LINECOLOR); + pDev->Push(vcl::PushFlags::LINECOLOR); pDev->SetLineColor(); pDev->DrawPolygon(aTriangle); pDev->Pop(); @@ -198,7 +198,7 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp aTriangle.SetPoint(Point(nRect.Right(), aCenter.Y()), 1); aTriangle.SetPoint(Point(nRect.Right() - n2, aCenter.Y() + n2), 2); - pDev->Push(PushFlags::LINECOLOR); + pDev->Push(vcl::PushFlags::LINECOLOR); pDev->SetLineColor(); pDev->DrawPolygon(aTriangle); pDev->Pop(); @@ -1009,7 +1009,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo return; } - mpOutDev->Push( PushFlags::LINECOLOR ); + mpOutDev->Push( vcl::PushFlags::LINECOLOR ); if ( rStyleSettings.GetOptions() & StyleSettingsOptions::Mono ) mpOutDev->SetLineColor( COL_BLACK ); else diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 5879eed8926c..4ac2211b8864 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -610,7 +610,7 @@ void MenuBarWindow::HighlightItem(vcl::RenderContext& rRenderContext, sal_uInt16 { // #107747# give menuitems the height of the menubar tools::Rectangle aRect(Point(nX, 1), Size(pData->aSz.Width(), aOutputSize.Height() - 2)); - rRenderContext.Push(PushFlags::CLIPREGION); + rRenderContext.Push(vcl::PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion(aRect); bool bRollover, bHighlight; if (!ImplGetSVData()->maNWFData.mbRolloverMenubar) @@ -903,7 +903,7 @@ void MenuBarWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta if (!rRenderContext.IsNativeControlSupported( ControlType::Menubar, ControlPart::Entire) && rStyleSettings.GetHighContrastMode()) { - pBuffer->Push(PushFlags::LINECOLOR | PushFlags::MAPMODE); + pBuffer->Push(vcl::PushFlags::LINECOLOR | vcl::PushFlags::MAPMODE); pBuffer->SetLineColor(COL_WHITE); pBuffer->SetMapMode(MapMode(MapUnit::MapPixel)); Size aSize = GetSizePixel(); diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index a5509f2109f3..f78036a6459c 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -863,7 +863,7 @@ void MenuFloatingWindow::RenderHighlightItem(vcl::RenderContext& rRenderContext, if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, ControlPart::Entire)) { Size aPxSize(GetOutputSizePixel()); - rRenderContext.Push(PushFlags::CLIPREGION); + rRenderContext.Push(vcl::PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion(tools::Rectangle(Point(nX, nY), Size(aSz.Width(), pData->aSz.Height()))); tools::Rectangle aCtrlRect(Point(nX, 0), Size(aPxSize.Width()-nX, aPxSize.Height())); MenupopupValue aVal(pMenu->nTextPos-GUTTERBORDER, aItemRect); @@ -1191,7 +1191,7 @@ void MenuFloatingWindow::Paint(vcl::RenderContext& rRenderContext, const tools:: // Set the clip before the buffering starts: rPaintRect may be larger than the current clip, // this way the buffer -> render context copy happens with this clip. - rRenderContext.Push(PushFlags::CLIPREGION); + rRenderContext.Push(vcl::PushFlags::CLIPREGION); rRenderContext.SetClipRegion(vcl::Region(rPaintRect)); // Make sure that all actual rendering happens in one go to avoid flicker. diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 0db0e6ccc400..65451c0c4d59 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -65,22 +65,22 @@ PaintBufferGuard::PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWind //else //SAL_WARN("vcl.window", "the root of the double-buffering hierarchy should not have a transparent background"); - PushFlags nFlags = PushFlags::NONE; - nFlags |= PushFlags::CLIPREGION; - nFlags |= PushFlags::FILLCOLOR; - nFlags |= PushFlags::FONT; - nFlags |= PushFlags::LINECOLOR; - nFlags |= PushFlags::MAPMODE; + vcl::PushFlags nFlags = vcl::PushFlags::NONE; + nFlags |= vcl::PushFlags::CLIPREGION; + nFlags |= vcl::PushFlags::FILLCOLOR; + nFlags |= vcl::PushFlags::FONT; + nFlags |= vcl::PushFlags::LINECOLOR; + nFlags |= vcl::PushFlags::MAPMODE; maSettings = pFrameData->mpBuffer->GetSettings(); - nFlags |= PushFlags::REFPOINT; - nFlags |= PushFlags::TEXTCOLOR; - nFlags |= PushFlags::TEXTLINECOLOR; - nFlags |= PushFlags::OVERLINECOLOR; - nFlags |= PushFlags::TEXTFILLCOLOR; - nFlags |= PushFlags::TEXTALIGN; - nFlags |= PushFlags::RASTEROP; - nFlags |= PushFlags::TEXTLAYOUTMODE; - nFlags |= PushFlags::TEXTLANGUAGE; + nFlags |= vcl::PushFlags::REFPOINT; + nFlags |= vcl::PushFlags::TEXTCOLOR; + nFlags |= vcl::PushFlags::TEXTLINECOLOR; + nFlags |= vcl::PushFlags::OVERLINECOLOR; + nFlags |= vcl::PushFlags::TEXTFILLCOLOR; + nFlags |= vcl::PushFlags::TEXTALIGN; + nFlags |= vcl::PushFlags::RASTEROP; + nFlags |= vcl::PushFlags::TEXTLAYOUTMODE; + nFlags |= vcl::PushFlags::TEXTLANGUAGE; pFrameData->mpBuffer->Push(nFlags); auto& rDev = *pWindow->GetOutDev(); pFrameData->mpBuffer->SetClipRegion(rDev.GetClipRegion()); @@ -370,7 +370,7 @@ void RenderTools::DrawSelectionBackground(vcl::RenderContext& rRenderContext, vc aRect.AdjustRight(1 ); aRect.AdjustBottom(1 ); } - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR); if (bDrawBorder) rRenderContext.SetLineColor(bDark ? COL_WHITE : (bBright ? COL_BLACK : aSelectionBorderColor)); diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 48694de7b777..58e6dda127b4 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -504,7 +504,7 @@ void DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, cons InvalidateFlags::Transparent); pEraseWindow->PaintImmediately(); } - rRenderContext.Push(PushFlags::CLIPREGION); + rRenderContext.Push(vcl::PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion(rFramePosSize); } @@ -695,7 +695,7 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle if (mbProgressMode) { - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR); const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); Color aProgressColor = rStyleSettings.GetHighlightColor(); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 1f142ab6775b..6cfe69aff8a8 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -486,7 +486,7 @@ void ToolBox::ImplDrawBackground(vcl::RenderContext& rRenderContext, const tools if (IsInPaint()) aPaintRegion.Intersect(GetOutDev()->GetActiveClipRegion()); - rRenderContext.Push(PushFlags::CLIPREGION); + rRenderContext.Push(vcl::PushFlags::CLIPREGION); rRenderContext.IntersectClipRegion( aPaintRegion ); if (!pWrapper) @@ -534,7 +534,7 @@ void ToolBox::ImplErase(vcl::RenderContext& rRenderContext, const tools::Rectang { if (GetStyle() & WB_3DLOOK) { - rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::FILLCOLOR); + rRenderContext.Push(vcl::PushFlags::LINECOLOR | vcl::PushFlags::FILLCOLOR); rRenderContext.SetLineColor(); if (bHasOpenPopup) // choose the same color as the popup will use @@ -2446,7 +2446,7 @@ void ToolBox::ImplDrawMenuButton(vcl::RenderContext& rRenderContext, bool bHighl // execute pending paint requests ImplCheckUpdate(); - rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR); + rRenderContext.Push(vcl::PushFlags::FILLCOLOR | vcl::PushFlags::LINECOLOR); // draw the 'more' indicator / button (>>) ImplErase(rRenderContext, mpData->maMenubuttonItem.maRect, bHighlight); |