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

[Joseph Powers]

 binfilter/bf_svx/source/xoutdev/svx_xattr.cxx    |   15 ++++---
 binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx |   45 -----------------------
 binfilter/inc/bf_svx/svdmodel.hxx                |    1 
 binfilter/inc/bf_svx/xattr.hxx                   |    2 -
 binfilter/inc/bf_svx/xflhtit.hxx                 |    2 -
 binfilter/inc/bf_svx/xit.hxx                     |    1 
 binfilter/inc/bf_svx/xtable.hxx                  |   22 -----------
 7 files changed, 10 insertions(+), 78 deletions(-)

New commits:
commit fc3c5817463bb4bc634a06a4a32ca590444efca9
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sun Aug 28 09:19:48 2011 -0700

    Remove class XHatchTable

diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 9632c34..a32a161 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -2850,13 +2850,14 @@ const XGradient& XFillGradientItem::GetValue(
 |*
 *************************************************************************/
 
-/*N*/ const XHatch& XFillHatchItem::GetValue(const XHatchTable* pTable) const
-/*N*/ {
-/*N*/   if (!IsIndex())
-/*N*/       return aHatch;
-/*N*/   else
-/*?*/       return pTable->Get(GetIndex())->GetHatch();
-/*N*/ }
+const XHatch& XFillHatchItem::GetValue() const
+{
+    //if (!IsIndex())
+    //    return aHatch;
+    //else
+    //    return pTable->Get(GetIndex())->GetHatch();
+    return aHatch;
+}
 
 //------------------------------------------------------------------------
 
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
index 41f361d..243de25 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx
@@ -63,51 +63,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
-// ------------------
-
-/************************************************************************/
-
-/*N*/ XHatchTable::~XHatchTable()
-/*N*/ {
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XHatchEntry* XHatchTable::Get(long nIndex) const
-/*N*/ {
-/*N*/   return (XHatchEntry*) XPropertyTable::Get(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XHatchTable::Load()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XHatchTable::Create()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XHatchTable::CreateBitmapsForUI()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
-/*N*/ {
-/*N*/   return( NULL );
-/*N*/ }
-
 // -----------------
 // class XHatchList
 // -----------------
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 8ed128a..46661aa 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -98,7 +98,6 @@ class XDashList;
 class XDashTable;
 class XGradientList;
 class XHatchList;
-class XHatchTable;
 class XLineEndList;
 class XLineEndTable;
 class SvxForbiddenCharactersTable;
diff --git a/binfilter/inc/bf_svx/xattr.hxx b/binfilter/inc/bf_svx/xattr.hxx
index 80c17ef..dc40dca 100644
--- a/binfilter/inc/bf_svx/xattr.hxx
+++ b/binfilter/inc/bf_svx/xattr.hxx
@@ -34,7 +34,7 @@ namespace binfilter {
 class XColorTable;
 class XDashTable;
 class XLineEndTable;
-class XHatchTable;
+
 }//end of namespace binfilter
 
 #include <bf_svx/xit.hxx>
diff --git a/binfilter/inc/bf_svx/xflhtit.hxx b/binfilter/inc/bf_svx/xflhtit.hxx
index 37e86d0..e69053c 100644
--- a/binfilter/inc/bf_svx/xflhtit.hxx
+++ b/binfilter/inc/bf_svx/xflhtit.hxx
@@ -61,7 +61,7 @@ public:
     virtual bool            QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual bool            PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
-    const XHatch&           GetValue(const XHatchTable* pTable = 0) const;
+    const XHatch&           GetValue() const;
     void                    SetValue(const XHatch& rNew)  { aHatch = rNew; Detach(); }
 
     static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/binfilter/inc/bf_svx/xit.hxx b/binfilter/inc/bf_svx/xit.hxx
index d93f1b9..5563ad1 100644
--- a/binfilter/inc/bf_svx/xit.hxx
+++ b/binfilter/inc/bf_svx/xit.hxx
@@ -45,7 +45,6 @@ extern String aNameOrIndexEmptyString;
 class XColorTable;
 class XDashTable;
 class XLineEndTable;
-class XHatchTable;
 class NameOrIndex;
 class XPropertyList;
 
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index e7a3ba2..d0056dd 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -433,28 +433,6 @@ public:
     virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
 };
 
-// --------------------
-// class XHatchTable
-// --------------------
-
-class XHatchTable : public XPropertyTable
-{
-                    XHatchTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
-public:
-    virtual         ~XHatchTable();
-
-    XHatchEntry*    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 XHatchList
 // -------------------