fdo#85486 - Clean up unnecessary enumerations from xenum.hxx

Removed XLineStyle

Reviewed on:
https://gerrit.libreoffice.org/13029

Change-Id: I583575a04988ccf932374e411672ba14a3f3cb2f

11 files changed, 49 insertions, 40 deletions

diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index b39b3438c6d9..8b1848f64978 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -20,6 +20,7 @@
 #include <sal/config.h>
 
 #include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <i18nlangtag/mslangid.hxx>
 #include <sfx2/docfile.hxx>
@@ -150,7 +151,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     XHatch    aNullHatch(aNullCol);
 
                     // Line attributes (Extended OutputDevice)
-    rISet.Put(XLineStyleItem(XLINE_SOLID));
+    rISet.Put(XLineStyleItem(drawing::LineStyle_SOLID));
     rISet.Put(XLineColorItem(OUString(), RGB_Color(COL_DEFAULT_SHAPE_STROKE)));
     rISet.Put(XLineWidthItem(0));
     rISet.Put(XLineDashItem(pPool,aNullDash));
@@ -261,7 +262,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHARROW );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_SOLID));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
     pISet->Put(XLineColorItem(OUString(), RGB_Color(COL_BLACK)));
     pISet->Put(XLineWidthItem(150));
 
@@ -307,7 +308,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet = &pSheet->GetItemSet();
 
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
 
     // Text
 
@@ -317,7 +318,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     // Text body
@@ -327,7 +328,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxFontHeightItem(564, 100, EE_CHAR_FONTHEIGHT));        // 16 pt
@@ -339,7 +340,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_JUSTIFY );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxAdjustItem(SVX_ADJUST_BLOCK, EE_PARA_JUST ));
@@ -351,7 +352,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXTBODY_INDENT );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
@@ -366,7 +367,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT ));      // 44 pt
@@ -378,7 +379,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TITLE1 );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID));
     pISet->Put(XFillColorItem(OUString(), RGB_Color(COL_CYAN)));
 
@@ -428,7 +429,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxFontHeightItem(846, 100, EE_CHAR_FONTHEIGHT ));        // 24 pt
@@ -443,7 +444,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE1 );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT ));
@@ -460,7 +461,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_HEADLINE2 );
     pISet = &pSheet->GetItemSet();
 
-    pISet->Put(XLineStyleItem(XLINE_NONE));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_NONE));
     pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
 
     pISet->Put(SvxPostureItem(ITALIC_NORMAL, EE_CHAR_ITALIC ));
@@ -487,7 +488,7 @@ void SdDrawDocument::CreateLayoutTemplates()
     pISet->Put(XLineStartWidthItem(200));
     pISet->Put(XLineEndItem(SVX_RESSTR(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow)));
     pISet->Put(XLineEndWidthItem(200));
-    pISet->Put(XLineStyleItem(XLINE_SOLID));
+    pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID));
     pISet->Put(makeSdrMeasureShowUnitItem(true));
 
     // Generate presentation templates for default layout.
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 5e4b30f7a754..095054ee24f2 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -66,6 +66,8 @@
 #include <svl/itemset.hxx>
 #include "app.hrc"
 
+#include <com/sun/star/drawing/LineStyle.hpp>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -252,7 +254,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
                 rSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
                 rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
                 rSet.Put( SvxBackgroundColorItem( Color (COL_AUTO), EE_CHAR_BKGCOLOR )  );
-                rSet.Put( XLineStyleItem(XLINE_NONE) );
+                rSet.Put( XLineStyleItem(com::sun::star::drawing::LineStyle_NONE) );
                 rSet.Put( XFillStyleItem(drawing::FillStyle_NONE) );
                 rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
                 rSet.Put( makeSdrTextAutoGrowHeightItem(false) );
@@ -346,7 +348,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
         pSheet->SetParent( OUString() );
         SfxItemSet& rTitleSet = pSheet->GetItemSet();
-        rTitleSet.Put(XLineStyleItem(XLINE_NONE));
+        rTitleSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
         rTitleSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         rTitleSet.Put(aSvxFontItem);
         rTitleSet.Put(aSvxFontItemCJK);
@@ -392,7 +394,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
         pSheet->SetParent( OUString() );
         SfxItemSet& rSubtitleSet = pSheet->GetItemSet();
