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

[Joseph Powers]

 binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx |   18 +++----
 binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx |   59 -----------------------
 binfilter/inc/bf_svx/svdmodel.hxx                |    1 
 binfilter/inc/bf_svx/xattr.hxx                   |    1 
 binfilter/inc/bf_svx/xbtmpit.hxx                 |    2 
 binfilter/inc/bf_svx/xit.hxx                     |    1 
 binfilter/inc/bf_svx/xtable.hxx                  |   24 ---------
 7 files changed, 11 insertions(+), 95 deletions(-)

New commits:
commit eba1eb72670e86c2d54d47eb142f144644f62480
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Wed Aug 24 14:12:42 2011 -0700

    Remove XBitmapTable from binfilter also

diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
index 4d74fea..728eb79 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx
@@ -498,17 +498,19 @@ namespace binfilter {
 
 /*************************************************************************
 |*
-|*    const Bitmap& XFillBitmapItem::GetValue(const XBitmapTable* pTable) const
+|*    const Bitmap& XFillBitmapItem::GetValue() const
 |*
 *************************************************************************/
 
-/*N*/ const XOBitmap& XFillBitmapItem::GetValue(const XBitmapTable* pTable) const
-/*N*/ {
-/*N*/   if (!IsIndex())
-/*N*/       return aXOBitmap;
-/*N*/   else
-/*?*/       return pTable->Get(GetIndex())->GetXBitmap();
-/*N*/ }
+const XOBitmap& XFillBitmapItem::GetValue(
+//    const XBitmapTable* pTable
+) const
+{
+//    if (!IsIndex())
+        return aXOBitmap;
+//    else
+//        return pTable->Get(GetIndex())->GetXBitmap();
+}
 
 
 /*************************************************************************
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
index 84eed00..83e1025 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
@@ -57,65 +57,6 @@ static char const aChckBitmap0[] = { 0x04, 0x00, 'S','O','B','0'};  // old
 static char const aChckBitmap1[] = { 0x04, 0x00, 'S','O','B','1'};  // = 5.2
 static char const aChckXML[]     = { 'P', 'K', 0x03, 0x04 };        // = 6.0
 
-// -------------------
-// class XBitmapTable
-// -------------------
-
-/************************************************************************/
-
-/*N*/ XBitmapTable::~XBitmapTable()
-/*N*/ {
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XBitmapEntry* XBitmapTable::Replace(long nIndex, XBitmapEntry* pEntry )
-/*N*/ {
-/*N*/   return (XBitmapEntry*) XPropertyTable::Replace(nIndex, pEntry);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XBitmapEntry* XBitmapTable::Remove(long nIndex)
-/*N*/ {
-/*N*/   return (XBitmapEntry*) XPropertyTable::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XBitmapEntry* XBitmapTable::Get(long nIndex) const
-/*N*/ {
-/*N*/   return (XBitmapEntry*) XPropertyTable::Get(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XBitmapTable::Load()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XBitmapTable::Create()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ BOOL XBitmapTable::CreateBitmapsForUI()
-/*N*/ {
-/*N*/   return( FALSE );
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/ )
-/*N*/ {
-/*N*/   return( NULL );
-/*N*/ }
-
 // ------------------
 // class XBitmapList
 // ------------------
diff --git a/binfilter/inc/bf_svx/svdmodel.hxx b/binfilter/inc/bf_svx/svdmodel.hxx
index 1942da2..8ed128a 100644
--- a/binfilter/inc/bf_svx/svdmodel.hxx
+++ b/binfilter/inc/bf_svx/svdmodel.hxx
@@ -93,7 +93,6 @@ class SdrUndoAction;
 class SdrUndoGroup;
 class SvxLinkManager;
 class XBitmapList;
-class XBitmapTable;
 class XColorTable;
 class XDashList;
 class XDashTable;
diff --git a/binfilter/inc/bf_svx/xattr.hxx b/binfilter/inc/bf_svx/xattr.hxx
index 40a91da..80c17ef 100644
--- a/binfilter/inc/bf_svx/xattr.hxx
+++ b/binfilter/inc/bf_svx/xattr.hxx
@@ -35,7 +35,6 @@ class XColorTable;
 class XDashTable;
 class XLineEndTable;
 class XHatchTable;
-class XBitmapTable;
 }//end of namespace binfilter
 
 #include <bf_svx/xit.hxx>
diff --git a/binfilter/inc/bf_svx/xbtmpit.hxx b/binfilter/inc/bf_svx/xbtmpit.hxx
index 3533095..2129768 100644
--- a/binfilter/inc/bf_svx/xbtmpit.hxx
+++ b/binfilter/inc/bf_svx/xbtmpit.hxx
@@ -61,7 +61,7 @@ public:
     virtual bool            PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
 
-    const XOBitmap& GetValue( const XBitmapTable* pTable = 0 ) const;
+    const XOBitmap& GetValue() const;
     void           SetValue( const XOBitmap& rNew )  { aXOBitmap = 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 e196f56..d93f1b9 100644
--- a/binfilter/inc/bf_svx/xit.hxx
+++ b/binfilter/inc/bf_svx/xit.hxx
@@ -46,7 +46,6 @@ class XColorTable;
 class XDashTable;
 class XLineEndTable;
 class XHatchTable;
-class XBitmapTable;
 class NameOrIndex;
 class XPropertyList;
 
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 4c4bd9a..e7a3ba2 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -517,30 +517,6 @@ public:
     virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
 };
 
-// ---------------------
-// class XBitmapTable
-// ---------------------
-
-class XBitmapTable : public XPropertyTable
-{
-                    XBitmapTable( const String& rPath,
-                                    XOutdevItemPool* pXPool = NULL,
-                                    USHORT nInitSize = 16,
-                                    USHORT nReSize = 16 );
-public:
-    virtual         ~XBitmapTable();
-
-    XBitmapEntry*   Replace(long nIndex, XBitmapEntry* pEntry );
-    XBitmapEntry*   Remove(long nIndex);
-    XBitmapEntry*   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 XBitmapList
 // -------------------