[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/inc sw/source

[Alex Ivan]

 sw/inc/swtblfmt.hxx             |    4 +---
 sw/source/core/doc/swtblfmt.cxx |   19 ++-----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit b39608c64cd67190f23b6e51f156ddb5e4458ddd
Author: Alex Ivan <alexnivan at yahoo.com>
Date:   Thu Jun 27 21:25:13 2013 +0300

    Use inherited methods in SwTableFmt
    
    Removed methods of SwTableFmt which corresponded in name and
    functionality with those defined in base class SwFmt.
    
    Change-Id: I3a70194b2f2d8c50a090ae201b8e65cf8556cd16

diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index a068fb9..ef66a10 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -24,6 +24,7 @@
 #include <editeng/shaditem.hxx>
 #include <fmtpdsc.hxx>
 #include <fmtlsplt.hxx>
+#include <frmatr.hxx>
 #include <frmfmt.hxx>
 
 class SwDoc;
@@ -90,12 +91,9 @@ public:
     void SetCollapsingBorders( const sal_Bool& rNew );
     void SetShadow( const SvxShadowItem& rNew );
 
-    const SvxFmtBreakItem& GetBreak() const;
-    const SwFmtPageDesc& GetPageDesc() const;
     const SvxFmtKeepItem& GetKeepWithNextPara() const;
     sal_Bool GetLayoutSplit() const;
     sal_Bool GetCollapsingBorders() const;
-    const SvxShadowItem& GetShadow() const;
 
     TYPEINFO();     // Already in base class Content.
 
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index c3fcd1a..3421db4 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -116,24 +116,14 @@ void SwTableFmt::SetShadow( const SvxShadowItem& rNew )
     SetFmtAttr( rNew );
 }
 
-const SvxFmtBreakItem& SwTableFmt::GetBreak() const
-{
-    return static_cast<const SvxFmtBreakItem&>( GetFmtAttr( RES_BREAK ) );
-}
-
-const SwFmtPageDesc& SwTableFmt::GetPageDesc() const
-{
-    return static_cast<const SwFmtPageDesc&>( GetFmtAttr( RES_PAGEDESC ) );
-}
-
 const SvxFmtKeepItem& SwTableFmt::GetKeepWithNextPara() const
 {
-    return static_cast<const SvxFmtKeepItem&>( GetFmtAttr( RES_KEEP ) );
+    return SwFmt::GetKeep();
 }
 
 sal_Bool SwTableFmt::GetLayoutSplit() const
 {
-    return (static_cast<const SwFmtLayoutSplit&>( GetFmtAttr( RES_LAYOUT_SPLIT ) )).GetValue();
+    return SwFmt::GetLayoutSplit().GetValue();
 }
 
 sal_Bool SwTableFmt::GetCollapsingBorders() const
@@ -141,11 +131,6 @@ sal_Bool SwTableFmt::GetCollapsingBorders() const
     return (static_cast<const SfxBoolItem&>( GetFmtAttr( RES_COLLAPSING_BORDERS ) )).GetValue();
 }
 
-const SvxShadowItem& SwTableFmt::GetShadow() const
-{
-    return static_cast<const SvxShadowItem&>( GetFmtAttr( RES_SHADOW ) );
-}
-
 SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
                     SwFrmFmt *pDrvdFrm )
     : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )