From 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5 Mon Sep 17 00:00:00 2001
From: Oliver-Rainer Wittmann <orw@apache.org>
Date: Wed, 10 Apr 2013 08:20:16 +0000
Subject: 121420: merge sidebar feature from branch into trunk

---
 cui/source/tabpages/tpline.cxx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'cui/source/tabpages/tpline.cxx')

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index a78837113a1d..b6efd27812c1 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -301,7 +301,7 @@ void SvxLineTabPage::FillListboxes()
 {
     // Linienstile
     sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos();
-    aLbLineStyle.FillStyles();
+    // aLbLineStyle.FillStyles();
     aLbLineStyle.Fill( pDashList );
     aLbLineStyle.SelectEntryPos( nOldSelect );
 
@@ -728,22 +728,22 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
         {
             case 0: // Rounded, default
             {
-                pNew = new XLineJointItem(XLINEJOINT_ROUND);
+                pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_ROUND);
                 break;
             }
             case 1: // - none -
             {
-                pNew = new XLineJointItem(XLINEJOINT_NONE);
+                pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_NONE);
                 break;
             }
             case 2: // Miter
             {
-                pNew = new XLineJointItem(XLINEJOINT_MITER);
+                pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_MITER);
                 break;
             }
             case 3: // Bevel
             {
-                pNew = new XLineJointItem(XLINEJOINT_BEVEL);
+                pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL);
                 break;
             }
         }
@@ -895,22 +895,22 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl()
         {
             case 0: // Rounded, default
             {
-                rXLSet.Put(XLineJointItem(XLINEJOINT_ROUND));
+                rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND));
                 break;
             }
             case 1: // - none -
             {
-                rXLSet.Put(XLineJointItem(XLINEJOINT_NONE));
+                rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE));
                 break;
             }
             case 2: // Miter
             {
-                rXLSet.Put(XLineJointItem(XLINEJOINT_MITER));
+                rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER));
                 break;
             }
             case 3: // Bevel
             {
-                rXLSet.Put(XLineJointItem(XLINEJOINT_BEVEL));
+                rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL));
                 break;
             }
         }
@@ -1344,15 +1344,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     }
     else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINEJOINT))
     {
-        XLineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue();
+        const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue();
 
         switch(eLineJoint)
         {
-            case XLINEJOINT_ROUND : maLBEdgeStyle.SelectEntryPos(0); break;
-            case XLINEJOINT_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
-            case XLINEJOINT_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
-            case XLINEJOINT_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
-            case XLINEJOINT_MIDDLE : break;
+            case com::sun::star::drawing::LineJoint_MIDDLE : // fallback to round, unused value
+            case com::sun::star::drawing::LineJoint_ROUND : maLBEdgeStyle.SelectEntryPos(0); break;
+            case com::sun::star::drawing::LineJoint_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
+            case com::sun::star::drawing::LineJoint_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
+            case com::sun::star::drawing::LineJoint_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
         }
     }
     else
-- 
cgit v1.2.3