Remove class XHatchTable

7 files changed, 7 insertions, 122 deletions

diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index e512e4531015..5a2bfc1fe585 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -83,7 +83,6 @@ class XColorTable;
 class XDashList;
 class XGradientList;
 class XHatchList;
-class XHatchTable;
 class XLineEndList;
 class XLineEndTable;
 class SvxForbiddenCharactersTable;
diff --git a/svx/inc/svx/xattr.hxx b/svx/inc/svx/xattr.hxx
index 598bf49d383d..6b09d52d732c 100644
--- a/svx/inc/svx/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
@@ -30,7 +30,6 @@
 
 class XColorTable;
 class XLineEndTable;
-class XHatchTable;
 
 #include <svx/xit.hxx>
 #include <svx/xcolit.hxx>
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index df25fb8f9313..65eed6d9b17f 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -66,7 +66,7 @@ public:
     virtual bool            HasMetrics() const;
     virtual bool            ScaleMetrics(long nMul, long nDiv);
 
-    const XHatch&           GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue
+    const XHatch&           GetHatchValue() const; // GetValue -> GetHatchValue
     void                    SetHatchValue(const XHatch& rNew)  { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue
 
     static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 4d2f8e0f782c..72cfac6470fc 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -37,7 +37,6 @@
 
 class XColorTable;
 class XLineEndTable;
-class XHatchTable;
 class SfxItemPool;
 class NameOrIndex;
 class XPropertyList;
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 1b7f49397be6..bedbcb6ff343 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -422,35 +422,6 @@ public:
     virtual Bitmap*     CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
 };
 
-// --------------------
-// class XHatchTable
-// --------------------
-
-class XHatchTable : public XPropertyTable
-{
-public:
-    explicit        XHatchTable(
-                        const String& rPath,
-                        XOutdevItemPool* pXPool = NULL,
-                        sal_uInt16 nInitSize = 16,
-                        sal_uInt16 nReSize = 16
-                    );
-    virtual         ~XHatchTable();
-
-    using XPropertyTable::Replace;
-    XHatchEntry*    Replace(long nIndex, XHatchEntry* pEntry );
-    using XPropertyTable::Remove;
-    XHatchEntry*    Remove(long nIndex);
-    using XPropertyTable::Get;
-    XHatchEntry*    GetHatch(long nIndex) const;
-
-    virtual sal_Bool    Load();
-    virtual sal_Bool    Save();
-    virtual sal_Bool    Create();
-    virtual sal_Bool    CreateBitmapsForUI();
-    virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
-};
-
 // -------------------
 // class XHatchList
 // -------------------
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 99573f829d04..3df114029a2c 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -4026,12 +4026,13 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
 |*
 *************************************************************************/
 
-const XHatch& XFillHatchItem::GetHatchValue(const XHatchTable* pTable) const // GetValue -> GetHatchValue
+const XHatch& XFillHatchItem::GetHatchValue() const // GetValue -> GetHatchValue
 {
-    if (!IsIndex())
-        return aHatch;
-    else
-        return pTable->GetHatch(GetIndex())->GetHatch();
+    //if (!IsIndex())
+    //    return aHatch;
+    //else
+    //    return pTable->GetHatch(GetIndex())->GetHatch();
+    return aHatch;
 }
 
 //------------------------------------------------------------------------
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index a87d86fa1e9e..b48a6476e7a7 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -67,90 +67,6 @@ char const aChckHatch[]  = { 0x04, 0x00, 'S','O','H','L'};  // < 5.2
 char const aChckHatch0[] = { 0x04, 0x00, 'S','O','H','0'};  // = 5.2
 char const aChckXML[]    = { '<', '?', 'x', 'm', 'l' };     // = 6.0
 
-// ------------------
-// class XHatchTable
-// ------------------
-
-/*************************************************************************
-|*
-|* XHatchTable::XHatchTable()
-|*
-*************************************************************************/
-
-XHatchTable::XHatchTable(
-    const String& rPath,
-    XOutdevItemPool* pInPool,
-    sal_uInt16
-    nInitSize,
-    sal_uInt16 nReSize
-)
-    : XPropertyTable( rPath, pInPool, nInitSize, nReSize )
-{
-    pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XHatchTable::~XHatchTable()
-{
-}
-
-/************************************************************************/
-
-XHatchEntry* XHatchTable::Replace(long nIndex, XHatchEntry* pEntry )
-{
-    return (XHatchEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XHatchEntry* XHatchTable::Remove(long nIndex)
-{
-    return (XHatchEntry*) XPropertyTable::Remove(nIndex);
-}
-
-/************************************************************************/
-
-XHatchEntry* XHatchTable::GetHatch(long nIndex) const
-{
-    return (XHatchEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::Load()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::Save()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::Create()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XHatchTable::CreateBitmapsForUI()
-{
-    return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
-    return( NULL );
-}
-
 // -----------------
 // class XHatchList
 // -----------------