[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc

[Joseph Powers]

 binfilter/bf_svx/source/xoutdev/svx_xattr.cxx    |   13 +----
 binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx |   59 -----------------------
 binfilter/inc/bf_svx/svdmodel.hxx                |    1 
 binfilter/inc/bf_svx/xattr.hxx                   |    1 
 binfilter/inc/bf_svx/xit.hxx                     |    1 
 binfilter/inc/bf_svx/xlndsit.hxx                 |    2 
 binfilter/inc/bf_svx/xtable.hxx                  |   24 ---------
 7 files changed, 6 insertions(+), 95 deletions(-)

New commits:
commit fcc0d72b522742350bd5bab17475c2394db5e991
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Tue Aug 30 20:24:52 2011 -0700

    Remove class XDashTable

diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 12fc438..3f11fd3 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -596,17 +596,14 @@ XubString aNameOrIndexEmptyString;
 
 /*************************************************************************
 |*
-|*    const XDash& XLineDashItem::GetValue(const XDashTable* pTable) const
+|*    const XDash& XLineDashItem::GetValue() const
 |*
 *************************************************************************/
 
-/*N*/ const XDash& XLineDashItem::GetValue(const XDashTable* pTable) const
-/*N*/ {
-/*N*/   if (!IsIndex())
-/*N*/       return aDash;
-/*N*/   else
-/*?*/       return pTable->Get(GetIndex())->GetDash();
-/*N*/ }
+const XDash& XLineDashItem::GetValue() const
+{
+    return aDash;
+}
 
 //------------------------------------------------------------------------
 
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index f99e5d4..bdef862 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -65,65 +65,6 @@ char const aChckDash[]  = { 0x04, 0x00, 'S','O','D','L'};   // < 5.2
 char const aChckDash0[] = { 0x04, 0x00, 'S','O','D','0'};   // = 5.2
 char const aChckXML[]   = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 
-// -----------------
-// class XDashTable
-// -----------------
-
-/************************************************************************/
-
-/*N*/ XDashTable::~XDashTable()
-/*N*/ {
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XDashEntry* XDashTable::Replace(long nIndex, XDashEntry* pEntry )
-/*N*/ {
-/*N*/   return (XDashEntry*) XPropertyTable::Replace(nIndex, pEntry);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XDashEntry* XDashTable::Remove(long nIndex)
-/*N*/ {
-/*N*/   return (XDashEntry*) XPropertyTable::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XDashEntry* XDashTable::Get(long nIndex) const
-/*N*/ {
-/*N*/   return (XDashEntry*) XPropertyTable::Get(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XDashTable::Load()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XDashTable::Create()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XDashTable::CreateBitmapsForUI()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
-/*N*/ {
-/*N*/   return( NULL );
-/*N*/ }
-
 // ----------------
 // class XDashList
 // ----------------
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 802c094..2ff1569 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -95,7 +95,6 @@ class SvxLinkManager;
 class XBitmapList;
 class XColorTable;
 class XDashList;
-class XDashTable;
 class XGradientList;
 class XHatchList;
 class XLineEndList;
diff --git a/binfilter/inc/bf_svx/xattr.hxx b/binfilter/inc/bf_svx/xattr.hxx
index 5fd4d34..ec810d1 100644
--- a/binfilter/inc/bf_svx/xattr.hxx
+++ b/binfilter/inc/bf_svx/xattr.hxx
@@ -32,7 +32,6 @@ namespace binfilter {
 // include ---------------------------------------------------------------
 
 class XColorTable;
-class XDashTable;
 
 }//end of namespace binfilter
 
diff --git a/binfilter/inc/bf_svx/xit.hxx b/binfilter/inc/bf_svx/xit.hxx
index fea7b5a..9b931b9 100644
--- a/binfilter/inc/bf_svx/xit.hxx
+++ b/binfilter/inc/bf_svx/xit.hxx
@@ -43,7 +43,6 @@ extern String aNameOrIndexEmptyString;
 /************************************************************************/
 
 class XColorTable;
-class XDashTable;
 class NameOrIndex;
 class XPropertyList;
 
diff --git a/binfilter/inc/bf_svx/xlndsit.hxx b/binfilter/inc/bf_svx/xlndsit.hxx
index 8390738..9c5960f 100644
--- a/binfilter/inc/bf_svx/xlndsit.hxx
+++ b/binfilter/inc/bf_svx/xlndsit.hxx
@@ -62,7 +62,7 @@ public:
     virtual bool            PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
 
-    const XDash&            GetValue(const XDashTable* pTable = 0) const;
+    const XDash&            GetValue() const;
     void                    SetValue(const XDash& rNew)   { aDash = rNew; Detach(); }
 
     static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 765d614..8426802 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -351,30 +351,6 @@ public:
     virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
 };
 
-// --------------------
-// class XDashTable
-// --------------------
-
-class XDashTable : public XPropertyTable
-{
-                    XDashTable( const String& rPath,
-                                XOutdevItemPool* pXPool = NULL,
-                                USHORT nInitSize = 16,
-                                USHORT nReSize = 16 );
-public:
-    virtual         ~XDashTable();
-
-    XDashEntry*     Replace(long nIndex, XDashEntry* pEntry );
-    XDashEntry*     Remove(long nIndex);
-    XDashEntry*     Get(long nIndex) const;
-
-    virtual BOOL    Load();
-    virtual BOOL    Save() {return false;}
-    virtual BOOL    Create();
-    virtual BOOL    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
-};
-
 // -------------------
 // class XDashList
 // -------------------