mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#63154 Removed unused solar.h ref. in linguc., sfx2, starmath, svl and svx

Browse Source 
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>
This commit is contained in:
Alexandre Vicenzi
2014-01-29 20:46:48 -02:00
committed by Caolán McNamara
parent 923a3ba49a
commit c5685ec791
10 changed files with 1 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lingucomponent/source/thesaurus/libnth/nthesdta.hxx
View File

@@ -22,9 +22,6 @@
#include <com/sun/star/linguistic2/XMeaning.hpp> #include <com/sun/star/linguistic2/XMeaning.hpp>
#include <tools/solar.h>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>

49
sfx2/inc/bitset.hxx
View File

@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_INC_BITSET_HXX #ifndef INCLUDED_SFX2_INC_BITSET_HXX
#define INCLUDED_SFX2_INC_BITSET_HXX #define INCLUDED_SFX2_INC_BITSET_HXX
#include <tools/solar.h>
class BitSet class BitSet
{ {
private: private:
@@ -64,174 +62,129 @@ public:
sal_Bool operator!=( sal_uInt16 nBit ) const; sal_Bool operator!=( sal_uInt16 nBit ) const;
}; };
//--------------------------------------------------------------------
// returns sal_True if the set is empty // returns sal_True if the set is empty
inline sal_Bool BitSet::operator!() const inline sal_Bool BitSet::operator!() const
{ {
return nCount == 0; return nCount == 0;
} }
//--------------------------------------------------------------------
// returns the number of bits in the bitset // returns the number of bits in the bitset
inline sal_uInt16 BitSet::Count() const inline sal_uInt16 BitSet::Count() const
{ {
return nCount; return nCount;
} }
//--------------------------------------------------------------------
// creates the union of two bitset // creates the union of two bitset
inline BitSet BitSet::operator|( const BitSet& rSet ) const inline BitSet BitSet::operator|( const BitSet& rSet ) const
{ {
return BitSet(*this) |= rSet; return BitSet(*this) |= rSet;
} }
//--------------------------------------------------------------------
// creates the union of a bitset with a single bit // creates the union of a bitset with a single bit
inline BitSet BitSet::operator|( sal_uInt16 nBit ) const inline BitSet BitSet::operator|( sal_uInt16 nBit ) const
{ {
return BitSet(*this) |= nBit; return BitSet(*this) |= nBit;
} }
//--------------------------------------------------------------------
// creates the asymetric difference // creates the asymetric difference
inline BitSet BitSet::operator-( const BitSet& ) const inline BitSet BitSet::operator-( const BitSet& ) const
{ {
return BitSet(); return BitSet();
} }
//--------------------------------------------------------------------
// creates the asymetric difference with a single bit // creates the asymetric difference with a single bit
inline BitSet BitSet::operator-( sal_uInt16 ) const inline BitSet BitSet::operator-( sal_uInt16 ) const
{ {
return BitSet(); return BitSet();
} }
//--------------------------------------------------------------------
// removes the bits contained in rSet // removes the bits contained in rSet
inline BitSet& BitSet::operator-=( const BitSet& ) inline BitSet& BitSet::operator-=( const BitSet& )
{ {
return *this; return *this;
} }
//--------------------------------------------------------------------
// creates the intersection with another bitset // creates the intersection with another bitset
inline BitSet BitSet::operator&( const BitSet& ) const inline BitSet BitSet::operator&( const BitSet& ) const
{ {
return BitSet(); return BitSet();
} }
//--------------------------------------------------------------------
// intersects with another bitset // intersects with another bitset
inline BitSet& BitSet::operator&=( const BitSet& ) inline BitSet& BitSet::operator&=( const BitSet& )
{ {
return *this; return *this;
} }
//--------------------------------------------------------------------
// creates the symetric difference with another bitset // creates the symetric difference with another bitset
inline BitSet BitSet::operator^( const BitSet& ) const inline BitSet BitSet::operator^( const BitSet& ) const
{ {
return BitSet(); return BitSet();
} }
//--------------------------------------------------------------------
// creates the symetric difference with a single bit // creates the symetric difference with a single bit
inline BitSet BitSet::operator^( sal_uInt16 ) const inline BitSet BitSet::operator^( sal_uInt16 ) const
{ {
return BitSet(); return BitSet();
} }
//--------------------------------------------------------------------
// builds the symetric difference with another bitset // builds the symetric difference with another bitset
inline BitSet& BitSet::operator^=( const BitSet& ) inline BitSet& BitSet::operator^=( const BitSet& )
{ {
return *this; return *this;
} }
//--------------------------------------------------------------------
#ifdef BITSET_READY #ifdef BITSET_READY
// builds the symetric difference with a single bit // builds the symetric difference with a single bit
inline BitSet& BitSet::operator^=( sal_uInt16 ) inline BitSet& BitSet::operator^=( sal_uInt16 )
{ {
// crash!!! // crash!!!
return BitSet(); return BitSet();
} }
#endif #endif
//--------------------------------------------------------------------
// determines if the other bitset is a real superset // determines if the other bitset is a real superset
inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
{ {
return sal_False; return sal_False;
} }
//--------------------------------------------------------------------
// determines if the other bitset is a superset or equal // determines if the other bitset is a superset or equal
inline sal_Bool BitSet::IsSubSet( const BitSet& ) const inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
{ {
return sal_False; return sal_False;
} }
//--------------------------------------------------------------------
// determines if the other bitset is a real subset // determines if the other bitset is a real subset
inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const
{ {
return sal_False; return sal_False;
} }
//--------------------------------------------------------------------
// determines if the other bitset is a subset or equal // determines if the other bitset is a subset or equal
inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const
{ {
return sal_False; return sal_False;
} }
//--------------------------------------------------------------------
// determines if the bit is the only one in the bitset // determines if the bit is the only one in the bitset
inline sal_Bool BitSet::operator==( sal_uInt16 ) const inline sal_Bool BitSet::operator==( sal_uInt16 ) const
{ {
return sal_False; return sal_False;
} }
//--------------------------------------------------------------------
// determines if the bitsets aren't equal // determines if the bitsets aren't equal
inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const
{ {
return !( *this == rSet ); return !( *this == rSet );
} }
//--------------------------------------------------------------------
// determines if the bitset doesn't contain only this bit // determines if the bitset doesn't contain only this bit
inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const
{ {
return !( *this == nBit ); return !( *this == nBit );
} }
//--------------------------------------------------------------------
class IndexBitSet : BitSet class IndexBitSet : BitSet
{ {

11
sfx2/source/inc/slotserv.hxx
View File

@@ -19,8 +19,6 @@
#ifndef INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX #ifndef INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
#define INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX #define INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
#include <tools/solar.h>
class SfxSlot; class SfxSlot;
class SfxSlotServer class SfxSlotServer
@@ -42,37 +40,28 @@ public:
void Invalidate() { _pSlot = 0; } void Invalidate() { _pSlot = 0; }
}; };
//--------------------------------------------------------------------
inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ): inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ):
_pSlot( &rSlot), _pSlot( &rSlot),
_nShellLevel( nShell ) _nShellLevel( nShell )
{ {
} }
//--------------------------------------------------------------------
inline SfxSlotServer::SfxSlotServer(): inline SfxSlotServer::SfxSlotServer():
_pSlot(0), _pSlot(0),
_nShellLevel(0) _nShellLevel(0)
{ {
} }
//--------------------------------------------------------------------
inline sal_uInt16 SfxSlotServer::GetShellLevel() const inline sal_uInt16 SfxSlotServer::GetShellLevel() const
{ {
return _nShellLevel; return _nShellLevel;
} }
//--------------------------------------------------------------------
inline const SfxSlot* SfxSlotServer::GetSlot() const inline const SfxSlot* SfxSlotServer::GetSlot() const
{ {
return _pSlot; return _pSlot;
} }
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
starmath/source/cfgitem.hxx
View File

@@ -31,7 +31,6 @@
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.h>
#include <tools/solar.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <unotools/configitem.hxx> #include <unotools/configitem.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
@@ -44,9 +43,6 @@ class SmFormat;
class Font; class Font;
struct SmCfgOther; struct SmCfgOther;
/////////////////////////////////////////////////////////////////
struct SmFontFormat struct SmFontFormat
{ {
OUString aName; OUString aName;
@@ -63,7 +59,6 @@ struct SmFontFormat
bool operator == ( const SmFontFormat &rFntFmt ) const; bool operator == ( const SmFontFormat &rFntFmt ) const;
}; };
struct SmFntFmtListEntry struct SmFntFmtListEntry
{ {
OUString aId; OUString aId;
@@ -100,9 +95,6 @@ public:
void SetModified( bool bVal ) { bModified = bVal; } void SetModified( bool bVal ) { bModified = bVal; }
}; };
/////////////////////////////////////////////////////////////////
class SmMathConfig : public utl::ConfigItem class SmMathConfig : public utl::ConfigItem
{ {
SmFormat * pFormat; SmFormat * pFormat;
@@ -189,8 +181,6 @@ public:
void SetAutoRedraw( sal_Bool bVal ); void SetAutoRedraw( sal_Bool bVal );
}; };
/////////////////////////////////////////////////////////////////
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
svl/qa/unit/test_URIHelper.cxx
View File

