Kaydet (Commit) 4e8736ed authored tarafından Alexandre Vicenzi's avatar Alexandre Vicenzi Kaydeden (comit) Caolán McNamara

fdo#63154 Removed unused solar.h ref. in svl

Change-Id: I0452b1fa83c52a7466a025259b086e82ec1dba83
Reviewed-on: https://gerrit.libreoffice.org/7734Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 17394c18
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define INCLUDED_SVL_CONVERTER_HXX #define INCLUDED_SVL_CONVERTER_HXX
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <tools/solar.h>
class SvDbaseConverter class SvDbaseConverter
{ {
......
...@@ -19,15 +19,12 @@ ...@@ -19,15 +19,12 @@
#ifndef INCLUDED_SVL_FLAGITEM_HXX #ifndef INCLUDED_SVL_FLAGITEM_HXX
#define INCLUDED_SVL_FLAGITEM_HXX #define INCLUDED_SVL_FLAGITEM_HXX
#include <svl/poolitem.hxx>
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <tools/solar.h>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
class SvStream; class SvStream;
// -----------------------------------------------------------------------
DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC) DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
......
...@@ -20,9 +20,8 @@ ...@@ -20,9 +20,8 @@
#ifndef INCLUDED_SVL_FSTATHELPER_HXX #ifndef INCLUDED_SVL_FSTATHELPER_HXX
#define INCLUDED_SVL_FSTATHELPER_HXX #define INCLUDED_SVL_FSTATHELPER_HXX
#include <svl/svldllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/solar.h> #include <svl/svldllapi.h>
class Date; class Date;
class Time; class Time;
......
...@@ -20,13 +20,10 @@ ...@@ -20,13 +20,10 @@
#define INCLUDED_SVL_GLOBALNAMEITEM_HXX #define INCLUDED_SVL_GLOBALNAMEITEM_HXX
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <tools/solar.h>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
#include <tools/globname.hxx> #include <tools/globname.hxx>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
// -----------------------------------------------------------------------
class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem
{ {
SvGlobalName m_aName; SvGlobalName m_aName;
......
...@@ -19,17 +19,11 @@ ...@@ -19,17 +19,11 @@
#ifndef INCLUDED_SVL_INETHIST_HXX #ifndef INCLUDED_SVL_INETHIST_HXX
#define INCLUDED_SVL_INETHIST_HXX #define INCLUDED_SVL_INETHIST_HXX
#include <svl/svldllapi.h>
#include <tools/solar.h>
#include <tools/urlobj.hxx>
#include <svl/brdcst.hxx> #include <svl/brdcst.hxx>
#include <svl/hint.hxx> #include <svl/hint.hxx>
#include <svl/svldllapi.h>
#include <tools/urlobj.hxx>
/*========================================================================
*
* INetURLHistory interface.
*
*=======================================================================*/
class INetURLHistory_Impl; class INetURLHistory_Impl;
class INetURLHistory : public SfxBroadcaster class INetURLHistory : public SfxBroadcaster
{ {
...@@ -112,11 +106,7 @@ public: ...@@ -112,11 +106,7 @@ public:
} }
}; };
/*======================================================================== // broadcasted from PutUrl().
*
* INetURLHistoryHint (broadcasted from PutUrl()).
*
*=======================================================================*/
DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject); DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject);
#endif // INCLUDED_SVL_INETHIST_HXX #endif // INCLUDED_SVL_INETHIST_HXX
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define INCLUDED_SVL_ITEMITER_HXX #define INCLUDED_SVL_ITEMITER_HXX
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <tools/solar.h>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
class SfxPoolItem; class SfxPoolItem;
......
...@@ -19,13 +19,12 @@ ...@@ -19,13 +19,12 @@
#ifndef INCLUDED_SVL_ITEMPROP_HXX #ifndef INCLUDED_SVL_ITEMPROP_HXX
#define INCLUDED_SVL_ITEMPROP_HXX #define INCLUDED_SVL_ITEMPROP_HXX
#include <svl/svldllapi.h>
#include <tools/solar.h>
#include <svl/itemset.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <cppuhelper/implbase1.hxx>
#include <svl/itemset.hxx>
#include <svl/svldllapi.h>
#include <vector> #include <vector>
struct SfxItemPropertyMapEntry struct SfxItemPropertyMapEntry
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <cstdarg> #include <cstdarg>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
#include <tools/solar.h>
class SfxItemPool; class SfxItemPool;
class SfxPoolItem; class SfxPoolItem;
...@@ -39,14 +38,10 @@ typedef SfxPoolItem const** SfxItemArray; ...@@ -39,14 +38,10 @@ typedef SfxPoolItem const** SfxItemArray;
#endif #endif
#define DBG(s) #define DBG(s)
//========================================================================
#define SFX_ITEMSET_GET( rSet, pItem, ItemType, nSlotId, bDeep ) \ #define SFX_ITEMSET_GET( rSet, pItem, ItemType, nSlotId, bDeep ) \
const ItemType *pItem = (const ItemType*) \ const ItemType *pItem = (const ItemType*) \
(rSet).GetItem( nSlotId, bDeep, TYPE(ItemType) ) (rSet).GetItem( nSlotId, bDeep, TYPE(ItemType) )
//========================================================================
class SVL_DLLPUBLIC SfxItemSet class SVL_DLLPUBLIC SfxItemSet
{ {
friend class SfxItemIter; friend class SfxItemIter;
...@@ -57,7 +52,6 @@ class SVL_DLLPUBLIC SfxItemSet ...@@ -57,7 +52,6 @@ class SVL_DLLPUBLIC SfxItemSet
sal_uInt16* _pWhichRanges; // Array von Which-Bereichen sal_uInt16* _pWhichRanges; // Array von Which-Bereichen
sal_uInt16 _nCount; // Anzahl Items sal_uInt16 _nCount; // Anzahl Items
//---------------------------------------------------------------------
#ifndef _SFXITEMS_HXX #ifndef _SFXITEMS_HXX
friend class SfxItemPoolCache; friend class SfxItemPoolCache;
...@@ -73,7 +67,6 @@ public: ...@@ -73,7 +67,6 @@ public:
SfxItemArray GetItems_Impl() const { return _aItems; } SfxItemArray GetItems_Impl() const { return _aItems; }
#endif #endif
//---------------------------------------------------------------------
private: private:
const SfxItemSet& operator=(const SfxItemSet &); // n.i.!! const SfxItemSet& operator=(const SfxItemSet &); // n.i.!!
...@@ -153,8 +146,6 @@ public: ...@@ -153,8 +146,6 @@ public:
virtual int operator==(const SfxItemSet &) const; virtual int operator==(const SfxItemSet &) const;
}; };
// --------------- Inline Implementierungen ------------------------
inline void SfxItemSet::SetParent( const SfxItemSet* pNew ) inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
{ {
DBG( if (_pParent) --*_pChildCount(_pParent) ); DBG( if (_pParent) --*_pChildCount(_pParent) );
...@@ -162,8 +153,6 @@ inline void SfxItemSet::SetParent( const SfxItemSet* pNew ) ...@@ -162,8 +153,6 @@ inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
DBG( if (_pParent) ++*_pChildCount(_pParent) ); DBG( if (_pParent) ++*_pChildCount(_pParent) );
} }
//========================================================================
class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet
/* versteht alle Ranges; werden durch das Putten der Items /* versteht alle Ranges; werden durch das Putten der Items
......
...@@ -19,13 +19,10 @@ ...@@ -19,13 +19,10 @@
#ifndef INCLUDED_SVL_LCKBITEM_HXX #ifndef INCLUDED_SVL_LCKBITEM_HXX
#define INCLUDED_SVL_LCKBITEM_HXX #define INCLUDED_SVL_LCKBITEM_HXX
#include <svl/poolitem.hxx>
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <tools/solar.h>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <svl/poolitem.hxx>
// -----------------------------------------------------------------------
class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem
{ {
......
...@@ -26,10 +26,6 @@ ...@@ -26,10 +26,6 @@
#ifndef INCLUDED_SVL_NRANGES_HXX #ifndef INCLUDED_SVL_NRANGES_HXX
#define INCLUDED_SVL_NRANGES_HXX #define INCLUDED_SVL_NRANGES_HXX
#include <tools/solar.h>
//========================================================================
class SfxUShortRanges class SfxUShortRanges
{ {
sal_uInt16* _pRanges; // 0-terminated array of sal_uInt16-pairs sal_uInt16* _pRanges; // 0-terminated array of sal_uInt16-pairs
......
...@@ -20,11 +20,8 @@ ...@@ -20,11 +20,8 @@
#define INCLUDED_SVL_POOLCACH_HXX #define INCLUDED_SVL_POOLCACH_HXX
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <tools/solar.h>
#include <vector> #include <vector>
//------------------------------------------------------------------------
class SfxItemPool; class SfxItemPool;
class SfxItemSet; class SfxItemSet;
class SfxPoolItem; class SfxPoolItem;
......
...@@ -20,12 +20,11 @@ ...@@ -20,12 +20,11 @@
#ifndef INCLUDED_SVL_URIHELPER_HXX #ifndef INCLUDED_SVL_URIHELPER_HXX
#define INCLUDED_SVL_URIHELPER_HXX #define INCLUDED_SVL_URIHELPER_HXX
#include <svl/svldllapi.h>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/RuntimeException.hpp>
#include <rtl/textenc.h> #include <rtl/textenc.h>
#include <svl/svldllapi.h>
#include <tools/link.hxx> #include <tools/link.hxx>
#include <tools/solar.h>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
...@@ -35,7 +34,6 @@ namespace com { namespace sun { namespace star { ...@@ -35,7 +34,6 @@ namespace com { namespace sun { namespace star {
class CharClass; class CharClass;
//============================================================================
namespace URIHelper { namespace URIHelper {
/** /**
...@@ -62,10 +60,8 @@ SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef, ...@@ -62,10 +60,8 @@ SVL_DLLPUBLIC OUString SmartRel2Abs(INetURLObject const & rTheBaseURIRef,
bool bRelativeNonURIs = false, bool bRelativeNonURIs = false,
INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
//============================================================================
SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl); SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl);
//============================================================================
SVL_DLLPUBLIC Link GetMaybeFileHdl(); SVL_DLLPUBLIC Link GetMaybeFileHdl();
/** /**
...@@ -119,7 +115,6 @@ normalizedMakeRelative( ...@@ -119,7 +115,6 @@ normalizedMakeRelative(
SVL_DLLPUBLIC OUString simpleNormalizedMakeRelative( OUString const & baseUriReference, SVL_DLLPUBLIC OUString simpleNormalizedMakeRelative( OUString const & baseUriReference,
OUString const & uriReference); OUString const & uriReference);
//============================================================================
SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText, SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText,
sal_Int32 & rBegin, sal_Int32 & rBegin,
sal_Int32 & rEnd, sal_Int32 & rEnd,
...@@ -128,7 +123,6 @@ SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText, ...@@ -128,7 +123,6 @@ SVL_DLLPUBLIC OUString FindFirstURLInText(OUString const & rText,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT);
//============================================================================
/** Remove any password component from both absolute and relative URLs. /** Remove any password component from both absolute and relative URLs.
@ATT The current implementation will not remove a password from a @ATT The current implementation will not remove a password from a
......
...@@ -19,16 +19,11 @@ ...@@ -19,16 +19,11 @@
#ifndef INCLUDED_SVL_WHITER_HXX #ifndef INCLUDED_SVL_WHITER_HXX
#define INCLUDED_SVL_WHITER_HXX #define INCLUDED_SVL_WHITER_HXX
#include <svl/svldllapi.h>
#include <limits.h> #include <limits.h>
#include <tools/solar.h> #include <svl/svldllapi.h>
class SfxItemSet; class SfxItemSet;
// INCLUDE ---------------------------------------------------------------
class SVL_DLLPUBLIC SfxWhichIter class SVL_DLLPUBLIC SfxWhichIter
{ {
const sal_uInt16 *pRanges, *pStart; const sal_uInt16 *pRanges, *pStart;
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <svl/svldllapi.h> #include <svl/svldllapi.h>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <i18nlangtag/lang.h> #include <i18nlangtag/lang.h>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/Locale.hpp>
...@@ -928,14 +927,11 @@ public: ...@@ -928,14 +927,11 @@ public:
return m_xContext; return m_xContext;
} }
//! The following method is not to be used from outside but must be //! The following method is not to be used from outside but must be
//! public for the InputScanner. //! public for the InputScanner.
// return the current FormatScanner // return the current FormatScanner
inline const ImpSvNumberformatScan* GetFormatScanner() const { return pFormatScanner; } inline const ImpSvNumberformatScan* GetFormatScanner() const { return pFormatScanner; }
//! The following methods are not to be used from outside but must be //! The following methods are not to be used from outside but must be
//! public for the InputScanner and FormatScanner. //! public for the InputScanner and FormatScanner.
...@@ -980,9 +976,6 @@ public: ...@@ -980,9 +976,6 @@ public:
}; };
// --------------------------- inline --------------------------------------
inline sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const inline sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
{ {
if (pMergeTable) if (pMergeTable)
...@@ -1001,7 +994,6 @@ inline bool SvNumberFormatter::HasMergeFmtTbl() const ...@@ -1001,7 +994,6 @@ inline bool SvNumberFormatter::HasMergeFmtTbl() const
return pMergeTable && !pMergeTable->empty(); return pMergeTable && !pMergeTable->empty();
} }
// static // static
inline sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear, sal_uInt16 nTwoDigitYearStart ) inline sal_uInt16 SvNumberFormatter::ExpandTwoDigitYear( sal_uInt16 nYear, sal_uInt16 nTwoDigitYearStart )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment