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

[Joseph Powers]

 binfilter/bf_svx/source/xoutdev/svx_xattr.cxx    |   19 +++++----
 binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx |   45 -----------------------
 binfilter/inc/bf_svx/svdmodel.hxx                |    1 
 binfilter/inc/bf_svx/xattr.hxx                   |    1 
 binfilter/inc/bf_svx/xflgrit.hxx                 |    2 -
 binfilter/inc/bf_svx/xit.hxx                     |    1 
 binfilter/inc/bf_svx/xtable.hxx                  |   22 -----------
 7 files changed, 11 insertions(+), 80 deletions(-)

New commits:
commit 0382e53e7dd5647045620f6e3dbae8793db9a7af
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Wed Aug 24 07:18:03 2011 -0700

    Remove class XGradient from binfillter also...

diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 80cea04..9632c34 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -2367,18 +2367,19 @@ XubString aNameOrIndexEmptyString;
 
 /*************************************************************************
 |*
-|*    const XGradient& XFillGradientItem::GetValue(const XGradientTable* pTable)
-|*                                                                 const
+|*    const XGradient& XFillGradientItem::GetValue() const
 |*
 *************************************************************************/
 
-/*N*/ const XGradient& XFillGradientItem::GetValue(const XGradientTable* pTable) const
-/*N*/ {
-/*N*/   if (!IsIndex())
-/*N*/       return aGradient;
-/*N*/   else
-/*?*/       return pTable->Get(GetIndex())->GetGradient();
-/*N*/ }
+const XGradient& XFillGradientItem::GetValue(
+//    const XGradientTable* pTable
+) const
+{
+//    if (!IsIndex())
+        return aGradient;
+//    else
+//        return pTable->Get(GetIndex())->GetGradient();
+}
 
 
 /*************************************************************************
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
index f9d09e8..dd0994e 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
@@ -65,51 +65,6 @@ char const aChckGradient[]  = { 0x04, 0x00, 'S','O','G','L'};   // < 5.2
 char const aChckGradient0[] = { 0x04, 0x00, 'S','O','G','0'};   // = 5.2
 char const aChckXML[]       = { '<', '?', 'x', 'm', 'l' };      // = 6.0
 
-// ---------------------
-// class XGradientTable
-// ---------------------
-
-/************************************************************************/
-
-/*N*/ XGradientTable::~XGradientTable()
-/*N*/ {
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XGradientEntry* XGradientTable::Get(long nIndex) const
-/*N*/ {
-/*N*/   return (XGradientEntry*) XPropertyTable::Get(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XGradientTable::Load()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XGradientTable::Create()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XGradientTable::CreateBitmapsForUI()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
-/*N*/ {
-/*N*/   return( NULL );
-/*N*/ }
-
 // --------------------
 // class XGradientList
 // --------------------
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 9c4f21a..1942da2 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -98,7 +98,6 @@ class XColorTable;
 class XDashList;
 class XDashTable;
 class XGradientList;
-class XGradientTable;
 class XHatchList;
 class XHatchTable;
 class XLineEndList;
diff --git a/binfilter/inc/bf_svx/xattr.hxx b/binfilter/inc/bf_svx/xattr.hxx
index dd86d56..40a91da 100644
--- a/binfilter/inc/bf_svx/xattr.hxx
+++ b/binfilter/inc/bf_svx/xattr.hxx
@@ -36,7 +36,6 @@ class XDashTable;
 class XLineEndTable;
 class XHatchTable;
 class XBitmapTable;
-class XGradientTable;
 }//end of namespace binfilter
 
 #include <bf_svx/xit.hxx>
diff --git a/binfilter/inc/bf_svx/xflgrit.hxx b/binfilter/inc/bf_svx/xflgrit.hxx
index 3d3316d..107db46 100644
--- a/binfilter/inc/bf_svx/xflgrit.hxx
+++ b/binfilter/inc/bf_svx/xflgrit.hxx
@@ -62,7 +62,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 XGradient&        GetValue(const XGradientTable* pTable = 0) const;
+    const XGradient&        GetValue() const;
     void                    SetValue(const XGradient& rNew) { aGradient = 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 b9207a6..e196f56 100644
--- a/binfilter/inc/bf_svx/xit.hxx
+++ b/binfilter/inc/bf_svx/xit.hxx
@@ -47,7 +47,6 @@ class XDashTable;
 class XLineEndTable;
 class XHatchTable;
 class XBitmapTable;
-class XGradientTable;
 class NameOrIndex;
 class XPropertyList;
 
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 48c047d..4c4bd9a 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -486,28 +486,6 @@ public:
     virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
 };
 
-// ---------------------
-// class XGradientTable
-// ---------------------
-
-class XGradientTable : public XPropertyTable
-{
-                    XGradientTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
-public:
-    virtual         ~XGradientTable();
-
-    XGradientEntry* 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 XGradientList
 // -------------------