@@ -54,7 +54,6 @@
#include "sal/macros.h" #include "sal/macros.h"
#include "sal/types.h" #include "sal/types.h"
#include "svl/urihelper.hxx" #include "svl/urihelper.hxx"
#include "tools/solar.h"
#include "unotools/charclass.hxx" #include "unotools/charclass.hxx"
namespace com { namespace sun { namespace star { namespace ucb { namespace com { namespace sun { namespace star { namespace ucb {

1
svx/inc/pch/precompiled_svx.hxx
View File

@@ -409,7 +409,6 @@
#include <tools/resary.hxx> #include <tools/resary.hxx>
#include <tools/resid.hxx> #include <tools/resid.hxx>
#include <tools/shl.hxx> #include <tools/shl.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <unicode/uchar.h> #include <unicode/uchar.h>

1
svx/source/accessibility/AccessibleTextEventQueue.hxx
View File

@@ -23,7 +23,6 @@
#include <memory> #include <memory>
#include <list> #include <list>
#include <algorithm> #include <algorithm>
#include <tools/solar.h>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
class SfxHint; class SfxHint;

1
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
View File

@@ -18,7 +18,6 @@
*/ */
#include "EnhancedCustomShapeFontWork.hxx" #include "EnhancedCustomShapeFontWork.hxx"
#include <tools/solar.h>
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/svdogrp.hxx> #include <svx/svdogrp.hxx>
#include <svx/svdopath.hxx> #include <svx/svdopath.hxx>

11
svx/source/inc/fmslotinvalidator.hxx
View File

@@ -20,18 +20,10 @@
#ifndef INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX #ifndef INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
#define INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX #define INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
#include <tools/solar.h>
//........................................................................
namespace svx namespace svx
{ {
//........................................................................
typedef sal_uInt16 SfxSlotId; typedef sal_uInt16 SfxSlotId;
//====================================================================
//= ISlotInvalidator
//====================================================================
class ISlotInvalidator class ISlotInvalidator
{ {
public: public:
@@ -40,10 +32,7 @@ namespace svx
protected: protected:
~ISlotInvalidator() {} ~ISlotInvalidator() {}
}; };
//........................................................................
} // namespace svx } // namespace svx
//........................................................................
#endif // INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX #endif // INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX

11
svx/source/inc/formtoolbars.hxx
View File

@@ -22,19 +22,10 @@
#include "fmdocumentclassification.hxx" #include "fmdocumentclassification.hxx"
#include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XLayoutManager.hpp>
#include <tools/solar.h>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
//........................................................................
namespace svxform namespace svxform
{ {
//........................................................................
//====================================================================
//= FormToolboxes
//====================================================================
class FormToolboxes class FormToolboxes
{ {
private: private:
@@ -74,9 +65,7 @@ namespace svxform
} }
}; };
//........................................................................
} // namespace svxform } // namespace svxform
//........................................................................
#endif // INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX #endif // INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX