Merge BitSet into IndexBitSet (and remove unused parts)

Change-Id: I8cab0aac2f67b88936e4bed459dd43b08429b136

1 files changed, 11 insertions, 115 deletions

diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 67651e1a15bc..d3f3b281ca1f 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -19,131 +19,27 @@
 #ifndef INCLUDED_SFX2_INC_BITSET_HXX
 #define INCLUDED_SFX2_INC_BITSET_HXX
 
-class BitSet
+class IndexBitSet
 {
 private:
-    void CopyFrom( const BitSet& rSet );
     sal_uInt16 nBlocks;
     sal_uInt16 nCount;
     sal_uInt32* pBitmap;
-public:
-    BitSet operator<<( sal_uInt16 nOffset ) const;
-    BitSet operator>>( sal_uInt16 nOffset ) const;
-    static sal_uInt16 CountBits(sal_uInt32 nBits);
-    bool operator!() const;
-    BitSet();
-    BitSet( const BitSet& rOrig );
-    ~BitSet();
-    BitSet& operator=( const BitSet& rOrig );
-    BitSet& operator=( sal_uInt16 nBit );
-    BitSet operator|( const BitSet& rSet ) const;
-    BitSet operator|( sal_uInt16 nBit ) const;
-    BitSet& operator|=( const BitSet& rSet );
-    BitSet& operator|=( sal_uInt16 nBit );
-    BitSet operator-( const BitSet& rSet ) const;
-    BitSet operator-( sal_uInt16 nId ) const;
-    BitSet& operator-=( const BitSet& rSet );
-    BitSet& operator-=( sal_uInt16 nBit );
-    BitSet operator&( const BitSet& rSet ) const;
-    BitSet& operator&=( const BitSet& rSet );
-    BitSet operator^( const BitSet& rSet ) const;
-    BitSet operator^( sal_uInt16 nBit ) const;
-    BitSet& operator^=( const BitSet& rSet );
-    BitSet& operator^=( sal_uInt16 nBit );
-    bool Contains( sal_uInt16 nBit ) const;
-    bool operator==( const BitSet& rSet ) const;
-    bool operator!=( const BitSet& rSet ) const;
 
-};
-
-// returns sal_True if the set is empty
-inline bool BitSet::operator!() const
-{
-    return nCount == 0;
-}
-
-// creates the union of two bitset
-inline BitSet BitSet::operator|( const BitSet& rSet ) const
-{
-    return BitSet(*this) |= rSet;
-}
-
-// creates the union of a bitset with a single bit
-inline BitSet BitSet::operator|( sal_uInt16 nBit ) const
-{
-    return BitSet(*this) |= nBit;
-}
-
-// creates the asymetric difference
-inline BitSet BitSet::operator-( const BitSet& ) const
-{
-    return BitSet();
-}
-
-// creates the asymetric difference with a single bit
-inline BitSet BitSet::operator-( sal_uInt16 ) const
-{
-    return BitSet();
-}
-
-// removes the bits contained in rSet
-inline BitSet& BitSet::operator-=( const BitSet& )
-{
-    return *this;
-}
-
-// creates the intersection with another bitset
-inline BitSet BitSet::operator&( const BitSet& ) const
-{
-    return BitSet();
-}
-
-// intersects with another bitset
-inline BitSet& BitSet::operator&=( const BitSet& )
-{
-    return *this;
-}
-
-// creates the symetric difference with another bitset
-inline BitSet BitSet::operator^( const BitSet& ) const
-{
-    return BitSet();
-}
-
-// creates the symetric difference with a single bit
-inline BitSet BitSet::operator^( sal_uInt16 ) const
-{
-    return BitSet();
-}
-
-// builds the symetric difference with another bitset
-inline BitSet& BitSet::operator^=( const BitSet& )
-{
-    return *this;
-}
-
-#ifdef BITSET_READY
-// builds the symetric difference with a single bit
-inline BitSet& BitSet::operator^=( sal_uInt16 )
-{
-    // crash!!!
-    return BitSet();
-}
-#endif
+    IndexBitSet& operator|=( sal_uInt16 nBit );
+    IndexBitSet& operator-=( sal_uInt16 nBit );
+    bool Contains( sal_uInt16 nBit ) const;
 
-// determines if the bitsets aren't equal
-inline bool BitSet::operator!=( const BitSet& rSet ) const
-{
-    return !( *this == rSet );
-}
+    IndexBitSet(IndexBitSet &) = delete;
+    void operator =(IndexBitSet) = delete;
 
-class IndexBitSet : private BitSet
-{
 public:
-  sal_uInt16 GetFreeIndex();
-  void ReleaseIndex(sal_uInt16 i){*this-=i;}
-};
+    IndexBitSet();
+    ~IndexBitSet();
 
+    sal_uInt16 GetFreeIndex();
+    void ReleaseIndex(sal_uInt16 i){*this-=i;}
+};
 
 #endif