diff options
Diffstat (limited to 'include/svl')
-rw-r--r-- | include/svl/SfxBroadcaster.hxx | 2 | ||||
-rw-r--r-- | include/svl/cintitem.hxx | 24 | ||||
-rw-r--r-- | include/svl/eitem.hxx | 2 | ||||
-rw-r--r-- | include/svl/filerec.hxx | 2 | ||||
-rw-r--r-- | include/svl/instrm.hxx | 4 | ||||
-rw-r--r-- | include/svl/intitem.hxx | 6 | ||||
-rw-r--r-- | include/svl/itempool.hxx | 4 | ||||
-rw-r--r-- | include/svl/itemprop.hxx | 2 | ||||
-rw-r--r-- | include/svl/itemset.hxx | 24 | ||||
-rw-r--r-- | include/svl/numuno.hxx | 4 | ||||
-rw-r--r-- | include/svl/slstitm.hxx | 4 | ||||
-rw-r--r-- | include/svl/style.hxx | 24 | ||||
-rw-r--r-- | include/svl/stylepool.hxx | 6 |
13 files changed, 54 insertions, 54 deletions
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index 56a335730041..a35b62a2d694 100644 --- a/include/svl/SfxBroadcaster.hxx +++ b/include/svl/SfxBroadcaster.hxx @@ -38,7 +38,7 @@ private: protected: void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); - virtual void ListenersGone(); + void ListenersGone(); public: TYPEINFO(); diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 658aa94099a7..29c9795818e2 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -63,11 +63,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt8 GetMin() const; + sal_uInt8 GetMin() const; - virtual sal_uInt8 GetMax() const; + sal_uInt8 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_uInt8 GetValue() const { return m_nValue; } @@ -122,11 +122,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt16 GetMin() const; + sal_uInt16 GetMin() const; - virtual sal_uInt16 GetMax() const; + sal_uInt16 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_uInt16 GetValue() const { return m_nValue; } @@ -181,11 +181,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_Int32 GetMin() const; + sal_Int32 GetMin() const; - virtual sal_Int32 GetMax() const; + sal_Int32 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_Int32 GetValue() const { return m_nValue; } @@ -240,11 +240,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt32 GetMin() const; + sal_uInt32 GetMin() const; - virtual sal_uInt32 GetMax() const; + sal_uInt32 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_uInt32 GetValue() const { return m_nValue; } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index e8c65904660b..2f27c358d888 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -111,7 +111,7 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + sal_uInt16 GetValueCount() const; virtual OUString GetValueTextByVal(bool bTheValue) const; diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 92f1a403389b..5a64eb1d1435 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -473,7 +473,7 @@ public: void NewContent(); - virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); + sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; /** write record with multiple content items with identical size diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 222f79afe8e4..6c4e4fb60d36 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -61,9 +61,9 @@ public: virtual ~SvInputStream(); - virtual void AddMark(sal_uLong nPos); + void AddMark(sal_uLong nPos); - virtual void RemoveMark(sal_uLong nPos); + void RemoveMark(sal_uLong nPos); }; #endif // INCLUDED_SVL_INSTRM_HXX diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 152f5b5ae8bf..70879b31d1fd 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -80,11 +80,11 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; - virtual sal_Int16 GetMin() const; + sal_Int16 GetMin() const; - virtual sal_Int16 GetMax() const; + sal_Int16 GetMax() const; - virtual SfxFieldUnit GetUnit() const; + SfxFieldUnit GetUnit() const; sal_Int16 GetValue() const { return m_nValue; } diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 9f1ffbc715ce..7fc64e1189f2 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -151,7 +151,7 @@ public: virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); virtual void Remove( const SfxPoolItem& ); - virtual const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; + const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, bool bDirect = false, @@ -170,7 +170,7 @@ public: bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; - virtual SvStream & Load(SvStream &); + SvStream & Load(SvStream &); virtual SvStream & Store(SvStream &) const; bool HasPersistentRefCounts() const; void LoadCompleted(); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index c84bcf179bf9..cc9009d5942d 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -106,7 +106,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet SfxItemPropertyMap m_aMap; mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo; protected: - virtual bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; + bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const; public: SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 5cb28c262103..8fd2e3f997fd 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -83,7 +83,7 @@ public: sal_uInt16 Count() const { return _nCount; } sal_uInt16 TotalCount() const; - virtual const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; + const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const; const SfxPoolItem* GetItem( sal_uInt16 nWhich, bool bSrchInParent = true, TypeId aItemType = 0 ) const; @@ -97,10 +97,10 @@ public: bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = NULL) const; - virtual void DisableItem(sal_uInt16 nWhich); - virtual void InvalidateItem( sal_uInt16 nWhich ); - virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); - virtual void ClearInvalidItems( bool bHardDefault = false ); + void DisableItem(sal_uInt16 nWhich); + void InvalidateItem( sal_uInt16 nWhich ); + sal_uInt16 ClearItem( sal_uInt16 nWhich = 0); + void ClearInvalidItems( bool bHardDefault = false ); void InvalidateAllItems(); // HACK(via nWhich = 0) ??? void InvalidateDefaultItems(); @@ -116,12 +116,12 @@ public: SfxItemState eDontCareAs = SfxItemState::UNKNOWN, SfxItemState eDefaultAs = SfxItemState::UNKNOWN ); - virtual bool Set( const SfxItemSet&, bool bDeep = true ); + bool Set( const SfxItemSet&, bool bDeep = true ); - virtual void Intersect( const SfxItemSet& rSet ); - virtual void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); - virtual void Differentiate( const SfxItemSet& rSet ); - virtual void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); + void Intersect( const SfxItemSet& rSet ); + void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false ); + void Differentiate( const SfxItemSet& rSet ); + void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false ); SfxItemPool* GetPool() const { return _pPool; } const sal_uInt16* GetRanges() const { return _pWhichRanges; } @@ -129,9 +129,9 @@ public: void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ); const SfxItemSet* GetParent() const { return _pParent; } - virtual SvStream & Load( SvStream &, bool bDirect = false, + SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - virtual SvStream & Store( SvStream &, bool bDirect = false ) const; + SvStream & Store( SvStream &, bool bDirect = false ) const; bool operator==(const SfxItemSet &) const; sal_Int32 getHash() const; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 940d62485394..9c416a2f561f 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -63,9 +63,9 @@ public: SvNumberFormatter* GetNumberFormatter() const; // override to adapt attributes in the document - virtual void NumberFormatDeleted(sal_uInt32 nKey); + void NumberFormatDeleted(sal_uInt32 nKey); // override to possibly format something anew - virtual void SettingsChanged(); + void SettingsChanged(); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index f63d8b35a804..738e867a616f 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -47,8 +47,8 @@ public: const std::vector<OUString>& GetList() const; // String-Separator: \n - virtual void SetString( const OUString& ); - virtual OUString GetString(); + void SetString( const OUString& ); + OUString GetString(); void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 8254f684b88e..75bef0d2875a 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -114,10 +114,10 @@ public: /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ - virtual OUString GetDisplayName() const; + OUString GetDisplayName() const; // sets the display name of this style - virtual void SetDisplayName( const OUString& ); + void SetDisplayName( const OUString& ); virtual const OUString& GetParent() const; virtual bool SetParent( const OUString& ); @@ -146,7 +146,7 @@ public: virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); - virtual sal_uInt16 GetVersion() const; + sal_uInt16 GetVersion() const; }; /* Class to iterate and search on a SfxStyleSheetBasePool */ @@ -158,8 +158,8 @@ public: */ SfxStyleSheetIterator(SfxStyleSheetBasePool *pBase, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); - virtual sal_uInt16 GetSearchMask() const; - virtual SfxStyleFamily GetSearchFamily() const; + sal_uInt16 GetSearchMask() const; + SfxStyleFamily GetSearchFamily() const; virtual sal_uInt16 Count(); virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase* First(); @@ -232,8 +232,8 @@ public: const SfxItemPool& GetPool() const { return rPool;} virtual SfxStyleSheetIteratorPtr CreateIterator(SfxStyleFamily, sal_uInt16 nMask); - virtual sal_uInt16 Count(); - virtual SfxStyleSheetBase* operator[](sal_uInt16 nIdx); + sal_uInt16 Count(); + SfxStyleSheetBase* operator[](sal_uInt16 nIdx); virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily eFam, @@ -243,17 +243,17 @@ public: SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ); virtual void Remove( SfxStyleSheetBase* ); - virtual void Insert( SfxStyleSheetBase* ); + void Insert( SfxStyleSheetBase* ); - virtual void Clear(); + void Clear(); SfxStyleSheetBasePool& operator=( const SfxStyleSheetBasePool& ); SfxStyleSheetBasePool& operator+=( const SfxStyleSheetBasePool& ); unsigned GetNumberOfStyles(); - virtual SfxStyleSheetBase* First(); - virtual SfxStyleSheetBase* Next(); + SfxStyleSheetBase* First(); + SfxStyleSheetBase* Next(); virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); virtual bool SetParent(SfxStyleFamily eFam, @@ -304,7 +304,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool protected: using SfxStyleSheetBasePool::Create; virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE; - virtual SfxStyleSheetBase* Create(const SfxStyleSheet &); + SfxStyleSheetBase* Create(const SfxStyleSheet &); public: SfxStyleSheetPool( SfxItemPool const& ); diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index dd330ffbe736..4a971f0916fd 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.hxx @@ -44,7 +44,7 @@ public: @return a shared pointer to the SfxItemSet */ - virtual SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet ); + SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet ); /** Create an iterator @@ -64,12 +64,12 @@ public: @postcond the iterator "points before the first" SfxItemSet of the pool. The first StylePoolIterator::getNext() call will deliver the first SfxItemSet. */ - virtual IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, + IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, const bool bSkipIgnorableItems = false ); /** Returns the number of styles */ - virtual sal_Int32 getCount() const; + sal_Int32 getCount() const; virtual ~StylePool(); |