From c5685ec791fbce43e982ffecc9e062063ec7e3d7 Mon Sep 17 00:00:00 2001 From: Alexandre Vicenzi Date: Wed, 29 Jan 2014 20:46:48 -0200 Subject: fdo#63154 Removed unused solar.h ref. in linguc., sfx2, starmath, svl and svx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I241661119371b75804fcf9215ff5e5da2a5b9265 Reviewed-on: https://gerrit.libreoffice.org/7732 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- .../source/thesaurus/libnth/nthesdta.hxx | 3 -- sfx2/inc/bitset.hxx | 49 +--------------------- sfx2/source/inc/slotserv.hxx | 11 ----- starmath/source/cfgitem.hxx | 10 ----- svl/qa/unit/test_URIHelper.cxx | 1 - svx/inc/pch/precompiled_svx.hxx | 1 - .../accessibility/AccessibleTextEventQueue.hxx | 1 - .../customshapes/EnhancedCustomShapeFontWork.cxx | 1 - svx/source/inc/fmslotinvalidator.hxx | 11 ----- svx/source/inc/formtoolbars.hxx | 11 ----- 10 files changed, 1 insertion(+), 98 deletions(-) diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx index dce8c473dc47..7e098419e676 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx +++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx @@ -22,9 +22,6 @@ #include - -#include - #include 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 - 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 - 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: */ diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index ac95c2188335..06d143ae98e3 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -31,7 +31,6 @@ #include #include -#include #include #include #include @@ -44,9 +43,6 @@ class SmFormat; class Font; struct SmCfgOther; -///////////////////////////////////////////////////////////////// - - struct SmFontFormat { OUString aName; @@ -63,7 +59,6 @@ struct SmFontFormat bool operator == ( const SmFontFormat &rFntFmt ) const; }; - struct SmFntFmtListEntry { OUString aId; @@ -100,9 +95,6 @@ public: void SetModified( bool bVal ) { bModified = bVal; } }; - -///////////////////////////////////////////////////////////////// - class SmMathConfig : public utl::ConfigItem { SmFormat * pFormat; @@ -189,8 +181,6 @@ public: void SetAutoRedraw( sal_Bool bVal ); }; -///////////////////////////////////////////////////////////////// - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 313ce6538c96..2c672709137d 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -54,7 +54,6 @@ #include "sal/macros.h" #include "sal/types.h" #include "svl/urihelper.hxx" -#include "tools/solar.h" #include "unotools/charclass.hxx" namespace com { namespace sun { namespace star { namespace ucb { diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index ba48f6c1e45a..647b55fff5a5 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -409,7 +409,6 @@ #include #include #include -#include #include #include #include diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx index ea0e4dbdc9f5..74cf7e09d06f 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.hxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include class SfxHint; diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 07e7b6447cbd..112c544a0970 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -18,7 +18,6 @@ */ #include "EnhancedCustomShapeFontWork.hxx" -#include #include #include #include diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index bceead451450..62bbdbff5154 100644 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -20,18 +20,10 @@ #ifndef INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX #define INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX -#include - -//........................................................................ namespace svx { -//........................................................................ - typedef sal_uInt16 SfxSlotId; - //==================================================================== - //= ISlotInvalidator - //==================================================================== class ISlotInvalidator { public: @@ -40,10 +32,7 @@ namespace svx protected: ~ISlotInvalidator() {} }; - -//........................................................................ } // namespace svx -//........................................................................ #endif // INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 379a6688354c..0e1111f0f563 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -22,19 +22,10 @@ #include "fmdocumentclassification.hxx" #include - -#include - #include -//........................................................................ namespace svxform { -//........................................................................ - - //==================================================================== - //= FormToolboxes - //==================================================================== class FormToolboxes { private: @@ -74,9 +65,7 @@ namespace svxform } }; -//........................................................................ } // namespace svxform -//........................................................................ #endif // INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX -- cgit v1.2.3