-        rSubtitleSet.Put(XLineStyleItem(XLINE_NONE));
+        rSubtitleSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
         rSubtitleSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         rSubtitleSet.Put(aSvxFontItem);
         rSubtitleSet.Put(aSvxFontItemCJK);
@@ -441,7 +443,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_NOTES );
         pSheet->SetParent( OUString() );
         SfxItemSet& rNotesSet = pSheet->GetItemSet();
-        rNotesSet.Put(XLineStyleItem(XLINE_NONE));
+        rNotesSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
         rNotesSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         rNotesSet.Put(aSvxFontItem);
         rNotesSet.Put(aSvxFontItemCJK);
@@ -508,7 +510,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
         pSheet->SetParent( OUString() );
         SfxItemSet& rBackgroundSet = pSheet->GetItemSet();
-        rBackgroundSet.Put(XLineStyleItem(XLINE_NONE));
+        rBackgroundSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
         rBackgroundSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
         // #i16874# enable kerning by default but only for new documents
         rBackgroundSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 64c64bad7ca2..731fb65cc447 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -86,6 +86,7 @@
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
 
 #include <comphelper/string.hxx>
 #include <oox/ole/olehelper.hxx>
@@ -2564,9 +2565,9 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                                             const SfxItemSet& rObjItemSet = pObj->GetMergedItemSet();
 
                                             drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem&>(rObjItemSet.Get(XATTR_FILLSTYLE)).GetValue();
-                                            XLineStyle eLineStyle = static_cast<const XLineStyleItem&>(rObjItemSet.Get(XATTR_LINESTYLE)).GetValue();
+                                            drawing::LineStyle eLineStyle = static_cast<const XLineStyleItem&>(rObjItemSet.Get(XATTR_LINESTYLE)).GetValue();
 
-                                            if ( ( eFillStyle == drawing::FillStyle_NONE ) && ( eLineStyle == XLINE_NONE ) )
+                                            if ( ( eFillStyle == drawing::FillStyle_NONE ) && ( eLineStyle == drawing::LineStyle_NONE ) )
                                                 bDontAnimateInvisibleShape = true;
                                         }
                                     }
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 3c2951bac935..b3b2591e4692 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -359,7 +359,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
     XDash aDash( XDASH_RECT, 1, 80, 1, 80, 80);
     OUString aEmpty( "?" );
     mpPathObj->SetMergedItem( XLineDashItem( aEmpty, aDash ) );
-    mpPathObj->SetMergedItem( XLineStyleItem( XLINE_DASH ) );
+    mpPathObj->SetMergedItem( XLineStyleItem( drawing::LineStyle_DASH ) );
     mpPathObj->SetMergedItem( XLineColorItem(aEmpty, ::Color(COL_GRAY)) );
     mpPathObj->SetMergedItem( XFillStyleItem( drawing::FillStyle_NONE ) );
 
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index d00aa94d8a7f..78fbcf47c3fd 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -29,6 +29,7 @@
 #include <svx/svdobj.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
+#include <com/sun/star/drawing/LineStyle.hpp>
 
 using namespace com::sun::star;
 
@@ -51,12 +52,12 @@ MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObjec
     aSet1.Put(pObj1->GetMergedItemSet());
     aSet2.Put(pObj2->GetMergedItemSet());
 
-    const XLineStyle    eLineStyle1 = static_cast<const XLineStyleItem&>( aSet1.Get( XATTR_LINESTYLE ) ).GetValue();
-    const XLineStyle    eLineStyle2 = static_cast<const XLineStyleItem&>( aSet2.Get( XATTR_LINESTYLE ) ).GetValue();
+    const drawing::LineStyle eLineStyle1 = static_cast<const XLineStyleItem&>( aSet1.Get( XATTR_LINESTYLE ) ).GetValue();
+    const drawing::LineStyle eLineStyle2 = static_cast<const XLineStyleItem&>( aSet2.Get( XATTR_LINESTYLE ) ).GetValue();
     const drawing::FillStyle eFillStyle1 = static_cast<const XFillStyleItem&>( aSet1.Get( XATTR_FILLSTYLE ) ).GetValue();
     const drawing::FillStyle eFillStyle2 = static_cast<const XFillStyleItem&>( aSet2.Get( XATTR_FILLSTYLE ) ).GetValue();
 
-    if ( ( ( eLineStyle1 == XLINE_NONE ) || ( eLineStyle2 == XLINE_NONE ) ) &&
+    if ( ( ( eLineStyle1 == drawing::LineStyle_NONE ) || ( eLineStyle2 == drawing::LineStyle_NONE ) ) &&
          ( ( eFillStyle1 != drawing::FillStyle_SOLID ) || ( eFillStyle2 != drawing::FillStyle_SOLID ) ) )
     {
         m_pCbxAttributes->Disable();
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index d8685cb78764..b266637737c7 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -48,6 +48,8 @@
 #include <svx/polysc3d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
+using namespace com::sun::star;
+
 namespace sd {
 
 TYPEINIT1( FuConstruct3dObject, FuConstruct );
@@ -326,7 +328,7 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
             SetStyleSheet(aAttr, pObj);
 
             // extract LineStyle
-            aAttr.Put(XLineStyleItem (XLINE_NONE));
+            aAttr.Put(XLineStyleItem (drawing::LineStyle_NONE));
 
             pObj->SetMergedItemSet(aAttr);
         }
@@ -415,7 +417,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
 
     SfxItemSet aAttr(mpDoc->GetPool());
     SetStyleSheet(aAttr, p3DObj);
-    aAttr.Put(XLineStyleItem (XLINE_NONE));
+    aAttr.Put(XLineStyleItem (drawing::LineStyle_NONE));
     p3DObj->SetMergedItemSet(aAttr);
 
     // make object interactive at once
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 2d5e484f4e50..6eebb5b8ec56 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -239,7 +239,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
 
                         // remove hard attributes (Flag to sal_True)
                         SfxItemSet aAttr(mpDoc->GetPool());
-                        aAttr.Put(XLineStyleItem(XLINE_NONE));
+                        aAttr.Put(XLineStyleItem(drawing::LineStyle_NONE));
                         aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
                         pOutlineObj->SetMergedItemSet(aAttr);
                     }
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 475c63a67a3a..d2fe87dc6e88 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -44,6 +44,7 @@
 
 #include <basegfx/color/bcolor.hxx>
 #include <boost/scoped_ptr.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
 
 using namespace com::sun::star;
 
@@ -354,14 +355,14 @@ void FuMorph::ImpInsertPolygons(
     aSet1.Put(pObj1->GetMergedItemSet());
     aSet2.Put(pObj2->GetMergedItemSet());
 
-    const XLineStyle eLineStyle1 = ITEMVALUE( aSet1, XATTR_LINESTYLE, XLineStyleItem );
-    const XLineStyle eLineStyle2 = ITEMVALUE( aSet2, XATTR_LINESTYLE, XLineStyleItem );
+    const drawing::LineStyle eLineStyle1 = ITEMVALUE( aSet1, XATTR_LINESTYLE, XLineStyleItem );
+    const drawing::LineStyle eLineStyle2 = ITEMVALUE( aSet2, XATTR_LINESTYLE, XLineStyleItem );
     const drawing::FillStyle eFillStyle1 = ITEMVALUE( aSet1, XATTR_FILLSTYLE, XFillStyleItem );
     const drawing::FillStyle eFillStyle2 = ITEMVALUE( aSet2, XATTR_FILLSTYLE, XFillStyleItem );
 
     if ( bAttributeFade )
     {
-        if ( ( eLineStyle1 != XLINE_NONE ) && ( eLineStyle2 != XLINE_NONE ) )
+        if ( ( eLineStyle1 != drawing::LineStyle_NONE ) && ( eLineStyle2 != drawing::LineStyle_NONE ) )
         {
             bLineWidth = bLineColor = true;
 
@@ -373,7 +374,7 @@ void FuMorph::ImpInsertPolygons(
             nStartLineWidth = ITEMVALUE( aSet1, XATTR_LINEWIDTH, XLineWidthItem );
             nEndLineWidth = ITEMVALUE( aSet2, XATTR_LINEWIDTH, XLineWidthItem );
         }
-        else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) )
+        else if ( ( eLineStyle1 == drawing::LineStyle_NONE ) && ( eLineStyle2 == drawing::LineStyle_NONE ) )
             bIgnoreLine = true;
 
         if ( ( eFillStyle1 == drawing::FillStyle_SOLID ) && ( eFillStyle2 == drawing::FillStyle_SOLID ) )
@@ -398,7 +399,7 @@ void FuMorph::ImpInsertPolygons(
         const double    fDelta = nEndLineWidth - nStartLineWidth;
         double          fFactor = fStep;
 
-        aSet.Put( XLineStyleItem( XLINE_SOLID ) );
+        aSet.Put( XLineStyleItem( drawing::LineStyle_SOLID ) );
         aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) );
 
         for ( size_t i = 0; i < nCount; i++, fFactor += fStep )
@@ -413,7 +414,7 @@ void FuMorph::ImpInsertPolygons(
                 aSet.Put( XLineColorItem( aEmptyStr, Color(aLineColor)));
             }
             else if ( bIgnoreLine )
-                aSet.Put( XLineStyleItem( XLINE_NONE ) );
+                aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) );
 
             // fill color
             if ( bFillColor )
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 3ec9524446ee..f81950cc2bab 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -210,7 +210,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
 
     // remove hard attributes (Flag to sal_True)
     SfxItemSet aAttr(mpDoc->GetPool());
-    aAttr.Put(XLineStyleItem(XLINE_NONE));
+    aAttr.Put(XLineStyleItem(drawing::LineStyle_NONE));
     aAttr.Put(XFillStyleItem(drawing::FillStyle_NONE));
     pTextObj->SetMergedItemSet(aAttr);
 
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index fe024fc0fc4a..4cf3d54cb16e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1002,7 +1002,7 @@ namespace {
                         if (nSkip > 0)
                             --nSkip;
                         else
-                            pPathObj->SetMergedItem(XLineStyleItem(XLINE_NONE));
+                            pPathObj->SetMergedItem(XLineStyleItem(drawing::LineStyle_NONE));
                     }
                 }
             }
@@ -1049,7 +1049,7 @@ namespace {
                 {
                     SdrPathObj* pPathObj = dynamic_cast<SdrPathObj*>(aShapeIter.Next());
                     if (pPathObj != NULL)
-                        pPathObj->SetMergedItem(XLineStyleItem(XLINE_SOLID));
+                        pPathObj->SetMergedItem(XLineStyleItem(drawing::LineStyle_SOLID));
                 }
             }
 
@@ -1567,7 +1567,7 @@ private:
                 }
 
                 SdrPathObj* pPathObj = new SdrPathObj(OBJ_PATHLINE, aPathPoly );
-                pPathObj->SetMergedItem(XLineStyleItem(XLINE_SOLID));
+                pPathObj->SetMergedItem(XLineStyleItem(drawing::LineStyle_SOLID));
                 pPathObj->SetMergedItem(XLineColorItem(OUString(), Color(COL_BLACK)));
 
                 pHandout->NbcInsertObject( pPathObj );
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 0e67b9626ba0..f7308c0c1e2c 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -59,6 +59,7 @@
 
 #include <svx/galleryitem.hxx>
 #include <com/sun/star/gallery/GalleryItemType.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
 #include <boost/scoped_ptr.hpp>
 
 using namespace com::sun::star;
@@ -236,10 +237,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                 if (pArgs->Count () == 1)
                 {
                     SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, false);
-                    if (CHECK_RANGE (XLINE_NONE, (sal_Int32)pLineStyle->GetValue (), XLINE_DASH))
+                    if (CHECK_RANGE (drawing::LineStyle_NONE, (sal_Int32)pLineStyle->GetValue (), drawing::LineStyle_DASH))
                     {
                         pAttr->ClearItem (XATTR_LINESTYLE);
-                        pAttr->Put (XLineStyleItem ((XLineStyle) pLineStyle->GetValue ()), XATTR_LINESTYLE);
+                        pAttr->Put (XLineStyleItem ((drawing::LineStyle) pLineStyle->GetValue ()), XATTR_LINESTYLE);
                         rBindings.Invalidate (SID_ATTR_LINE_STYLE);
                     }
 #if HAVE_FEATURE_SCRIPTING
@@ -465,7 +466,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
                             pDashList->Insert (pEntry);
 
                         pAttr->Put (XLineDashItem (pName->GetValue (), aNewDash), XATTR_LINEDASH);
-                        pAttr->Put (XLineStyleItem (XLINE_DASH), XATTR_LINESTYLE);
+                        pAttr->Put (XLineStyleItem (drawing::LineStyle_DASH), XATTR_LINESTYLE);
                         rBindings.Invalidate (SID_ATTR_LINE_DASH);
                         rBindings.Invalidate (SID_ATTR_FILL_STYLE);
                     }