summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-21 12:15:26 +0200
committerNoel Grandin <noel@peralex.com>2015-01-26 08:42:29 +0200
commitf61dbc302975aaa253b00ea6b141bb12474b3c95 (patch)
tree7150ea10f0111c4e6677030ac568c7be03424e08 /include/svl
parentb44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff)
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes. This is a followup patch to commit 272b1dd55797aacf511fb4342b0054e3697243f6 "new loplugin: change virtual methods to non-virtual" Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/SfxBroadcaster.hxx1
-rw-r--r--include/svl/filerec.hxx2
-rw-r--r--include/svl/itempool.hxx4
-rw-r--r--include/svl/itemprop.hxx6
-rw-r--r--include/svl/itemset.hxx36
-rw-r--r--include/svl/numuno.hxx4
-rw-r--r--include/svl/slstitm.hxx6
7 files changed, 29 insertions, 30 deletions
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index a35b62a2d694..60727de9c5aa 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -38,7 +38,6 @@ private:
protected:
void Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
- void ListenersGone();
public:
TYPEINFO();
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 5a64eb1d1435..1a9b2e685f47 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -473,7 +473,7 @@ public:
void NewContent();
- 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/itempool.hxx b/include/svl/itempool.hxx
index 7fc64e1189f2..c458cef78443 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& );
- 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;
- 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 cc9009d5942d..05ee6e9d4a4f 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:
- 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 ) :
@@ -127,12 +127,12 @@ public:
const SfxItemSet& rSet ) const
throw(::com::sun::star::uno::RuntimeException,
::com::sun::star::beans::UnknownPropertyException);
- void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
+ void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
const com::sun::star::uno::Any& aVal,
SfxItemSet& rSet ) const
throw(::com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException);
- void setPropertyValue( const OUString& rPropertyName,
+ void setPropertyValue( const OUString& rPropertyName,
const com::sun::star::uno::Any& aVal,
SfxItemSet& rSet ) const
throw(::com::sun::star::uno::RuntimeException,
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 8fd2e3f997fd..5184e9b940be 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -80,15 +80,15 @@ public:
virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = 0) const;
// Get number of items
- sal_uInt16 Count() const { return _nCount; }
- sal_uInt16 TotalCount() const;
+ sal_uInt16 Count() const { return _nCount; }
+ sal_uInt16 TotalCount() const;
- 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;
// Get Which-value of the item at position nPos
- sal_uInt16 GetWhichByPos(sal_uInt16 nPos) const;
+ sal_uInt16 GetWhichByPos(sal_uInt16 nPos) const;
// Get item-status
SfxItemState GetItemState( sal_uInt16 nWhich,
@@ -97,12 +97,12 @@ public:
bool HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem = NULL) const;
- 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();
+ 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();
inline void SetParent( const SfxItemSet* pNew );
@@ -116,22 +116,22 @@ public:
SfxItemState eDontCareAs = SfxItemState::UNKNOWN,
SfxItemState eDefaultAs = SfxItemState::UNKNOWN );
- bool Set( const SfxItemSet&, bool bDeep = true );
+ bool Set( const SfxItemSet&, bool bDeep = true );
- 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 );
+ 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; }
+ const sal_uInt16* GetRanges() const { return _pWhichRanges; }
void SetRanges( const sal_uInt16 *pRanges );
void MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo );
const SfxItemSet* GetParent() const { return _pParent; }
- SvStream & Load( SvStream &, bool bDirect = false,
+ SvStream & Load( SvStream &, bool bDirect = false,
const SfxItemPool *pRefPool = 0 );
- 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 9c416a2f561f..8a3f7abab782 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
- void NumberFormatDeleted(sal_uInt32 nKey);
+ void NumberFormatDeleted(sal_uInt32 nKey);
// override to possibly format something anew
- 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 738e867a616f..c1e724992415 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -47,14 +47,14 @@ public:
const std::vector<OUString>& GetList() const;
// String-Separator: \n
- void SetString( const OUString& );
- 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;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- virtual bool GetPresentation( SfxItemPresentation ePres,
+ virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,