diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-18 18:07:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-19 00:30:37 +0200 |
| commit | 1e6ff8f7f8b5322bed7a1b4483f2f483b00212ba (patch) | |
| tree | 13e53997cf5b998859f247cf72b228f1c53cefd9 /svx | |
| parent | ab18e62bd7a0a05970323509a2ce22a94c70b7bf (diff) | |
XFillStyle -> css::drawing::FillStyle
Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4
Diffstat (limited to 'svx')
42 files changed, 286 insertions, 254 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 03b45d26add9..8d42e38b1ac9 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -55,6 +55,7 @@ #include <rtl/strbuf.hxx> #include <math.h> +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::drawing::EnhancedCustomShapeSegmentCommand; @@ -731,7 +732,7 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : nFlags ( 0 ), nColorData ( 0 ), bTextFlow ( false ), - bFilled ( ((const XFillStyleItem&)pAObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue() != XFILL_NONE ), + bFilled ( ((const XFillStyleItem&)pAObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue() != drawing::FillStyle_NONE ), bStroked ( ((const XLineStyleItem&)pAObj->GetMergedItem( XATTR_LINESTYLE )).GetValue() != XLINE_NONE ), bFlipH ( false ), bFlipV ( false ) @@ -2003,7 +2004,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm aNewB2DPolyPolygon, dBrightness); SfxItemSet aTempSet(*this); aTempSet.Put(SdrShadowItem(false)); - aTempSet.Put(XFillStyleItem(XFILL_NONE)); + aTempSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); pStroke->SetMergedItemSet(aTempSet); rObjectList.push_back(pStroke); } @@ -2020,7 +2021,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm pObj = new SdrPathObj( aNewB2DPolyPolygon.isClosed() ? OBJ_POLY : OBJ_PLIN, aNewB2DPolyPolygon, dBrightness); - aTempSet.Put(XFillStyleItem(XFILL_NONE)); + aTempSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); } else { @@ -2139,11 +2140,11 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC { if ( !rObj.IsLine() ) { - const XFillStyle eFillStyle = ((const XFillStyleItem&)rObj.GetMergedItem(XATTR_FILLSTYLE)).GetValue(); + const drawing::FillStyle eFillStyle = ((const XFillStyleItem&)rObj.GetMergedItem(XATTR_FILLSTYLE)).GetValue(); switch( eFillStyle ) { default: - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { Color aFillColor; if ( nColorCount || rObj.GetBrightness() != 1.0 ) @@ -2155,7 +2156,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC } break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { XGradient aXGradient(((const XFillGradientItem&)rObj.GetMergedItem(XATTR_FILLGRADIENT)).GetGradientValue()); if ( nColorCount || rObj.GetBrightness() != 1.0 ) @@ -2173,7 +2174,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC rObj.SetMergedItem( XFillGradientItem( "", aXGradient ) ); break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { XHatch aXHatch(((const XFillHatchItem&)rObj.GetMergedItem(XATTR_FILLHATCH)).GetHatchValue()); if ( nColorCount || rObj.GetBrightness() != 1.0 ) @@ -2187,7 +2188,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC rObj.SetMergedItem( XFillHatchItem( "", aXHatch ) ); break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { if ( nColorCount || rObj.GetBrightness() != 1.0 ) { @@ -2247,10 +2248,10 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) { SdrPathObj* pObj(vObjectList[i]); const XLineStyle eLineStyle = ((const XLineStyleItem&)pObj->GetMergedItem(XATTR_LINESTYLE)).GetValue(); - const XFillStyle eFillStyle = ((const XFillStyleItem&)pObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue(); + const drawing::FillStyle eFillStyle = ((const XFillStyleItem&)pObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue(); //SJ: #i40600# if bLineGeometryNeededOnly is set linystyle does not matter - if( !bLineGeometryNeededOnly && ( XLINE_NONE == eLineStyle ) && ( XFILL_NONE == eFillStyle ) ) + if( !bLineGeometryNeededOnly && ( XLINE_NONE == eLineStyle ) && ( drawing::FillStyle_NONE == eFillStyle ) ) delete pObj; else vTempList.push_back(pObj); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 4d4dbcb9b62b..7608137a2546 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -345,7 +345,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con const OUString aExtrusionColor( "Color" ); bool bUseExtrusionColor = GetBool( rGeometryItem, aExtrusionColor, false ); - XFillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) ); + drawing::FillStyle eFillStyle( ITEMVALUE( aSet, XATTR_FILLSTYLE, XFillStyleItem ) ); pScene->GetProperties().SetObjectItem( Svx3DShadeModeItem( 0 ) ); aSet.Put( Svx3DPercentDiagonalItem( 0 ) ); aSet.Put( Svx3DTextureModeItem( 1 ) ); @@ -354,15 +354,15 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con if ( eShadeMode == drawing::ShadeMode_DRAFT ) { aSet.Put( XLineStyleItem( XLINE_SOLID ) ); - aSet.Put( XFillStyleItem ( XFILL_NONE ) ); + aSet.Put( XFillStyleItem ( drawing::FillStyle_NONE ) ); aSet.Put( Svx3DDoubleSidedItem( true ) ); } else { aSet.Put( XLineStyleItem( XLINE_NONE ) ); - if ( eFillStyle == XFILL_NONE ) - aSet.Put( XFillStyleItem( XFILL_SOLID ) ); - else if ( ( eFillStyle == XFILL_BITMAP ) || ( eFillStyle == XFILL_GRADIENT ) || bUseExtrusionColor ) + if ( eFillStyle == drawing::FillStyle_NONE ) + aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); + else if ( ( eFillStyle == drawing::FillStyle_BITMAP ) || ( eFillStyle == drawing::FillStyle_GRADIENT ) || bUseExtrusionColor ) bUseTwoFillStyles = true; // #116336# @@ -386,11 +386,11 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con while( aIter.IsMore() ) { const SdrObject* pNext = aIter.Next(); - bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == XFILL_NONE ) + bool bIsPlaceholderObject = (((XFillStyleItem&)pNext->GetMergedItem( XATTR_FILLSTYLE )).GetValue() == drawing::FillStyle_NONE ) && (((XLineStyleItem&)pNext->GetMergedItem( XATTR_LINESTYLE )).GetValue() == XLINE_NONE ); basegfx::B2DPolyPolygon aPolyPoly; SfxItemSet aLocalSet(aSet); - XFillStyle aLocalFillStyle(eFillStyle); + drawing::FillStyle aLocalFillStyle(eFillStyle); if ( pNext->ISA( SdrPathObj ) ) { @@ -403,9 +403,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // invisible (all this 'hidden' logic should be migrated to primitives). if(!bMultipleSubObjects) { - const XFillStyle eStyle(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); + const drawing::FillStyle eStyle(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); - if(XFILL_NONE == eStyle) + if(drawing::FillStyle_NONE == eStyle) { const drawinglayer::attribute::SdrLineAttribute aLine( drawinglayer::primitive2d::createNewSdrLineAttribute(rSet)); @@ -443,7 +443,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con // for draft, create wireframe with fixed line width aLocalSet.Put(XLineStyleItem(XLINE_SOLID)); aLocalSet.Put(XLineWidthItem(40)); - aLocalFillStyle = XFILL_NONE; + aLocalFillStyle = drawing::FillStyle_NONE; } else { @@ -451,9 +451,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con aLocalSet.Put(XLineWidthItem(0)); aLocalSet.Put(XLineStyleItem(XLINE_NONE)); aLocalSet.Put(XFillColorItem(OUString(), ((const XLineColorItem&)(aLocalSet.Get(XATTR_LINECOLOR))).GetColorValue())); - aLocalSet.Put(XFillStyleItem(XFILL_SOLID)); + aLocalSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); aLocalSet.Put(XFillTransparenceItem(((const XLineTransparenceItem&)(aLocalSet.Get(XATTR_LINETRANSPARENCE))).GetValue())); - aLocalFillStyle = XFILL_SOLID; + aLocalFillStyle = drawing::FillStyle_SOLID; } } else @@ -547,7 +547,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con p3DObj->SetMergedItemSet( aLocalSet ); if ( bUseExtrusionColor ) p3DObj->SetMergedItem( XFillColorItem( "", ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) ); - p3DObj->SetMergedItem( XFillStyleItem( XFILL_SOLID ) ); + p3DObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_SOLID ) ); p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) ); p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) ); pScene->Insert3DObj( p3DObj ); @@ -562,12 +562,12 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con aFrontTransform.translate( 0.0, 0.0, fDepth ); p3DObj->NbcSetTransform( aFrontTransform ); - if ( ( aLocalFillStyle == XFILL_BITMAP ) && !aFillBmp.IsEmpty() ) + if ( ( aLocalFillStyle == drawing::FillStyle_BITMAP ) && !aFillBmp.IsEmpty() ) { p3DObj->SetMergedItem(XFillBitmapItem(OUString(), Graphic(aFillBmp))); } } - else if ( aLocalFillStyle == XFILL_NONE ) + else if ( aLocalFillStyle == drawing::FillStyle_NONE ) { XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR ); p3DObj->SetMergedItem( XFillColorItem( "", rLineColor.GetColorValue() ) ); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 4835d60e18ac..33399569c2b2 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -207,7 +207,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom // clear fill and line style aTargetItemSet.Put(XLineStyleItem(XLINE_NONE)); - aTargetItemSet.Put(XFillStyleItem(XFILL_NONE)); + aTargetItemSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); // get the text bounds and set at text object Rectangle aTextBounds = pCustoObj->GetSnapRect(); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 41fb49896454..0c1df56fca24 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -30,6 +30,8 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include "svx/sdrpaintwindow.hxx" +using namespace com::sun::star; + #define TRANSCOL Color( COL_WHITE ) ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) : @@ -70,7 +72,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) { SfxItemSet aSet( pModel->GetItemPool() ); - aSet.Put( XFillStyleItem( XFILL_SOLID ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aSet.Put( XFillColorItem( "", TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index bb155c3691ff..d0bfeb33d2a6 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -39,7 +39,7 @@ #include <svx/dialmgr.hxx> #include <vcl/settings.hxx> - +using namespace com::sun::star; Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, const ResId& rResId) : Control(pParent, rResId), @@ -138,7 +138,7 @@ void Svx3DPreviewControl::Construct() XATTR_FILL_FIRST, XATTR_FILLBITMAP, 0, 0 ); aSet.Put( XLineStyleItem( XLINE_NONE ) ); - aSet.Put( XFillStyleItem( XFILL_SOLID ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aSet.Put( XFillColorItem( "", Color( COL_WHITE ) ) ); mpScene->SetMergedItemSet(aSet); @@ -304,7 +304,7 @@ void Svx3DLightControl::Construct2() mpScene->Insert3DObj( mpExpansionObject ); SfxItemSet aSet(mpModel->GetItemPool()); aSet.Put( XLineStyleItem( XLINE_NONE ) ); - aSet.Put( XFillStyleItem( XFILL_NONE ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) ); mpExpansionObject->SetMergedItemSet(aSet); } @@ -344,7 +344,7 @@ void Svx3DLightControl::Construct2() // initially invisible SfxItemSet aSet(mpModel->GetItemPool()); aSet.Put( XLineStyleItem( XLINE_NONE ) ); - aSet.Put( XFillStyleItem( XFILL_NONE ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) ); mpLampBottomObject->SetMergedItemSet(aSet); mpLampShaftObject->SetMergedItemSet(aSet); @@ -410,7 +410,7 @@ void Svx3DLightControl::ConstructLightObjects() SfxItemSet aSet(mpModel->GetItemPool()); aSet.Put( XLineStyleItem( XLINE_NONE ) ); - aSet.Put( XFillStyleItem( XFILL_SOLID ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aSet.Put( XFillColorItem(OUString(), GetLightColor(a))); pNewLight->SetMergedItemSet(aSet); @@ -426,7 +426,7 @@ void Svx3DLightControl::AdaptToSelectedLight() // make mpLampBottomObject/mpLampShaftObject invisible SfxItemSet aSet(mpModel->GetItemPool()); aSet.Put( XLineStyleItem( XLINE_NONE ) ); - aSet.Put( XFillStyleItem( XFILL_NONE ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) ); mpLampBottomObject->SetMergedItemSet(aSet); mpLampShaftObject->SetMergedItemSet(aSet); } @@ -440,7 +440,7 @@ void Svx3DLightControl::AdaptToSelectedLight() aSet.Put( XLineStyleItem( XLINE_SOLID ) ); aSet.Put( XLineColorItem(OUString(), COL_YELLOW)); aSet.Put( XLineWidthItem(0)); - aSet.Put( XFillStyleItem( XFILL_NONE ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_NONE ) ); mpLampBottomObject->SetMergedItemSet(aSet); mpLampShaftObject->SetMergedItemSet(aSet); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index a5d902ae1501..a01a55938374 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -54,6 +54,8 @@ #include <svx/unobrushitemhelper.hxx> #include <sfx2/request.hxx> +using namespace com::sun::star; + // static ---------------------------------------------------------------- // Word 97 incompatibility (#i19922#) @@ -269,9 +271,9 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) if(mbEnableDrawingLayerFillStyles) { //UUUU When using the XATTR_FILLSTYLE DrawingLayer FillStyle definition - // extra action has to be done here since the pool default is XFILL_SOLID - // instead of XFILL_NONE (to have the default blue fill color at start). - aSet.Put(XFillStyleItem(XFILL_NONE)); + // extra action has to be done here since the pool default is drawing::FillStyle_SOLID + // instead of drawing::FillStyle_NONE (to have the default blue fill color at start). + aSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); } aSet.Put( SfxBoolItem( nWOn, m_pTurnOnBox->IsChecked() ) ); @@ -654,10 +656,10 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) if(mbEnableDrawingLayerFillStyles) { //UUUU The style for header/footer is not yet created, need to reset - // XFillStyleItem to XFILL_NONE which is the same as in the style + // XFillStyleItem to drawing::FillStyle_NONE which is the same as in the style // initialization. This needs to be done since the pool default for - // XFillStyleItem is XFILL_SOLID - pBBSet->Put(XFillStyleItem(XFILL_NONE)); + // XFillStyleItem is drawing::FillStyle_SOLID + pBBSet->Put(XFillStyleItem(drawing::FillStyle_NONE)); } } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 67fe824c34b2..dc6b2902beae 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -50,6 +50,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <boost/scoped_ptr.hpp> +using namespace com::sun::star; using ::com::sun::star::frame::XFrame; using ::com::sun::star::uno::Reference; @@ -253,7 +254,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) { SfxItemSet aSet( pModel->GetItemPool() ); - aSet.Put( XFillStyleItem( XFILL_SOLID ) ); + aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aSet.Put( XFillColorItem( "", TRANSCOL ) ); if ( !pIMapObj->IsActive() ) diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index a25470bb3f9f..2c6cf4b82bd6 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -54,6 +54,8 @@ #include <svx/float3d.hxx> #include "float3d.hrc" +using namespace com::sun::star; + SFX_IMPL_DOCKINGWINDOW_WITHID( Svx3DChildWindow, SID_3D_WIN ) struct Svx3DWinImpl @@ -604,8 +606,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(XATTR_FILLSTYLE); if(eState != SFX_ITEM_DONTCARE) { - XFillStyle eXFS = (XFillStyle)((const XFillStyleItem&)rAttrs.Get(XATTR_FILLSTYLE)).GetValue(); - bBitmap = (eXFS == XFILL_BITMAP || eXFS == XFILL_GRADIENT || eXFS == XFILL_HATCH); + drawing::FillStyle eXFS = (drawing::FillStyle)((const XFillStyleItem&)rAttrs.Get(XATTR_FILLSTYLE)).GetValue(); + bBitmap = (eXFS == drawing::FillStyle_BITMAP || eXFS == drawing::FillStyle_GRADIENT || eXFS == drawing::FillStyle_HATCH); } aFtTexKind.Enable( bBitmap ); diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 1459ef1bbb1b..973d307b2aed 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -271,8 +271,8 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const // gradient depends on fillstyle // BM *** check if SetItem is NULL *** - XFillStyle eFillStyle = ((XFillStyleItem&)(GetMergedItem(XATTR_FILLSTYLE))).GetValue(); - rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(GetMergedItem(XATTR_FILLSTYLE))).GetValue(); + rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT); // Convert 3D objects in a group of polygons: // At first not only possible, because the creation of a group of diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index b9fd6d885218..bbbbe553079c 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -67,6 +67,8 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> +using namespace com::sun::star; + #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() TYPEINIT1(E3dView, SdrView); @@ -686,12 +688,12 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) const SfxItemSet& rSet = pObj->GetMergedItemSet(); sal_Int32 nLineWidth = ((const XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); XLineStyle eLineStyle = (XLineStyle)((const XLineStyleItem&)rSet.Get(XATTR_LINESTYLE)).GetValue(); - XFillStyle eFillStyle = ITEMVALUE(rSet, XATTR_FILLSTYLE, XFillStyleItem); + drawing::FillStyle eFillStyle = ITEMVALUE(rSet, XATTR_FILLSTYLE, XFillStyleItem); if(((SdrPathObj*)pObj)->IsClosed() && eLineStyle == XLINE_SOLID && !nLineWidth - && eFillStyle != XFILL_NONE) + && eFillStyle != drawing::FillStyle_NONE) { if(pObj->GetPage() && GetModel()->IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj, false, false)); @@ -717,13 +719,13 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo // Get Itemset of the original object SfxItemSet aSet(pObj->GetMergedItemSet()); - XFillStyle eFillStyle = ITEMVALUE(aSet, XATTR_FILLSTYLE, XFillStyleItem); + drawing::FillStyle eFillStyle = ITEMVALUE(aSet, XATTR_FILLSTYLE, XFillStyleItem); // line style turned off aSet.Put(XLineStyleItem(XLINE_NONE)); //Determining if FILL_Attribut is set. - if(!pPath->IsClosed() || eFillStyle == XFILL_NONE) + if(!pPath->IsClosed() || eFillStyle == drawing::FillStyle_NONE) { // This SdrPathObj is not filled, leave the front and rear face out. // Moreover, a two-sided representation necessary. @@ -733,7 +735,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo aSet.Put(Svx3DDoubleSidedItem(true)); // Set fill attribute - aSet.Put(XFillStyleItem(XFILL_SOLID)); + aSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); // Fill color must be the color line, because the object was // previously just a line @@ -1064,7 +1066,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) const basegfx::B2DPolyPolygon aExtrudePoly( basegfx::tools::prepareForPolygonOperation(pExtrudeObj->GetExtrudePolygon())); const SfxItemSet& rLocalSet = pExtrudeObj->GetMergedItemSet(); - const XFillStyle eLocalFillStyle = ITEMVALUE(rLocalSet, XATTR_FILLSTYLE, XFillStyleItem); + const drawing::FillStyle eLocalFillStyle = ITEMVALUE(rLocalSet, XATTR_FILLSTYLE, XFillStyleItem); const Color aLocalColor = ((const XFillColorItem&)(rLocalSet.Get(XATTR_FILLCOLOR))).GetColorValue(); // sort in ExtrudeObj @@ -1090,11 +1092,11 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) // second ciriteria: is another fillstyle or color used? const SfxItemSet& rCompareSet = pAct->mpObj->GetMergedItemSet(); - XFillStyle eCompareFillStyle = ITEMVALUE(rCompareSet, XATTR_FILLSTYLE, XFillStyleItem); + drawing::FillStyle eCompareFillStyle = ITEMVALUE(rCompareSet, XATTR_FILLSTYLE, XFillStyleItem); if(eLocalFillStyle == eCompareFillStyle) { - if(eLocalFillStyle == XFILL_SOLID) + if(eLocalFillStyle == drawing::FillStyle_SOLID) { Color aCompareColor = ((const XFillColorItem&)(rCompareSet.Get(XATTR_FILLCOLOR))).GetColorValue(); @@ -1103,7 +1105,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) bOverlap = false; } } - else if(eLocalFillStyle == XFILL_NONE) + else if(eLocalFillStyle == drawing::FillStyle_NONE) { bOverlap = false; } diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 4dfdf337955b..cc569c238490 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -36,7 +36,7 @@ #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> - +using namespace com::sun::star; namespace sdr { @@ -111,14 +111,14 @@ namespace sdr const SdrShadowColorItem& rShadColItem = (SdrShadowColorItem&)(rItemSet.Get(SDRATTR_SHADOWCOLOR)); const sal_uInt16 nShadowTransparence(((SdrShadowTransparenceItem&)(rItemSet.Get(SDRATTR_SHADOWTRANSPARENCE))).GetValue()); const Color aShadowColor(rShadColItem.GetColorValue()); - const XFillStyle eShadowStyle = ((XFillStyleItem&)(rItemSet.Get(XATTR_FILLSTYLE))).GetValue(); + const drawing::FillStyle eShadowStyle = ((XFillStyleItem&)(rItemSet.Get(XATTR_FILLSTYLE))).GetValue(); // Create own ItemSet and modify as needed // Always hide lines for special calc shadow SfxItemSet aSet(rItemSet); aSet.Put(XLineStyleItem(XLINE_NONE)); - if(XFILL_HATCH == eShadowStyle) + if(drawing::FillStyle_HATCH == eShadowStyle) { // #41666# Hatch color is set hard to shadow color XHatch aHatch = ((XFillHatchItem&)(rItemSet.Get(XATTR_FILLHATCH))).GetHatchValue(); @@ -127,10 +127,10 @@ namespace sdr } else { - if(XFILL_SOLID != eShadowStyle) + if(drawing::FillStyle_SOLID != eShadowStyle) { // force fill to solid (for Gradient, Bitmap and *no* fill (#119750# not filled comments *have* shadow)) - aSet.Put(XFillStyleItem(XFILL_SOLID)); + aSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); } aSet.Put(XFillColorItem(OUString(),aShadowColor)); diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 4b3315b999a1..858d1aa4569a 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -76,7 +76,7 @@ #include <sdr/attribute/sdrfilltextattribute.hxx> #include <com/sun/star/drawing/LineCap.hpp> - +using namespace com::sun::star; namespace drawinglayer { @@ -381,7 +381,7 @@ namespace drawinglayer attribute::SdrFillAttribute createNewSdrFillAttribute(const SfxItemSet& rSet) { - const XFillStyle eStyle(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); + const drawing::FillStyle eStyle(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); sal_uInt16 nTransparence(((const XFillTransparenceItem&)(rSet.Get(XATTR_FILLTRANSPARENCE))).GetValue()); @@ -390,7 +390,7 @@ namespace drawinglayer nTransparence = 100; } - if(XFILL_NONE != eStyle) + if(drawing::FillStyle_NONE != eStyle) { if(100 != nTransparence) { @@ -421,13 +421,14 @@ namespace drawinglayer switch(eStyle) { - case XFILL_NONE : // for warnings - case XFILL_SOLID : + case drawing::FillStyle_NONE : // for warnings + case drawing::FillStyle_SOLID : + default: { // nothing to do, color is defined break; } - case XFILL_GRADIENT : + case drawing::FillStyle_GRADIENT : { XGradient aXGradient(((XFillGradientItem&)(rSet.Get(XATTR_FILLGRADIENT))).GetGradientValue()); @@ -463,7 +464,7 @@ namespace drawinglayer break; } - case XFILL_HATCH : + case drawing::FillStyle_HATCH : { const XHatch& rHatch(((XFillHatchItem&)(rSet.Get(XATTR_FILLHATCH))).GetHatchValue()); const Color aColorB(rHatch.GetColor()); @@ -478,7 +479,7 @@ namespace drawinglayer break; } - case XFILL_BITMAP : + case drawing::FillStyle_BITMAP : { aFillGraphic = createNewSdrFillGraphicAttribute(rSet); break; diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 7fe8e208559b..a950b4a6f012 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -24,7 +24,7 @@ #include <svx/svditer.hxx> #include <svx/xfillit0.hxx> - +using namespace com::sun::star; namespace sdr { @@ -170,17 +170,17 @@ namespace sdr const XFillStyleItem* pFillStyleItem = dynamic_cast< const XFillStyleItem* >( rItemSet.GetItem(XATTR_FILLSTYLE) ); if( pFillStyleItem ) { - if( bFillBitmap && (pFillStyleItem->GetValue() != XFILL_BITMAP) ) + if( bFillBitmap && (pFillStyleItem->GetValue() != drawing::FillStyle_BITMAP) ) { rItemSet.ClearItem( XATTR_FILLBITMAP ); } - if( bFillGradient && (pFillStyleItem->GetValue() != XFILL_GRADIENT) ) + if( bFillGradient && (pFillStyleItem->GetValue() != drawing::FillStyle_GRADIENT) ) { rItemSet.ClearItem( XATTR_FILLGRADIENT ); } - if( bFillHatch && (pFillStyleItem->GetValue() != XFILL_HATCH) ) + if( bFillHatch && (pFillStyleItem->GetValue() != drawing::FillStyle_HATCH) ) { rItemSet.ClearItem( XATTR_FILLHATCH ); } diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 71cb2f97085d..c81fe2d2b167 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -36,7 +36,7 @@ #include <svx/xlnwtit.hxx> #include <svx/svdpool.hxx> - +using namespace com::sun::star; namespace sdr { @@ -376,7 +376,7 @@ namespace sdr { mpItemSet->Put(XLineStyleItem(XLINE_NONE)); mpItemSet->Put(XFillColorItem(OUString(), Color(COL_WHITE))); - mpItemSet->Put(XFillStyleItem(XFILL_NONE)); + mpItemSet->Put(XFillStyleItem(drawing::FillStyle_NONE)); } else { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index bd152cf66849..ac7cafd7890e 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -205,9 +205,9 @@ void AreaPropertyPanel::Initialize() IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) { - const XFillStyle eXFS = (XFillStyle)mpLbFillType->GetSelectEntryPos(); + const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); - if((XFillStyle)meLastXFS != eXFS) + if((drawing::FillStyle)meLastXFS != eXFS) { mpLbFillAttr->Clear(); SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -219,7 +219,8 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) // Checked that this works in all apps. switch( eXFS ) { - case XFILL_NONE: + default: + case drawing::FillStyle_NONE: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -231,7 +232,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) SID_ATTR_FILL_STYLE, SFX_CALLMODE_RECORD, &aXFillStyleItem, 0L); break; } - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { mpLbFillAttr->Hide(); mpToolBoxColor->Show(); @@ -244,7 +245,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) SID_ATTR_FILL_COLOR, SFX_CALLMODE_RECORD, &aXFillColorItem, &aXFillStyleItem, 0L); break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -283,7 +284,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) } break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -322,7 +323,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) } break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -365,7 +366,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) meLastXFS = (sal_uInt16)eXFS; - if(XFILL_NONE != eXFS) + if(drawing::FillStyle_NONE != eXFS) { if(pToolBox) { @@ -381,7 +382,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) { - const XFillStyle eXFS = (XFillStyle)mpLbFillType->GetSelectEntryPos(); + const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); const XFillStyleItem aXFillStyleItem(eXFS); SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -389,11 +390,11 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) { // #i122676# dependent from bFillStyleChange, do execute a single or two // changes in one Execute call - const bool bFillStyleChange((XFillStyle) meLastXFS != eXFS); + const bool bFillStyleChange((drawing::FillStyle) meLastXFS != eXFS); switch(eXFS) { - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { if(bFillStyleChange) { @@ -402,7 +403,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) } break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); @@ -433,7 +434,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) } break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); @@ -464,7 +465,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillAttrHdl, ListBox*, pToolBox ) } break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); @@ -820,11 +821,11 @@ void AreaPropertyPanel::NotifyItemUpdate( mpStyleItem.reset(dynamic_cast< XFillStyleItem* >(pItem->Clone())); mpLbFillType->Enable(); mpColorTextFT->Enable(); - XFillStyle eXFS = (XFillStyle)mpStyleItem->GetValue(); + drawing::FillStyle eXFS = (drawing::FillStyle)mpStyleItem->GetValue(); meLastXFS = eXFS; mpLbFillType->SelectEntryPos(sal::static_int_cast< sal_Int32 >(eXFS)); - if(XFILL_NONE == eXFS) + if(drawing::FillStyle_NONE == eXFS) { mpLbFillAttr->SetNoSelection(); mpLbFillAttr->Disable(); @@ -851,7 +852,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpColorItem.reset(pState ? (XFillColorItem*)pState->Clone() : 0); } - if(mpStyleItem && XFILL_SOLID == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue()) { mpLbFillAttr->Hide(); mpToolBoxColor->Show(); @@ -884,7 +885,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpFillGradientItem.reset(pState ? (XFillGradientItem*)pState->Clone() : 0); } - if(mpStyleItem && XFILL_GRADIENT == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue()) { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -913,7 +914,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpHatchItem.reset(pState ? (XFillHatchItem*)pState->Clone() : 0); } - if(mpStyleItem && XFILL_HATCH == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue()) { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -942,7 +943,7 @@ void AreaPropertyPanel::NotifyItemUpdate( mpBitmapItem.reset(pState ? (XFillBitmapItem*)pState->Clone() : 0); } - if(mpStyleItem && XFILL_BITMAP == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue()) { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -968,7 +969,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { if(SFX_ITEM_AVAILABLE == eState) { - if(mpStyleItem && XFILL_SOLID == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_SOLID == (drawing::FillStyle)mpStyleItem->GetValue()) { if(mpColorItem) { @@ -993,7 +994,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { if(SFX_ITEM_AVAILABLE == eState) { - if(mpStyleItem && XFILL_GRADIENT == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_GRADIENT == (drawing::FillStyle)mpStyleItem->GetValue()) { if(mpFillGradientItem) { @@ -1018,7 +1019,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { if(SFX_ITEM_AVAILABLE == eState) { - if(mpStyleItem && XFILL_HATCH == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_HATCH == (drawing::FillStyle)mpStyleItem->GetValue()) { if(mpHatchItem) { @@ -1043,7 +1044,7 @@ void AreaPropertyPanel::NotifyItemUpdate( { if(SFX_ITEM_AVAILABLE == eState) { - if(mpStyleItem && XFILL_BITMAP == (XFillStyle)mpStyleItem->GetValue()) + if(mpStyleItem && drawing::FillStyle_BITMAP == (drawing::FillStyle)mpStyleItem->GetValue()) { if(mpBitmapItem) { @@ -1076,18 +1077,18 @@ void AreaPropertyPanel::Update() { if(mpStyleItem) { - const XFillStyle eXFS = (XFillStyle)mpStyleItem->GetValue(); + const drawing::FillStyle eXFS = (drawing::FillStyle)mpStyleItem->GetValue(); SfxObjectShell* pSh = SfxObjectShell::Current(); switch( eXFS ) { - case XFILL_NONE: + case drawing::FillStyle_NONE: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); break; } - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { if(mpColorItem) { @@ -1101,7 +1102,7 @@ void AreaPropertyPanel::Update() } break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -1130,7 +1131,7 @@ void AreaPropertyPanel::Update() } break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); @@ -1159,7 +1160,7 @@ void AreaPropertyPanel::Update() } break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { mpLbFillAttr->Show(); mpToolBoxColor->Hide(); diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 9b44726a31dd..598388375dc6 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -24,6 +24,7 @@ #include <svx/xfillit0.hxx> #include <svl/itemset.hxx> +using namespace com::sun::star; namespace sdr { @@ -106,7 +107,7 @@ namespace sdr const SdrPage* pCorrectPage = &GetOwnerPage(); const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties(); - if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) + if(drawing::FillStyle_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) { pCorrectPage = &GetUsedPage(); pCorrectProperties = &pCorrectPage->getSdrPageProperties(); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index de53aa3c0a19..b8ed6cbf3f5a 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -41,7 +41,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> - +using namespace com::sun::star; class ImplConnectMarkerOverlay { @@ -457,7 +457,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const { SfxItemSet aSet(pMod->GetItemPool()); aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid - aSet.Put(XFillStyleItem(XFILL_NONE)); + aSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); pAktCreate->SetMergedItemSet(aSet); } @@ -467,7 +467,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const // default for all text frames: no background, no border SfxItemSet aSet(pMod->GetItemPool()); aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid - aSet.Put(XFillStyleItem(XFILL_NONE)); + aSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); aSet.Put(XLineColorItem(OUString(),Color(COL_BLACK))); // in case someone turns on Solid aSet.Put(XLineStyleItem(XLINE_NONE)); @@ -767,10 +767,10 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/) if(bUseSolidDragging) { const SfxItemSet& rSet = pAktCreate->GetMergedItemSet(); - const XFillStyle eFill(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); + const drawing::FillStyle eFill(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue()); const XLineStyle eLine(((XLineStyleItem&)(rSet.Get(XATTR_LINESTYLE))).GetValue()); - if(XLINE_NONE == eLine && XFILL_NONE == eFill) + if(XLINE_NONE == eLine && drawing::FillStyle_NONE == eFill) { bUseSolidDragging = false; } diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 9daebbe48723..802e0fafd88c 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -36,6 +36,8 @@ #include <svx/svdview.hxx> #include <clonelist.hxx> +using namespace com::sun::star; + void SdrEditView::ImpResetPossibilityFlags() { bReadOnly =false; @@ -522,9 +524,9 @@ void SdrEditView::CheckPossibilities() if(SFX_ITEM_DONTCARE != eState) { // If state is not DONTCARE, test the item - XFillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); - if(eFillStyle != XFILL_GRADIENT) + if(eFillStyle != drawing::FillStyle_GRADIENT) { bGradientAllowed = false; } diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 4b73e5ae6295..bb31717c6584 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -45,6 +45,7 @@ #include <boost/scoped_ptr.hpp> #include <vector> using ::std::vector; +using namespace com::sun::star; SdrObject* SdrEditView::GetMaxToTopObj(SdrObject* /*pObj*/) const { @@ -1313,12 +1314,12 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) // If LineStyle of pAttrObj is XLINE_NONE force to XLINE_SOLID to make visible. const XLineStyle eLineStyle = ((const XLineStyleItem&)pAttrObj->GetMergedItem(XATTR_LINESTYLE)).GetValue(); - const XFillStyle eFillStyle = ((const XFillStyleItem&)pAttrObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue(); + const drawing::FillStyle eFillStyle = ((const XFillStyleItem&)pAttrObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue(); // Take fill style/closed state of pAttrObj in account when deciding to change the line style bool bIsClosedPathObj(pAttrObj->ISA(SdrPathObj) && ((SdrPathObj*)pAttrObj)->IsClosed()); - if(XLINE_NONE == eLineStyle && (XFILL_NONE == eFillStyle || !bIsClosedPathObj)) + if(XLINE_NONE == eLineStyle && (drawing::FillStyle_NONE == eFillStyle || !bIsClosedPathObj)) { pPath->SetMergedItem(XLineStyleItem(XLINE_SOLID)); } @@ -1572,7 +1573,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, // clear fill and line style aTargetItemSet.Put(XLineStyleItem(XLINE_NONE)); - aTargetItemSet.Put(XFillStyleItem(XFILL_NONE)); + aTargetItemSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); // get the text bounds and set at text object Rectangle aTextBounds = pCustomShape->GetSnapRect(); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index b68c76fbdf16..ec9245379231 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -296,19 +296,19 @@ void SdrLinkList::RemoveLink(const Link& rLink) bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { - XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue(); + drawing::FillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue(); bool bRetval = false; switch(eFill) { - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetColorValue(); bRetval = true; break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { Color aCol1(((XFillHatchItem&)rSet.Get(XATTR_FILLHATCH)).GetHatchValue().GetColor()); Color aCol2(COL_WHITE); @@ -326,7 +326,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) break; } - case XFILL_GRADIENT: { + case drawing::FillStyle_GRADIENT: { const XGradient& rGrad=((XFillGradientItem&)rSet.Get(XATTR_FILLGRADIENT)).GetGradientValue(); Color aCol1(rGrad.GetStartColor()); Color aCol2(rGrad.GetEndColor()); @@ -336,7 +336,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { Bitmap aBitmap(((XFillBitmapItem&)rSet.Get(XATTR_FILLBITMAP)).GetGraphicObject().GetGraphic().GetBitmapEx().GetBitmap()); const Size aSize(aBitmap.GetSizePixel()); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index ef3874a21515..b0ef005f4e07 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -71,7 +71,7 @@ #include <svx/svditer.hxx> #include <svx/svdogrp.hxx> - +using namespace com::sun::star; ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( SdrModel& rModel, @@ -395,12 +395,12 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr { if(maVD.IsFillColor()) { - mpFillAttr->Put(XFillStyleItem(XFILL_SOLID)); + mpFillAttr->Put(XFillStyleItem(drawing::FillStyle_SOLID)); mpFillAttr->Put(XFillColorItem(OUString(), maVD.GetFillColor())); } else { - mpFillAttr->Put(XFillStyleItem(XFILL_NONE)); + mpFillAttr->Put(XFillStyleItem(drawing::FillStyle_NONE)); } } else @@ -600,7 +600,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj, bool bScale) aClipTopLeft, aClipSize); - pObj->SetMergedItem(XFillStyleItem(XFILL_BITMAP)); + pObj->SetMergedItem(XFillStyleItem(drawing::FillStyle_BITMAP)); pObj->SetMergedItem(XFillBitmapItem(OUString(), Graphic(aClippedBitmap))); pObj->SetMergedItem(XFillBmpTileItem(false)); pObj->SetMergedItem(XFillBmpStretchItem(true)); @@ -1046,7 +1046,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt if (!aFnt.IsTransparent()) { SfxItemSet aAttr(*mpFillAttr->GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST, 0, 0); - aAttr.Put(XFillStyleItem(XFILL_SOLID)); + aAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID)); aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor())); pText->SetMergedItemSet(aAttr); } @@ -1091,7 +1091,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1103,7 +1103,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScaleAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1115,7 +1115,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1127,7 +1127,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1173,7 +1173,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) } SetAttributes(pPath); - aHatchAttr.Put(XFillStyleItem(XFILL_HATCH)); + aHatchAttr.Put(XFillStyleItem(drawing::FillStyle_HATCH)); aHatchAttr.Put(XFillHatchItem(&mpModel->GetItemPool(), XHatch(rHatch.GetColor(), eStyle, rHatch.GetDistance(), rHatch.GetAngle()))); pPath->SetMergedItemSet(aHatchAttr); @@ -1263,7 +1263,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rM aGradAttr.Put(XLineStyleItem(XLINE_NONE)); // add detected gradient fillstyle - aGradAttr.Put(XFillStyleItem(XFILL_GRADIENT)); + aGradAttr.Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); aGradAttr.Put(XFillGradientItem(aXGradient)); pPath->SetMergedItemSet(aGradAttr); @@ -1310,7 +1310,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpScalePartAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1326,7 +1326,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScalePartAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1340,7 +1340,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1354,7 +1354,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScaleAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1369,7 +1369,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMaskScalePartAction& rAct) // This action is not creating line and fill, set directly, do not use SetAttributes(..) pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } @@ -1431,7 +1431,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct) rGradient.GetSteps())); SetAttributes(pRect); - aGradientAttr.Put(XFillStyleItem(XFILL_GRADIENT)); // #i125211# + aGradientAttr.Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); // #i125211# aGradientAttr.Put(aXFillGradientItem); pRect->SetMergedItemSet(aGradientAttr); @@ -1501,7 +1501,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaGradientExAction& rAct) rGradient.GetSteps())); SetAttributes(pPath); - aGradientAttr.Put(XFillStyleItem(XFILL_GRADIENT)); // #i125211# + aGradientAttr.Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); // #i125211# aGradientAttr.Put(aXFillGradientItem); pPath->SetMergedItemSet(aGradientAttr); @@ -1690,7 +1690,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) // since these metafile content is not used to draw line/fill // dependent of these setting at the device content pGraf->SetMergedItem(XLineStyleItem(XLINE_NONE)); - pGraf->SetMergedItem(XFillStyleItem(XFILL_NONE)); + pGraf->SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); InsertObj(pGraf); } } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index be7047d07358..9f1322c98781 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -55,6 +55,8 @@ #include <svx/xlnstwit.hxx> #include <svx/xtextit0.hxx> +using namespace com::sun::star; + #define ITEMBROWSER_WHICHCOL_ID 1 #define ITEMBROWSER_STATECOL_ID 2 #define ITEMBROWSER_TYPECOL_ID 3 @@ -639,12 +641,12 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI { rIndent=1; if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) { - XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); - if (eFillStyle==XFILL_NONE) return true; + drawing::FillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); + if (eFillStyle==drawing::FillStyle_NONE) return true; // transparency currently only for SolidFill - if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return true; - if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return true; - if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return true; + if (eFillStyle!=drawing::FillStyle_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return true; + if (eFillStyle!=drawing::FillStyle_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return true; + if (eFillStyle!=drawing::FillStyle_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return true; } } break; case XATTR_FILLBITMAP : @@ -660,8 +662,8 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI case XATTR_FILLBMP_POSOFFSETY : { /* only if TILE=sal_True*/ rIndent=1; if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) { - XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); - if (eFillStyle!=XFILL_BITMAP) return true; + drawing::FillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); + if (eFillStyle!=drawing::FillStyle_BITMAP) return true; } if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) { return false; // always selectable diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 230cceb516bf..acfbcab68ad0 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -52,6 +52,7 @@ #include <editeng/editdata.hxx> +using namespace com::sun::star; // Migrate Marking of Objects, Points and GluePoints @@ -991,9 +992,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) { SdrObject* pObj = GetMarkedObjectByIndex(0); const SfxItemSet& rSet = pObj->GetMergedItemSet(); - XFillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); - if(eFillStyle == XFILL_GRADIENT) + if(eFillStyle == drawing::FillStyle_GRADIENT) { // set values and transform to vector set GradTransformer aGradTransformer; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 9e021dc819d8..c2257f279914 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -230,7 +230,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS while(aIterator.IsMore()) { SdrObject* pObj = aIterator.Next(); - XFillStyle eFillStyle = ((XFillStyleItem&)(pObj->GetMergedItem(XATTR_FILLSTYLE))).GetValue(); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(pObj->GetMergedItem(XATTR_FILLSTYLE))).GetValue(); if(!bLineUsed) { @@ -244,22 +244,22 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS if(!bAllFillUsed) { - if(!bSolidFillUsed && XFILL_SOLID == eFillStyle) + if(!bSolidFillUsed && drawing::FillStyle_SOLID == eFillStyle) { bSolidFillUsed = true; bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } - if(!bGradientFillUsed && XFILL_GRADIENT == eFillStyle) + if(!bGradientFillUsed && drawing::FillStyle_GRADIENT == eFillStyle) { bGradientFillUsed = true; bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } - if(!bHatchFillUsed && XFILL_HATCH == eFillStyle) + if(!bHatchFillUsed && drawing::FillStyle_HATCH == eFillStyle) { bHatchFillUsed = true; bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); } - if(!bBitmapFillUsed && XFILL_BITMAP == eFillStyle) + if(!bBitmapFillUsed && drawing::FillStyle_BITMAP == eFillStyle) { bBitmapFillUsed = true; bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed); diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index ba7e8b1aad6e..0ecea696cc1e 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -72,7 +72,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include "svx/xlinjoit.hxx" - +using namespace com::sun::star; sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties() { @@ -154,7 +154,7 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const bool SdrAttrObj::HasFill() const { - return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE; + return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=drawing::FillStyle_NONE; } bool SdrAttrObj::HasLine() const diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index dea52a782230..18cc1bce95f6 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1180,7 +1180,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const basegfx::B2DPolyPolygon aRetval; // create cloned object without text, but with XLINE_SOLID, - // COL_BLACK as line color and XFILL_NONE + // COL_BLACK as line color and drawing::FillStyle_NONE SdrObject* pClone = Clone(); if(pClone) @@ -1224,7 +1224,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const // solid black lines and no fill aNewSet.Put(XLineStyleItem(XLINE_SOLID)); aNewSet.Put(XLineColorItem(OUString(), Color(COL_BLACK))); - aNewSet.Put(XFillStyleItem(XFILL_NONE)); + aNewSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); pClone->SetMergedItemSet(aNewSet); // get sequence from clone @@ -2546,7 +2546,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas if(aMergedLineFillPolyPolygon.count() || (bForceLineDash && aMergedHairlinePolyPolygon.count())) { SfxItemSet aSet(pRet->GetMergedItemSet()); - XFillStyle eOldFillStyle = ((const XFillStyleItem&)(aSet.Get(XATTR_FILLSTYLE))).GetValue(); + drawing::FillStyle eOldFillStyle = ((const XFillStyleItem&)(aSet.Get(XATTR_FILLSTYLE))).GetValue(); SdrPathObj* aLinePolygonPart = NULL; SdrPathObj* aLineHairlinePart = NULL; bool bBuildGroup(false); @@ -2563,7 +2563,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue(); sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue(); aSet.Put(XFillColorItem(OUString(), aColorLine)); - aSet.Put(XFillStyleItem(XFILL_SOLID)); + aSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); aSet.Put(XFillTransparenceItem(nTransLine)); aLinePolygonPart->SetMergedItemSet(aSet); @@ -2579,7 +2579,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas aLineHairlinePart->SetModel(pRet->GetModel()); aSet.Put(XLineWidthItem(0L)); - aSet.Put(XFillStyleItem(XFILL_NONE)); + aSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); aSet.Put(XLineStyleItem(XLINE_SOLID)); // it is also necessary to switch off line start and ends here @@ -2600,7 +2600,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas if(pPath && pPath->IsClosed()) { - if(eOldFillStyle != XFILL_NONE) + if(eOldFillStyle != drawing::FillStyle_NONE) { bAddOriginalGeometry = true; } @@ -3215,10 +3215,10 @@ bool SdrObject::IsInDestruction() const return false; } -// return if fill is != XFILL_NONE +// return if fill is != drawing::FillStyle_NONE bool SdrObject::HasFillStyle() const { - return (((const XFillStyleItem&)GetObjectItem(XATTR_FILLSTYLE)).GetValue() != XFILL_NONE); + return (((const XFillStyleItem&)GetObjectItem(XATTR_FILLSTYLE)).GetValue() != drawing::FillStyle_NONE); } bool SdrObject::HasLineStyle() const diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 1cdf8be3403b..db836dd721e0 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -50,7 +50,7 @@ #include <svx/xlnwtit.hxx> #include <svx/xpool.hxx> - +using namespace com::sun::star; Point GetWinkPnt(const Rectangle& rR, long nWink) { @@ -194,8 +194,8 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const // XPoly is necessary if Fill !=None and !=Solid if(!bNeed && meCircleKind != OBJ_CARC) { - XFillStyle eFill=((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); - bNeed = eFill != XFILL_NONE && eFill != XFILL_SOLID; + drawing::FillStyle eFill=((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue(); + bNeed = eFill != drawing::FillStyle_NONE && eFill != drawing::FillStyle_SOLID; } if(!bNeed && meCircleKind != OBJ_CIRC && nStartWink == nEndWink) diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 54776a56598d..f5c263246b17 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -982,7 +982,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) } else { - SetMergedItem(XFillStyleItem(XFILL_NONE)); + SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); SetMergedItem(XLineStyleItem(XLINE_NONE)); } } @@ -1176,7 +1176,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const // retrieve bitmap for the fill SfxItemSet aSet(GetObjectItemSet()); - aSet.Put(XFillStyleItem(XFILL_BITMAP)); + aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); const BitmapEx aBitmapEx(GetTransformedGraphic().GetBitmapEx()); aSet.Put(XFillBitmapItem(OUString(), Graphic(aBitmapEx))); aSet.Put(XFillBmpTileItem(false)); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 0d3ed8a27113..d1348c648b0d 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1364,7 +1364,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC pClone->SetMergedItem(XLineColorItem(OUString(), aColor.nColor)); // bitmap fill - pClone->SetMergedItem(XFillStyleItem(XFILL_BITMAP)); + pClone->SetMergedItem(XFillStyleItem(drawing::FillStyle_BITMAP)); pClone->SetMergedItem(XFillBitmapItem(OUString(), GetEmptyOLEReplacementGraphic())); pClone->SetMergedItem(XFillBmpTileItem(false)); pClone->SetMergedItem(XFillBmpStretchItem(false)); @@ -1493,7 +1493,7 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage) } else { - SetMergedItem(XFillStyleItem(XFILL_NONE)); + SetMergedItem(XFillStyleItem(drawing::FillStyle_NONE)); SetMergedItem(XLineStyleItem(XLINE_NONE)); } } diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 45f9f01fed81..387f57910cde 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -44,6 +44,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +using namespace com::sun::star; // BaseProperties section @@ -180,8 +181,8 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bTransparenceAllowed = true; // gradient depends on fillstyle - XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); - rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); + rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; rInfo.bEdgeRadiusAllowed=true; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 0c6e8ca63560..219fc6398e35 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -444,8 +444,8 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bTransparenceAllowed = true; // gradient depends on fillstyle - XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); - rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); + rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; rInfo.bEdgeRadiusAllowed=true; bool bCanConv=ImpCanConvTextToCurve(); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 2f7c4e1dfede..b4d52033e06c 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -50,6 +50,7 @@ #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +using namespace com::sun::star; // helpers @@ -895,14 +896,14 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( Color aOriginalBackColor(rOutliner.GetBackgroundColor()); const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet(); - if (XFILL_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue()) + if (drawing::FillStyle_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue()) { SdrPage *pOwnerPage = GetPage(); if (pOwnerPage) { pBackgroundFillSet = &pOwnerPage->getSdrPageProperties().GetItemSet(); - if (XFILL_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue()) + if (drawing::FillStyle_NONE == ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue()) { if (!pOwnerPage->IsMasterPage() && pOwnerPage->TRG_HasMasterPage()) { @@ -912,7 +913,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( } } - if (XFILL_NONE != ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue()) + if (drawing::FillStyle_NONE != ((const XFillStyleItem&)pBackgroundFillSet->Get(XATTR_FILLSTYLE)).GetValue()) { Color aColor(rOutliner.GetBackgroundColor()); GetDraftFillColor(*pBackgroundFillSet, aColor); diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 25997de5c3af..22bc44f4be8a 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -38,6 +38,7 @@ #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> +using namespace com::sun::star; void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect) { @@ -378,7 +379,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const // set needed items aAttributeSet.Put(XFillColorItem(OUString(), Color(rCandidate.getBColor()))); aAttributeSet.Put(XLineStyleItem(XLINE_NONE)); - aAttributeSet.Put(XFillStyleItem(XFILL_SOLID)); + aAttributeSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); // create filled SdrPathObj pPathObj = new SdrPathObj(OBJ_PATHFILL, aPolyPolygon); @@ -389,7 +390,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const aAttributeSet.Put(XLineColorItem(OUString(), Color(rCandidate.getBColor()))); aAttributeSet.Put(XLineStyleItem(XLINE_SOLID)); aAttributeSet.Put(XLineWidthItem(0)); - aAttributeSet.Put(XFillStyleItem(XFILL_NONE)); + aAttributeSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); // create line SdrPathObj pPathObj = new SdrPathObj(OBJ_PATHLINE, aPolyPolygon); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 04f52ebcd2a4..f56886bd10ca 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1157,7 +1157,7 @@ SdrPageProperties::SdrPageProperties(SdrPage& rSdrPage) { if(!rSdrPage.IsMasterPage()) { - mpProperties->Put(XFillStyleItem(XFILL_NONE)); + mpProperties->Put(XFillStyleItem(drawing::FillStyle_NONE)); } } @@ -1815,7 +1815,7 @@ Color SdrPage::GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay ) if(!IsMasterPage() && TRG_HasMasterPage()) { - if(XFILL_NONE == ((const XFillStyleItem&)pBackgroundFill->Get(XATTR_FILLSTYLE)).GetValue()) + if(drawing::FillStyle_NONE == ((const XFillStyleItem&)pBackgroundFill->Get(XATTR_FILLSTYLE)).GetValue()) { pBackgroundFill = &TRG_GetMasterPage().getSdrPageProperties().GetItemSet(); } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 5b3c57b14944..e6f179f1c24f 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -55,7 +55,7 @@ #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> - +using namespace com::sun::star; SdrExchangeView::SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut): SdrObjEditView(pModel1,pOut) @@ -153,7 +153,7 @@ bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* SfxItemSet aTempAttr(pMod->GetItemPool()); // no fill, no line aTempAttr.Put(XLineStyleItem(XLINE_NONE)); - aTempAttr.Put(XFillStyleItem(XFILL_NONE)); + aTempAttr.Put(XFillStyleItem(drawing::FillStyle_NONE)); pObj->SetMergedItemSet(aTempAttr); @@ -189,7 +189,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt SfxItemSet aTempAttr(pMod->GetItemPool()); // no fill, no line aTempAttr.Put(XLineStyleItem(XLINE_NONE)); - aTempAttr.Put(XFillStyleItem(XFILL_NONE)); + aTempAttr.Put(XFillStyleItem(drawing::FillStyle_NONE)); pObj->SetMergedItemSet(aTempAttr); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 72ebdc95ab78..57b507c54d6b 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -74,6 +74,7 @@ using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::util::XModifyBroadcaster; using sdr::properties::TextProperties; using sdr::properties::BaseProperties; +using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; @@ -1364,8 +1365,8 @@ void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bTransparenceAllowed = true; // gradient depends on fillstyle - XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); - rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); + drawing::FillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); + rInfo.bGradientAllowed = (eFillStyle == drawing::FillStyle_GRADIENT); rInfo.bShearAllowed =false; rInfo.bEdgeRadiusAllowed=false; rInfo.bCanConvToPath =false; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 56ac8a6f2bfd..9792a562bde0 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -36,6 +36,7 @@ #include "svx/xexch.hxx" #include <vcl/svapp.hxx> +using namespace com::sun::star; // - SvxColorValueSetData - @@ -197,7 +198,7 @@ void SvxColorValueSet_docking::DoDrag() SfxItemSet& rSet = aXFillSetItem.GetItemSet(); rSet.Put( XFillColorItem( GetItemText( nItemId ), GetItemColor( nItemId ) ) ); - rSet.Put(XFillStyleItem( ( 1 == nItemId ) ? XFILL_NONE : XFILL_SOLID ) ); + rSet.Put(XFillStyleItem( ( 1 == nItemId ) ? drawing::FillStyle_NONE : drawing::FillStyle_SOLID ) ); EndSelection(); ( new SvxColorValueSetData( aXFillSetItem ) )->StartDrag( this, DND_ACTION_COPY ); @@ -425,7 +426,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) { if ( nPos == 1 ) // unsichtbar { - XFillStyleItem aXFillStyleItem( XFILL_NONE ); + XFillStyleItem aXFillStyleItem( drawing::FillStyle_NONE ); pDispatcher->Execute( nLeftSlot, SFX_CALLMODE_RECORD, &aXFillStyleItem, 0L ); } else @@ -448,7 +449,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) } if ( !bDone ) { - XFillStyleItem aXFillStyleItem( XFILL_SOLID ); + XFillStyleItem aXFillStyleItem( drawing::FillStyle_SOLID ); XFillColorItem aXFillColorItem( aStr, aColor ); pDispatcher->Execute( nLeftSlot, SFX_CALLMODE_RECORD, &aXFillColorItem, &aXFillStyleItem, 0L ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index fb0b930d5cfd..5b735c9dae1f 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -38,6 +38,7 @@ #include "helpid.hrc" #include <boost/scoped_ptr.hpp> +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; @@ -64,7 +65,7 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( , mpFillControl(0) , mpFillTypeLB(0) , mpFillAttrLB(0) - , meLastXFS(XFILL_NONE) + , meLastXFS(drawing::FillStyle_NONE) , mbUpdate(false) { addStatusListener( OUString( ".uno:FillColor" )); @@ -120,14 +121,14 @@ void SvxFillToolBoxControl::StateChanged( } else if(mpStyleItem) { - const XFillStyle eXFS(static_cast< XFillStyle >(mpStyleItem->GetValue())); + const drawing::FillStyle eXFS(static_cast< drawing::FillStyle >(mpStyleItem->GetValue())); if(nSID == SID_ATTR_FILL_COLOR) { delete mpColorItem; mpColorItem = static_cast< XFillColorItem* >(pState->Clone()); - if(eXFS == XFILL_SOLID) + if(eXFS == drawing::FillStyle_SOLID) { bEnableControls = true; } @@ -137,7 +138,7 @@ void SvxFillToolBoxControl::StateChanged( delete mpGradientItem; mpGradientItem = static_cast< XFillGradientItem* >(pState->Clone()); - if(eXFS == XFILL_GRADIENT) + if(eXFS == drawing::FillStyle_GRADIENT) { bEnableControls = true; } @@ -147,7 +148,7 @@ void SvxFillToolBoxControl::StateChanged( delete mpHatchItem; mpHatchItem = static_cast< XFillHatchItem* >(pState->Clone()); - if(eXFS == XFILL_HATCH) + if(eXFS == drawing::FillStyle_HATCH) { bEnableControls = true; } @@ -157,7 +158,7 @@ void SvxFillToolBoxControl::StateChanged( delete mpBitmapItem; mpBitmapItem = static_cast< XFillBitmapItem* >(pState->Clone()); - if(eXFS == XFILL_BITMAP) + if(eXFS == drawing::FillStyle_BITMAP) { bEnableControls = true; } @@ -167,12 +168,12 @@ void SvxFillToolBoxControl::StateChanged( if(mpStyleItem) { // ensure that the correct entry is selected in mpFillTypeLB - XFillStyle eXFS(static_cast< XFillStyle >(mpStyleItem->GetValue())); + drawing::FillStyle eXFS(static_cast< drawing::FillStyle >(mpStyleItem->GetValue())); const bool bFillTypeChangedByUser(mpFillControl->mbFillTypeChanged); if(bFillTypeChangedByUser) { - meLastXFS = static_cast< XFillStyle >(mpFillControl->mnLastFillTypeControlSelectEntryPos); + meLastXFS = static_cast< drawing::FillStyle >(mpFillControl->mnLastFillTypeControlSelectEntryPos); mpFillControl->mbFillTypeChanged = false; } @@ -207,18 +208,18 @@ void SvxFillToolBoxControl::StateChanged( } else { - XFillStyle eXFS(XFILL_NONE); + drawing::FillStyle eXFS(drawing::FillStyle_NONE); if(mpStyleItem) { - eXFS = static_cast< XFillStyle >(mpStyleItem->GetValue()); + eXFS = static_cast< drawing::FillStyle >(mpStyleItem->GetValue()); } if(!mpStyleItem || - (nSID == SID_ATTR_FILL_COLOR && eXFS == XFILL_SOLID) || - (nSID == SID_ATTR_FILL_GRADIENT && eXFS == XFILL_GRADIENT) || - (nSID == SID_ATTR_FILL_HATCH && eXFS == XFILL_HATCH) || - (nSID == SID_ATTR_FILL_BITMAP && eXFS == XFILL_BITMAP)) + (nSID == SID_ATTR_FILL_COLOR && eXFS == drawing::FillStyle_SOLID) || + (nSID == SID_ATTR_FILL_GRADIENT && eXFS == drawing::FillStyle_GRADIENT) || + (nSID == SID_ATTR_FILL_HATCH && eXFS == drawing::FillStyle_HATCH) || + (nSID == SID_ATTR_FILL_BITMAP && eXFS == drawing::FillStyle_BITMAP)) { mpFillAttrLB->SetNoSelection(); } @@ -233,7 +234,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) if(mpStyleItem && pState && mbUpdate) { mbUpdate = false; - const XFillStyle eXFS(static_cast< XFillStyle >(mpStyleItem->GetValue())); + const drawing::FillStyle eXFS(static_cast< drawing::FillStyle >(mpStyleItem->GetValue())); // Check if the fill style was already active if(meLastXFS != eXFS) @@ -246,12 +247,12 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) switch(eXFS) { - case XFILL_NONE: + case drawing::FillStyle_NONE: { break; } - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { if(mpColorItem) { @@ -295,7 +296,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { if(mpGradientItem) { @@ -340,7 +341,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { if(mpHatchItem) { @@ -385,7 +386,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { if(mpBitmapItem) { @@ -440,12 +441,12 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) if(pState && mpStyleItem) { - XFillStyle eXFS = static_cast< XFillStyle >(mpStyleItem->GetValue()); + drawing::FillStyle eXFS = static_cast< drawing::FillStyle >(mpStyleItem->GetValue()); // Does the lists have changed? switch(eXFS) { - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { const SvxColorListItem* pItem = dynamic_cast< const SvxColorListItem* >(pState); @@ -458,7 +459,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { const SvxGradientListItem* pItem = dynamic_cast< const SvxGradientListItem* >(pState); @@ -471,7 +472,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { const SvxHatchListItem* pItem = dynamic_cast< const SvxHatchListItem* >(pState); @@ -484,7 +485,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { const SvxBitmapListItem* pItem = dynamic_cast< const SvxBitmapListItem* >(pState); @@ -497,7 +498,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } break; } - default: // XFILL_NONE + default: // drawing::FillStyle_NONE { break; } @@ -527,8 +528,8 @@ Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) // and selecting a DrawObject, thhus a useful initialization is // needed to get the FillType and the FillStyle List inited // correctly. This in combination with meLastXFS inited to - // XFILL_NONE do the trick - mpStyleItem = new XFillStyleItem(XFILL_SOLID); + // drawing::FillStyle_NONE do the trick + mpStyleItem = new XFillStyleItem(drawing::FillStyle_SOLID); } return mpFillControl; @@ -575,7 +576,7 @@ FillControl::~FillControl() delete mpLbFillAttr; } -void FillControl::InitializeFillStyleAccordingToGivenFillType(XFillStyle aFillStyle) +void FillControl::InitializeFillStyleAccordingToGivenFillType(drawing::FillStyle aFillStyle) { SfxObjectShell* pSh = SfxObjectShell::Current(); bool bDone(false); @@ -587,7 +588,7 @@ void FillControl::InitializeFillStyleAccordingToGivenFillType(XFillStyle aFillSt switch (aFillStyle) { - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { if(pSh->GetItem(SID_COLOR_TABLE)) { @@ -599,7 +600,7 @@ void FillControl::InitializeFillStyleAccordingToGivenFillType(XFillStyle aFillSt break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { if(pSh->GetItem(SID_GRADIENT_LIST)) { @@ -611,7 +612,7 @@ void FillControl::InitializeFillStyleAccordingToGivenFillType(XFillStyle aFillSt break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { if(pSh->GetItem(SID_HATCH_LIST)) { @@ -623,7 +624,7 @@ void FillControl::InitializeFillStyleAccordingToGivenFillType(XFillStyle aFillSt break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { if(pSh->GetItem(SID_BITMAP_LIST)) { @@ -634,9 +635,9 @@ void FillControl::InitializeFillStyleAccordingToGivenFillType(XFillStyle aFillSt } break; } - default: // XFILL_NONE + default: // drawing::FillStyle_NONE { - // accept disable (no styles for XFILL_NONE) + // accept disable (no styles for drawing::FillStyle_NONE) break; } } @@ -666,9 +667,9 @@ IMPL_LINK(FillControl,SelectFillTypeHdl,ListBox *,pBox) && mpLbFillType->GetSelectEntryPos() != mnLastFillTypeControlSelectEntryPos); updateLastFillTypeControlSelectEntryPos(); - XFillStyle eXFS = static_cast< XFillStyle >(mpLbFillType->GetSelectEntryPos()); + drawing::FillStyle eXFS = static_cast< drawing::FillStyle >(mpLbFillType->GetSelectEntryPos()); - if(bAction && XFILL_NONE != eXFS) + if(bAction && drawing::FillStyle_NONE != eXFS) { mbFillTypeChanged = true; } @@ -676,12 +677,12 @@ IMPL_LINK(FillControl,SelectFillTypeHdl,ListBox *,pBox) // update list of FillStyles in any case InitializeFillStyleAccordingToGivenFillType(eXFS); - // for XFILL_NONE do no longer call SelectFillAttrHdl (as done before), + // for drawing::FillStyle_NONE do no longer call SelectFillAttrHdl (as done before), // trigger needed actions directly. This is the only action this handler // can trigger directly as the user action is finished in this case - if(XFILL_NONE == eXFS && bAction) + if(drawing::FillStyle_NONE == eXFS && bAction) { - // for XFILL_NONE do no longer call SelectFillAttrHdl, + // for drawing::FillStyle_NONE do no longer call SelectFillAttrHdl, // trigger needed actions directly Any a; Sequence< PropertyValue > aArgsFillStyle(1); @@ -741,17 +742,18 @@ IMPL_LINK(FillControl, SelectFillAttrHdl, ListBox *, pBox) Any a; Sequence< PropertyValue > aArgsFillAttr(1); OUString aFillAttrCommand; - XFillStyle eXFS(static_cast< XFillStyle >(mpLbFillType->GetSelectEntryPos())); + drawing::FillStyle eXFS(static_cast< drawing::FillStyle >(mpLbFillType->GetSelectEntryPos())); switch(eXFS) { - case XFILL_NONE: + default: + case drawing::FillStyle_NONE: { // handled in SelectFillTypeHdl, nothing to do here break; } - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { // Entry gets tested against temporary color OUString aTmpStr = mpLbFillAttr->GetSelectEntry(); @@ -767,7 +769,7 @@ IMPL_LINK(FillControl, SelectFillAttrHdl, ListBox *, pBox) aFillAttrCommand = ".uno:FillColor"; break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem(SID_GRADIENT_LIST)) @@ -787,7 +789,7 @@ IMPL_LINK(FillControl, SelectFillAttrHdl, ListBox *, pBox) break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem(SID_HATCH_LIST)) @@ -808,7 +810,7 @@ IMPL_LINK(FillControl, SelectFillAttrHdl, ListBox *, pBox) break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem(SID_BITMAP_LIST)) diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 11a24d7cad5b..40865b85bc50 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <com/sun/star/drawing/FillStyle.hpp> + #include <tools/shl.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> @@ -43,6 +45,7 @@ #include "svx/linectrl.hxx" #include <svtools/colorcfg.hxx> +using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; @@ -429,7 +432,7 @@ SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : { SetSizePixel( LogicToPixel( Size(40, 40 ),MAP_APPFONT )); Fill(); - SelectEntryPos( XFILL_SOLID ); + SelectEntryPos( drawing::FillStyle_SOLID ); Show(); } diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index cad5ee21b20c..8ba7dfd4c8db 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -37,6 +37,8 @@ #include <svx/xfltrit.hxx> #include <svx/unoshape.hxx> +using namespace com::sun::star; + //UUUU void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxItemSet& rToSet) { @@ -54,7 +56,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI // we have a color fill const Color aColor(rBrush.GetColor().GetRGBColor()); - rToSet.Put(XFillStyleItem(XFILL_SOLID)); + rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID)); rToSet.Put(XFillColorItem(OUString(), aColor)); // #125189# nTransparency is in range [0..254], convert to [0..100] which is used in @@ -64,7 +66,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI else if(GPOS_NONE != rBrush.GetGraphicPos()) { // we have a graphic fill, set fill style - rToSet.Put(XFillStyleItem(XFILL_BITMAP)); + rToSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); // set graphic (if available) const Graphic* pGraphic = rBrush.GetGraphic(); @@ -140,10 +142,10 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI // Also need to set the FillStyle to NONE to express the 0xff transparency flag; this // is needed when e.g. first transparency is set to 0xff and then a Graphic gets set. // When not changing the FillStyle, the next getSvxBrushItemFromSourceSet *will* return - // to XFILL_SOLID with the rescued color. + // to drawing::FillStyle_SOLID with the rescued color. const Color aColor(rBrush.GetColor().GetRGBColor()); - rToSet.Put(XFillStyleItem(XFILL_NONE)); + rToSet.Put(XFillStyleItem(drawing::FillStyle_NONE)); rToSet.Put(XFillColorItem(OUString(), aColor)); } } @@ -194,9 +196,9 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt { const XFillStyleItem* pXFillStyleItem(static_cast< const XFillStyleItem* >(rSourceSet.GetItem(XATTR_FILLSTYLE, bSearchInParents))); - if(!pXFillStyleItem || XFILL_NONE == pXFillStyleItem->GetValue()) + if(!pXFillStyleItem || drawing::FillStyle_NONE == pXFillStyleItem->GetValue()) { - // no fill, still need to rescue the evtl. set RGB color, but use as transparent color (we have XFILL_NONE) + // no fill, still need to rescue the evtl. set RGB color, but use as transparent color (we have drawing::FillStyle_NONE) Color aFillColor(static_cast< const XFillColorItem& >(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents)).GetColorValue()); // when fill style is none, then don't allow anything other than 0 or auto. @@ -212,18 +214,19 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt switch(pXFillStyleItem->GetValue()) { - case XFILL_NONE: + default: + case drawing::FillStyle_NONE: { // already handled above, can not happen again break; } - case XFILL_SOLID: + case drawing::FillStyle_SOLID: { // create SvxBrushItem with fill color aRetval = getSvxBrushItemForSolid(rSourceSet, bSearchInParents, nBackgroundID); break; } - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: { // cannot be directly supported, but do the best possible const XGradient aXGradient(static_cast< const XFillGradientItem& >(rSourceSet.Get(XATTR_FILLGRADIENT)).GetGradientValue()); @@ -249,7 +252,7 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt aRetval = SvxBrushItem(aMixedColor, nBackgroundID); break; } - case XFILL_HATCH: + case drawing::FillStyle_HATCH: { // cannot be directly supported, but do the best possible const XHatch& rHatch(static_cast< const XFillHatchItem& >(rSourceSet.Get(XATTR_FILLHATCH)).GetHatchValue()); @@ -257,7 +260,7 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt if(bFillBackground) { - // hatch is background-filled, use FillColor as if XFILL_SOLID + // hatch is background-filled, use FillColor as if drawing::FillStyle_SOLID aRetval = getSvxBrushItemForSolid(rSourceSet, bSearchInParents, nBackgroundID); } else @@ -283,7 +286,7 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSourceSet, sal_uInt break; } - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: { // create SvxBrushItem with bitmap info and flags const XFillBitmapItem& rBmpItm = static_cast< const XFillBitmapItem& >(rSourceSet.Get(XATTR_FILLBITMAP, bSearchInParents)); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index bae3f7dac839..918d0e7e6afe 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -3117,7 +3117,7 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException, std::ex if(mpObj->ISA(SdrGrafObj)) { // defaults for graphic objects have changed: - mpObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) ); + mpObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) ); mpObj->SetMergedItem( XLineStyleItem( XLINE_NONE ) ); } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index d5af6f29f6b8..7a652f08299b 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -2230,7 +2230,7 @@ bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem); -XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) : +XFillStyleItem::XFillStyleItem(drawing::FillStyle eFillStyle) : SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle)) { } @@ -2272,19 +2272,19 @@ SfxItemPresentation XFillStyleItem::GetPresentation switch( (sal_uInt16)GetValue() ) { - case XFILL_NONE: + case drawing::FillStyle_NONE: nId = RID_SVXSTR_INVISIBLE; break; - case XFILL_SOLID: + case drawing::FillStyle_SOLID: nId = RID_SVXSTR_SOLID; break; - case XFILL_GRADIENT: + case drawing::FillStyle_GRADIENT: nId = RID_SVXSTR_GRADIENT; break; - case XFILL_HATCH: + case drawing::FillStyle_HATCH: nId = RID_SVXSTR_HATCH; break; - case XFILL_BITMAP: + case drawing::FillStyle_BITMAP: nId = RID_SVXSTR_BITMAP; break; } |