diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /svl | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svl')
36 files changed, 0 insertions, 159 deletions
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 59b82ca49692..a9b7786fc32f 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -400,7 +400,6 @@ SvtCJKOptions::SvtCJKOptions(bool bDontLoad) } - SvtCJKOptions::~SvtCJKOptions() { // Global access, must be guarded (multithreading) diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index cb9acf10cd16..e431ecf64034 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -398,7 +398,6 @@ SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) } - SvtCTLOptions::~SvtCTLOptions() { // Global access, must be guarded (multithreading) diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index 3f2da4d68503..33eccd7fc789 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -316,5 +316,4 @@ void SAL_CALL OFSInputStreamContainer::removeEventListener( const uno::Reference } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index 4cad56aad361..997dd2c33420 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -517,5 +517,4 @@ void SAL_CALL OFSStreamContainer::waitForCompletion() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index bfecda117f57..55b7101d5f9a 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -404,7 +404,6 @@ public: }; - #endif // INCLUDED_SVL_SOURCE_INC_PASSWORDCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 10caa003bbc8..61947fac8bc0 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -182,7 +182,6 @@ struct SfxItemPool_Impl #define SFX_ITEMPOOL_REC_DEFAULTS sal_uInt16(0x0050) - /** Read in a Unicode string from a streamed byte string representation. @param rStream Some (input) stream. Its Stream/TargetCharSets must diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index f56d4045da97..2f391269007b 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -190,7 +190,6 @@ bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const } - void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue ) { sal_uInt16 nPos = GetPosByValue(nValue); diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 0bba3ae92086..b4e80bd24b42 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -30,7 +30,6 @@ #define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) - CntWallpaperItem::CntWallpaperItem( sal_uInt16 which ) : SfxPoolItem( which ), _nColor( COL_TRANSPARENT ), _nStyle( 0 ) { diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index ae559c3affad..646ed8b2465b 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -33,7 +33,6 @@ // class CntContentTypeItem Implementation. - #define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 ) CntContentTypeItem::CntContentTypeItem() diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 905555dcdd54..c5934897b9a2 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -23,8 +23,6 @@ #include <tools/stream.hxx> - - SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) : SfxPoolItem( nW ), nVal(nV) @@ -32,7 +30,6 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) : } - SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) : SfxPoolItem( rItem ), nVal( rItem.nVal ) @@ -40,7 +37,6 @@ SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) : } - SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const { rStream.WriteUInt16( nVal ); @@ -48,7 +44,6 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const } - bool SfxFlagItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -65,7 +60,6 @@ bool SfxFlagItem::GetPresentation } - sal_uInt8 SfxFlagItem::GetFlagCount() const { SAL_INFO("svl", "calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); @@ -73,7 +67,6 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const } - SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const { SAL_INFO("svl", "calling Create() on SfxFlagItem -- override!"); @@ -81,7 +74,6 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const } - bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -89,15 +81,10 @@ bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const } - - SfxPoolItem* SfxFlagItem::Clone(SfxItemPool *) const { return new SfxFlagItem( *this ); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 5e0ea2263b76..e0239a5e9aa8 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -37,7 +37,6 @@ SfxGlobalNameItem::SfxGlobalNameItem() } - SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName ) : SfxPoolItem( nW ), m_aName( rName ) @@ -45,20 +44,17 @@ SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName ) } - SfxGlobalNameItem::~SfxGlobalNameItem() { } - bool SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const { return static_cast<const SfxGlobalNameItem&>(rItem).m_aName == m_aName; } - SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const { return new SfxGlobalNameItem( *this ); diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index daa35b42080b..e6795e93f951 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -139,7 +139,6 @@ SfxPoolItem* SfxInt32Item::CreateDefault() }; - // class SfxUInt32Item diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 1ecf9b8b3c58..424d35e90d35 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -115,14 +115,12 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( sal_uInt16 nWhich ) const } - bool SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, SfxItemPoolFlags nFlag ) const { return bool(pItemInfos[nPos]._nFlags & nFlag); } - bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const { for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pImp->mpSecondary ) @@ -135,14 +133,12 @@ bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const } - SfxBroadcaster& SfxItemPool::BC() { return pImp->aBC; } - /** * This is the regular ctor to be used for this class. * An SfxItemPool instance is initialized, which can manage Items in the @@ -196,7 +192,6 @@ SfxItemPool::SfxItemPool } - /** * Copy ctor * @@ -263,7 +258,6 @@ SfxItemPool::SfxItemPool } - void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults ) { DBG_ASSERT( pDefaults, "first we ask for it, and then we don't give back..." ); @@ -351,7 +345,6 @@ void SfxItemPool::ReleaseDefaults } - SfxItemPool::~SfxItemPool() { if ( !pImp->maPoolItems.empty() && pImp->ppPoolDefaults ) @@ -394,8 +387,6 @@ void SfxItemPool::Free(SfxItemPool* pPool) } - - void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool ) { // Reset Master in attached Pools @@ -457,14 +448,12 @@ void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos) } - SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const { return pImp->eDefMetric; } - void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric ) { pImp->eDefMetric = eNewMetric; @@ -476,7 +465,6 @@ const OUString& SfxItemPool::GetName() const } - bool SfxItemPool::GetPresentation ( const SfxPoolItem& rItem, @@ -490,8 +478,6 @@ bool SfxItemPool::GetPresentation } - - SfxItemPool* SfxItemPool::Clone() const { SfxItemPool *pPool = new SfxItemPool( *this ); @@ -499,7 +485,6 @@ SfxItemPool* SfxItemPool::Clone() const } - void SfxItemPool::Delete() { // Already deleted? @@ -585,7 +570,6 @@ void SfxItemPool::Delete() } - void SfxItemPool::SetPoolDefaultItem(const SfxPoolItem &rItem) { if ( IsInRange(rItem.Which()) ) @@ -634,7 +618,6 @@ void SfxItemPool::ResetPoolDefaultItem( sal_uInt16 nWhichId ) } - const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ) { if ( 0 == nWhich ) @@ -861,7 +844,6 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem ) } - const SfxPoolItem& SfxItemPool::GetDefaultItem( sal_uInt16 nWhich ) const { if ( !IsInRange(nWhich) ) @@ -902,8 +884,6 @@ void SfxItemPool::FreezeIdRanges() } - - void SfxItemPool::FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const { DBG_ASSERT( !pImp->mpPoolRanges, "GetFrozenRanges() would be faster!" ); @@ -972,7 +952,6 @@ sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const } - sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const { if ( !IsSlot(nSlotId) ) @@ -988,7 +967,6 @@ sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const } - sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const { if ( !IsWhich(nWhich) ) @@ -1007,7 +985,6 @@ sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const } - sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const { if ( !IsSlot(nSlotId) ) @@ -1023,7 +1000,6 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const } - sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, bool bDeep ) const { if ( !IsWhich(nWhich) ) diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 4cc6d2f305d8..e4bf31789ab4 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -25,18 +25,14 @@ #include <com/sun/star/uno/Sequence.hxx> - - SfxPoolItem* SfxLockBytesItem::CreateDefault() { return new SfxLockBytesItem; } - SfxLockBytesItem::SfxLockBytesItem() { } - SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream ) : SfxPoolItem( nW ) { @@ -48,7 +44,6 @@ SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream ) } - SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem ) : SfxPoolItem( rItem ), _xVal( rItem._xVal ) @@ -56,27 +51,23 @@ SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem ) } - SfxLockBytesItem::~SfxLockBytesItem() { } - bool SfxLockBytesItem::operator==( const SfxPoolItem& rItem ) const { return static_cast<const SfxLockBytesItem&>(rItem)._xVal == _xVal; } - SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const { return new SfxLockBytesItem( *this ); } - #define MAX_BUF 32000 SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, sal_uInt16 ) const @@ -101,7 +92,6 @@ SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const { SvStream aLockBytesStream( _xVal ); diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index e697add91e11..7a4ff58056b9 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -68,7 +68,6 @@ SvxMacro& SvxMacro::operator=( const SvxMacro& rBase ) } - SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl ) { aSvxMacroTable.clear(); @@ -204,7 +203,6 @@ void SvxMacroTableDtor::Erase(sal_uInt16 nEvent) } - bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -216,7 +214,6 @@ bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const { return new SvxMacroItem( *this ); @@ -251,14 +248,12 @@ bool SvxMacroItem::GetPresentation } - SvStream& SvxMacroItem::Store( SvStream& rStrm , sal_uInt16 ) const { return aMacroTable.Write( rStrm ); } - SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { SvxMacroItem* pAttr = new SvxMacroItem( Which() ); @@ -267,14 +262,12 @@ SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const } - void SvxMacroItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) { aMacroTable.Insert( nEvent, rMacro); } - sal_uInt16 SvxMacroItem::GetVersion( sal_uInt16 nFileFormatVersion ) const { return SOFFICE_FILEFORMAT_31 == nFileFormatVersion diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index 5fc786e05bea..90104daef35b 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -115,5 +115,4 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, bool b } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 092f5d5fef51..e588a6a8ce2d 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -70,7 +70,6 @@ static SfxItemKind convertUInt16ToSfxItemKind(sal_uInt16 x) } - /** * The SfxItemPool is saved to the specified Stream (together with all its * secondary Pools) using its Pool Defaults and pooled Items. @@ -882,7 +881,6 @@ bool SfxItemPool::StoreSurrogate ( SvStream& rStream, const SfxPoolItem* pItem) } - sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const { DBG_ASSERT( pItem, "no 0-Pointer Surrogate" ); @@ -1103,8 +1101,6 @@ sal_uInt16 SfxItemPool::GetNewWhich } - - bool SfxItemPool::IsInVersionsRange( sal_uInt16 nWhich ) const { return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd; diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index d09d7a8f7330..50a91fea09a8 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -248,7 +248,6 @@ bool SfxPoolItem::HasMetrics() const } - bool SfxPoolItem::QueryValue( css::uno::Any&, sal_uInt8 ) const { OSL_FAIL("There is no implementation for QueryValue for this item!"); @@ -256,7 +255,6 @@ bool SfxPoolItem::QueryValue( css::uno::Any&, sal_uInt8 ) const } - bool SfxPoolItem::PutValue( const css::uno::Any&, sal_uInt8 ) { OSL_FAIL("There is no implementation for PutValue for this item!"); diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index e4f5c3593edb..4f1dee4a9bbf 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -39,7 +39,6 @@ SfxPointItem::SfxPointItem() } - SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) : SfxPoolItem( nW ), aVal( rVal ) @@ -47,7 +46,6 @@ SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) : } - SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -55,7 +53,6 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : } - bool SfxPointItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -70,7 +67,6 @@ bool SfxPointItem::GetPresentation } - bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -78,14 +74,12 @@ bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const { return new SfxPointItem( *this ); } - SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const { Point aStr; @@ -94,7 +88,6 @@ SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const { WritePair( rStream, aVal ); @@ -102,7 +95,6 @@ SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const } - bool SfxPointItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -126,7 +118,6 @@ bool SfxPointItem::QueryValue( uno::Any& rVal, } - bool SfxPointItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { @@ -166,5 +157,4 @@ bool SfxPointItem::PutValue( const uno::Any& rVal, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index f4c95be10485..57e7827423be 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -36,7 +36,6 @@ SfxRectangleItem::SfxRectangleItem() } - SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) : SfxPoolItem( nW ), aVal( rVal ) @@ -44,7 +43,6 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) : } - SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -52,7 +50,6 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : } - bool SfxRectangleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -70,7 +67,6 @@ bool SfxRectangleItem::GetPresentation } - bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -78,14 +74,12 @@ bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const { return new SfxRectangleItem( *this ); } - SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const { Rectangle aStr; @@ -94,7 +88,6 @@ SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const { WriteRectangle( rStream, aVal ); @@ -102,7 +95,6 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const } - bool SfxRectangleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId) const { @@ -162,5 +154,4 @@ bool SfxRectangleItem::PutValue( const css::uno::Any& rVal, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index a1205894aee1..6fcd15738c21 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -31,8 +31,6 @@ static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges) } - - SfxRangeItem::SfxRangeItem() { nFrom = 0; @@ -40,7 +38,6 @@ SfxRangeItem::SfxRangeItem() } - SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ): SfxPoolItem( which ), nFrom( from ), @@ -49,7 +46,6 @@ SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ): } - SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) : SfxPoolItem( rItem ) { @@ -58,7 +54,6 @@ SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) : } - bool SfxRangeItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -73,7 +68,6 @@ bool SfxRangeItem::GetPresentation } - bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -82,14 +76,12 @@ bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SfxRangeItem::Clone(SfxItemPool *) const { return new SfxRangeItem( Which(), nFrom, nTo ); } - SfxPoolItem* SfxRangeItem::Create(SvStream &rStream, sal_uInt16) const { sal_uInt16 nVon(0), nBis(0); @@ -99,7 +91,6 @@ SfxPoolItem* SfxRangeItem::Create(SvStream &rStream, sal_uInt16) const } - SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16) const { rStream.WriteUInt16( nFrom ); diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 9f5e23b97f77..79473821671f 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -29,7 +29,6 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) : } - SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) : SfxPoolItem(which), pSet(pS) @@ -38,7 +37,6 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) : } - SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) : SfxPoolItem(rCopy.Which()), pSet(rCopy.pSet->Clone(true, pPool)) @@ -46,14 +44,12 @@ SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) : } - SfxSetItem::~SfxSetItem() { delete pSet; pSet = nullptr; } - bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const { DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" ); @@ -61,7 +57,6 @@ bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const } - bool SfxSetItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -75,7 +70,6 @@ bool SfxSetItem::GetPresentation } - SvStream& SfxSetItem::Store(SvStream& rStream, sal_uInt16) const { GetItemSet().Store(rStream); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 33c7ddce940c..994aea1007e5 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -194,7 +194,6 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : } - SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : SfxPoolItem ( rItem ), @@ -221,7 +220,6 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : } - SvxSearchItem::~SvxSearchItem() { } @@ -233,7 +231,6 @@ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const } - //! used below static bool operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 ) { @@ -270,7 +267,6 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const } - bool SvxSearchItem::GetPresentation ( SfxItemPresentation , @@ -463,7 +459,6 @@ bool SvxSearchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxSearchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index d2665fe3fa4c..ae8727a77ed1 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -24,7 +24,6 @@ // class SfxStringItem - // virtual SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream): CntUnencodedStringItem(which) diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 211c72d0d3bf..1ec3a1870c4b 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -59,7 +59,6 @@ aDbgStyleSheetReferences; #endif - SfxStyleSheetHintExtended::SfxStyleSheetHintExtended ( sal_uInt16 nAction, // SfxStyleSheetHintId::... (see above) diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index dffa4bdac26e..2239919691f8 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -28,14 +28,11 @@ #include <svl/memberid.hrc> - - SfxSizeItem::SfxSizeItem() { } - SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) : SfxPoolItem( nW ), aVal( rVal ) @@ -43,7 +40,6 @@ SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) : } - SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -51,7 +47,6 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) : } - bool SfxSizeItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -66,7 +61,6 @@ bool SfxSizeItem::GetPresentation } - bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -74,14 +68,12 @@ bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const { return new SfxSizeItem( *this ); } - SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const { Size aStr; @@ -90,7 +82,6 @@ SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const { WritePair( rStream, aVal ); @@ -171,5 +162,4 @@ bool SfxSizeItem::PutValue( const css::uno::Any& rVal, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index c4290e2fc262..b608563a31d2 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -129,7 +129,6 @@ inline bool SvDataPipe_Impl::isEOF() const // SvOutputStreamOpenLockBytes - // virtual ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uInt64, void *, sal_uLong, sal_uLong*) const diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx index 183b12af9c91..4d7cceda565e 100644 --- a/svl/source/notify/hint.cxx +++ b/svl/source/notify/hint.cxx @@ -28,5 +28,4 @@ SfxHint::~SfxHint() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index de6fa570da0d..42d55a544346 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -1086,5 +1086,4 @@ com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index c618c7efee6e..729574b6c677 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -305,7 +305,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index bec6b7aaa1a6..5aebe0772c3f 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -173,5 +173,4 @@ com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implement } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 4b2646e4f81e..7b1f0bd60f35 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -224,8 +224,6 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBro } - - SvNumberFormatterRegistry_Impl* SvNumberFormatter::pFormatterRegistry = nullptr; bool SvNumberFormatter::bCurrencyTableInitialized = false; namespace @@ -2294,7 +2292,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio } - // 0 nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_NUMBER_INT ); ImpInsertFormat( aFormatSeq[nIdx], @@ -2336,7 +2333,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_PERCENT+1 /* NF_PERCENT_DEC2 */ ); - // Currency. NO default standard option! Default is determined of locale // data default currency and format is generated if needed. aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::CURRENCY ); @@ -2395,7 +2391,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio aFormatSeq[nIdx].Default = bDefault; - // Date aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::DATE ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2506,7 +2501,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYYYMMDD /* NF_DATE_DIN_YYYYMMDD */ ); - // Time aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::TIME ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2547,7 +2541,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_TIME+6 /* NF_TIME_HH_MMSS00 */ ); - // DateTime aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::DATE_TIME ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2563,7 +2556,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_DATETIME+1 /* NF_DATETIME_SYS_DDMMYYYY_HHMMSS */ ); - // Scientific number aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2579,7 +2571,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_SCIENTIFIC+1 /* NF_SCIENTIFIC_000E00 */ ); - // Fraction number (no default option) i18n::NumberFormatCode aSingleFormatCode; aSingleFormatCode.Usage = i18n::KNumberFormatUsage::FRACTION_NUMBER; @@ -2606,7 +2597,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_FRACTION+3 /* NF_FRACTION_4 */ ); - // Week of year const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords(); aSingleFormatCode.Code = rKeyword[NF_KEY_WW]; diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index d6c1d82887fd..20e986665529 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -672,7 +672,6 @@ void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserNam } - UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { return find( aURL, OUString(), false, aHandler ); diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index f06e849b61d1..52df93687439 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -29,8 +29,6 @@ #include <vector> - - struct Conversation { HCONV hConv; @@ -40,8 +38,6 @@ struct Conversation typedef ::std::vector< Conversation* > ConvList; - - class DdeInternal { public: @@ -57,8 +53,6 @@ public: }; - - class DdeString { private: @@ -78,8 +72,6 @@ public: }; - - struct DdeDataImp { HDDEDATA hData; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 7c3965de3585..868f275f15fc 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -35,7 +35,6 @@ using ::com::sun::star::uno::Exception; - SfxRepeatTarget::~SfxRepeatTarget() { } @@ -80,7 +79,6 @@ OUString SfxUndoAction::GetComment() const } - sal_uInt16 SfxUndoAction::GetId() const { return 0; @@ -128,7 +126,6 @@ void SfxUndoAction::Repeat(SfxRepeatTarget&) } - bool SfxUndoAction::CanRepeat(SfxRepeatTarget&) const { return true; @@ -1442,15 +1439,12 @@ void SfxLinkUndoAction::Redo() } - bool SfxLinkUndoAction::CanRepeat(SfxRepeatTarget& r) const { return pAction && pAction->CanRepeat(r); } - - void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) { if ( pAction && pAction->CanRepeat( r ) ) @@ -1458,7 +1452,6 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) } - OUString SfxLinkUndoAction::GetComment() const { if ( pAction ) @@ -1467,7 +1460,6 @@ OUString SfxLinkUndoAction::GetComment() const } - OUString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const { if ( pAction ) diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 7bca666bd70a..007913293db9 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -90,5 +90,4 @@ com_sun_star_comp_svl_PathService_get_implementation(css::uno::XComponentContext } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |