removed mess added during the merge from libreoffice-3-3

2 files changed, 3 insertions, 57 deletions

diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 7fa52f2839..4fc84213d5 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -109,7 +109,6 @@ public:
     static com::sun::star::table::BorderLine2 SvxLineToLine( const editeng::SvxBorderLine* pLine, sal_Bool bConvert );
     static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
     static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
-    static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
 };
 
 inline void SvxBoxItem::SetDistance( sal_uInt16 nNew )
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 9a519fb2e1..bda2be744f 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1743,31 +1743,17 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B
 
 }
 
-namespace
-{
-
-sal_Bool
-lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+// -----------------------------------------------------------------------
+sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
 {
     return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, sal_True);
 }
-    return bRet;
-}
 
 sal_Bool
 SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
-// -----------------------------------------------------------------------
-sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
 {
     SvxBorderStyle nStyle = NO_STYLE;
     switch ( rLine.LineStyle )
-
-sal_Bool
-SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
-{
-    const bool bRet(lcl_lineToSvxLine(rLine, rSvxLine, bConvert));
-
-    switch ( rLine.LineStyle )
     {
         default:
         case table::BorderLineStyle::SOLID:
@@ -1820,6 +1806,7 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx
     {
         rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) : rLine.LineWidth );
         bGuessWidth = sal_False;
+    }
 
     return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);
 }
@@ -1851,46 +1838,6 @@ lcl_extractBorderLine(const uno::Any& rAny, table::BorderLine2& rLine)
 
 template<typename Item>
 bool
-lcl_setLine(const uno::Any& rAny, Item& rItem, USHORT nLine, const bool bConvert)
-{
-    bool bDone = false;
-    table::BorderLine2 aBorderLine;
-    if (lcl_extractBorderLine(rAny, aBorderLine))
-    {
-        SvxBorderLine aLine;
-        bool bSet = SvxBoxItem::LineToSvxLine(aBorderLine, aLine, bConvert);
-        rItem.SetLine( bSet ? &aLine : NULL, nLine);
-        bDone = true;
-    }
-    return bDone;
-}
-
-}
-
-{
-
-bool
-lcl_extractBorderLine(const uno::Any& rAny, table::BorderLine2& rLine)
-{
-    if (rAny >>= rLine)
-        return true;
-
-    table::BorderLine aBorderLine;
-    if (rAny >>= aBorderLine)
-    {
-        rLine.Color = aBorderLine.Color;
-        rLine.InnerLineWidth = aBorderLine.InnerLineWidth;
-        rLine.OuterLineWidth = aBorderLine.OuterLineWidth;
-        rLine.LineDistance = aBorderLine.LineDistance;
-        rLine.LineStyle = table::BorderLineStyle::SOLID;
-        return true;
-    }
-
-    return false;
-}
-
-template<typename Item>
-bool
 lcl_setLine(const uno::Any& rAny, Item& rItem, sal_uInt16 nLine, const bool bConvert)
 {
     bool bDone = false;