summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorAlexandre Vicenzi <vicenzi.alexandre@gmail.com>2014-01-29 20:46:48 -0200
committerCaolán McNamara <caolanm@redhat.com>2014-01-30 11:16:27 +0000
commitc5685ec791fbce43e982ffecc9e062063ec7e3d7 (patch)
tree7bb2ab8682f584488f696b68b0ab88b496dc56ea /sfx2
parent923a3ba49ab5e578778ffba08ae337993dd76ab4 (diff)
fdo#63154 Removed unused solar.h ref. in linguc., sfx2, starmath, svl and svx
Change-Id: I241661119371b75804fcf9215ff5e5da2a5b9265 Reviewed-on: https://gerrit.libreoffice.org/7732 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/bitset.hxx49
-rw-r--r--sfx2/source/inc/slotserv.hxx11
2 files changed, 1 insertions, 59 deletions
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 6fb04245e904..071151351f3d 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_INC_BITSET_HXX
#define INCLUDED_SFX2_INC_BITSET_HXX
-#include <tools/solar.h>
-
class BitSet
{
private:
@@ -64,174 +62,129 @@ public:
sal_Bool operator!=( sal_uInt16 nBit ) const;
};
-//--------------------------------------------------------------------
// returns sal_True if the set is empty
-
-
-
inline sal_Bool BitSet::operator!() const
{
return nCount == 0;
}
-//--------------------------------------------------------------------
// returns the number of bits in the bitset
-
inline sal_uInt16 BitSet::Count() const
{
return nCount;
}
-//--------------------------------------------------------------------
// 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
-//--------------------------------------------------------------------
// determines if the other bitset is a real superset
-
inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
{
return sal_False;
}
-//--------------------------------------------------------------------
// determines if the other bitset is a superset or equal
-
inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
{
return sal_False;
}
-//--------------------------------------------------------------------
// determines if the other bitset is a real subset
-
inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const
{
return sal_False;
}
-//--------------------------------------------------------------------
-
// determines if the other bitset is a subset or equal
-
inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const
{
return sal_False;
}
-//--------------------------------------------------------------------
// determines if the bit is the only one in the bitset
-
inline sal_Bool BitSet::operator==( sal_uInt16 ) const
{
return sal_False;
}
-//--------------------------------------------------------------------
// determines if the bitsets aren't equal
-
inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const
{
return !( *this == rSet );
}
-//--------------------------------------------------------------------
// determines if the bitset doesn't contain only this bit
-
inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const
{
return !( *this == nBit );
}
-//--------------------------------------------------------------------
class IndexBitSet : BitSet
{
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index 0d259ef26fb5..c98a9c4ece4e 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
#define INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
-#include <tools/solar.h>
-
class SfxSlot;
class SfxSlotServer
@@ -42,37 +40,28 @@ public:
void Invalidate() { _pSlot = 0; }
};
-//--------------------------------------------------------------------
-
inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ):
_pSlot( &rSlot),
_nShellLevel( nShell )
{
}
-//--------------------------------------------------------------------
-
inline SfxSlotServer::SfxSlotServer():
_pSlot(0),
_nShellLevel(0)
{
}
-//--------------------------------------------------------------------
-
inline sal_uInt16 SfxSlotServer::GetShellLevel() const
{
return _nShellLevel;
}
-//--------------------------------------------------------------------
-
inline const SfxSlot* SfxSlotServer::GetSlot() const
{
return _pSlot;
}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */