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 /svx/source/items | |
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 'svx/source/items')
-rw-r--r-- | svx/source/items/SmartTagItem.cxx | 7 | ||||
-rw-r--r-- | svx/source/items/algitem.cxx | 22 | ||||
-rw-r--r-- | svx/source/items/chrtitem.cxx | 31 | ||||
-rw-r--r-- | svx/source/items/drawitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/e3ditem.cxx | 10 | ||||
-rw-r--r-- | svx/source/items/galleryitem.cxx | 1 | ||||
-rw-r--r-- | svx/source/items/grfitem.cxx | 3 | ||||
-rw-r--r-- | svx/source/items/hlnkitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/numfmtsh.cxx | 26 | ||||
-rw-r--r-- | svx/source/items/numinf.cxx | 13 | ||||
-rw-r--r-- | svx/source/items/pageitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/postattr.cxx | 11 | ||||
-rw-r--r-- | svx/source/items/rotmodit.cxx | 1 | ||||
-rw-r--r-- | svx/source/items/viewlayoutitem.cxx | 8 | ||||
-rw-r--r-- | svx/source/items/zoomslideritem.cxx | 9 |
15 files changed, 0 insertions, 150 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index cb9e351755b4..c81eacc88787 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -50,9 +50,6 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, } - - - bool SvxSmartTagItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= comphelper::InitPropertySequence( { @@ -74,7 +71,6 @@ bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId } - bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -91,21 +87,18 @@ bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const { return new SvxSmartTagItem( *this ); } - SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } - SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { return nullptr; diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 54720b99e83e..ec1f4e47e9f9 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -57,7 +57,6 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons } - bool SvxOrientationItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -70,7 +69,6 @@ bool SvxOrientationItem::GetPresentation } - bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { table::CellOrientation eUno = table::CellOrientation_STANDARD; @@ -109,7 +107,6 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } - OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); @@ -117,14 +114,12 @@ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) } - SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const { return new SvxOrientationItem( *this ); } - SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt16 nVal; @@ -133,14 +128,12 @@ SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const } - sal_uInt16 SvxOrientationItem::GetValueCount() const { return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 } - bool SvxOrientationItem::IsStacked() const { return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED; @@ -184,7 +177,6 @@ SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) : } - SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop, sal_Int16 nRight, @@ -200,8 +192,6 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, } - - SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : SfxPoolItem( rItem.Which() ) @@ -213,7 +203,6 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : } - bool SvxMarginItem::GetPresentation ( SfxItemPresentation ePres, @@ -262,7 +251,6 @@ bool SvxMarginItem::GetPresentation } - bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -274,14 +262,12 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const { return new SvxMarginItem(*this); } - SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_Int16 nLeft; @@ -296,7 +282,6 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const } - SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { rStream.WriteInt16( nLeftMargin ); @@ -307,8 +292,6 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) } - - bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -336,7 +319,6 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); @@ -367,28 +349,24 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - void SvxMarginItem::SetLeftMargin( sal_Int16 nLeft ) { nLeftMargin = nLeft; } - void SvxMarginItem::SetTopMargin( sal_Int16 nTop ) { nTopMargin = nTop; } - void SvxMarginItem::SetRightMargin( sal_Int16 nRight ) { nRightMargin = nRight; } - void SvxMarginItem::SetBottomMargin( sal_Int16 nBottom ) { nBottomMargin = nBottom; diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 0815388e96a4..429e2834dc48 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; - SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);} SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : @@ -40,21 +39,18 @@ SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : } - SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartStyleItem(*this); } - SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartStyleItem(rIn, Which()); @@ -66,14 +62,12 @@ SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) : } - SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartDataDescrItem(*this); } - SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartDataDescrItem(rIn, Which()); @@ -86,28 +80,24 @@ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, } - SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrderItem(*this); } - SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrderItem(rIn, Which()); } - bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required @@ -132,7 +122,6 @@ bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMember } - bool SvxChartTextOrderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // the order of the two enums is not equal, so a mapping is required @@ -173,14 +162,12 @@ SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) : } - SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrientItem(*this); } - SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrientItem(rIn, Which()); @@ -193,7 +180,6 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : } - SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : SfxPoolItem(rItem), fVal(rItem.fVal) @@ -201,14 +187,12 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : } - OUString SvxDoubleItem::GetValueText() const { return rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' ); } - bool SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString& rText, @@ -226,21 +210,18 @@ bool SvxDoubleItem::GetPresentation } - bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const { return static_cast<const SvxDoubleItem&>(rItem).fVal == fVal; } - SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxDoubleItem(*this); } - SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const { double _fVal; @@ -272,28 +253,24 @@ SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, } - SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartKindErrorItem(*this); } - SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartKindErrorItem(rIn, Which()); } - sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) @@ -308,28 +285,24 @@ SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, } - SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartIndicateItem(*this); } - SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartIndicateItem(rIn, Which()); } - sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) @@ -344,28 +317,24 @@ SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, } - SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartRegressItem(*this); } - SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartRegressItem(rIn, Which()); } - sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 213189d8028a..a0aec77420b3 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -111,7 +111,6 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) : } - bool SvxGradientListItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -159,7 +158,6 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) : } - bool SvxHatchListItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index f853012e2516..9e623dcfcbee 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; - SvxB3DVectorItem::SvxB3DVectorItem() { } @@ -35,7 +34,6 @@ SvxB3DVectorItem::~SvxB3DVectorItem() } - SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) : SfxPoolItem( _nWhich ), aVal( rVal ) @@ -43,7 +41,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector } - SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -51,7 +48,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : } - bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -59,14 +55,12 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const } - SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const { return new SvxB3DVectorItem( *this ); } - SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const { basegfx::B3DVector aStr; @@ -78,7 +72,6 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/ } - SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { @@ -92,7 +85,6 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ } - bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { assert(!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ())); @@ -109,7 +101,6 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) con } - bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { drawing::Direction3D aDirection; @@ -126,7 +117,6 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } - sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0; diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 51d0cf7f1ba8..212cded5d461 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/Sequence.hxx> - SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; } SvxGalleryItem::SvxGalleryItem() diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 4e485f04f052..b033f8fe8bbb 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -80,7 +80,6 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const } - bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -149,6 +148,4 @@ bool SvxGrfCrop::GetPresentation( } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 8b8f1852f35f..5ff6e27ca847 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -25,8 +25,6 @@ #include "svx/hlnkitem.hxx" - - SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(0);} #define HYPERLINKFF_MARKER 0x599401FE diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index b7be0282428b..12dc40982188 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -38,9 +38,6 @@ const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789; - - - SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -61,7 +58,6 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma } - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -93,7 +89,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -130,7 +125,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } - SvxNumberFormatShell::~SvxNumberFormatShell() { /* @@ -153,14 +147,12 @@ SvxNumberFormatShell::~SvxNumberFormatShell() } - size_t SvxNumberFormatShell::GetUpdateDataCount() const { return aDelList.size(); } - void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ) { const size_t nListSize = aDelList.size(); @@ -173,7 +165,6 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt3 } - void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, short& rFmtSelPos, std::vector<OUString>& rFmtEntries ) @@ -190,7 +181,6 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, } - void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, short& rFmtSelPos, std::vector<OUString>& rFmtEntries ) @@ -203,7 +193,6 @@ void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, } - void SvxNumberFormatShell::FormatChanged( sal_uInt16 nFmtLbPos, OUString& rPreviewStr, Color*& rpFontColor ) @@ -299,7 +288,6 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos, } - bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, sal_uInt16& rCatLbSelPos, short& rFmtSelPos, @@ -335,7 +323,6 @@ bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, } - void SvxNumberFormatShell::MakeFormat( OUString& rFormat, bool bThousand, bool bNegRed, sal_uInt16 nPrecision, sal_uInt16 nLeadingZeroes, @@ -418,7 +405,6 @@ void SvxNumberFormatShell::GetOptions( const OUString& rFormat, } - void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, OUString& rPreviewStr, Color*& rpFontColor ) @@ -453,7 +439,6 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, } - bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) { sal_uInt32 nFound = pFormatter->GetEntryKey( rFmtString, eCurLanguage ); @@ -479,7 +464,6 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) } - bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pAt /* = NULL */ ) { bool bRes=false; @@ -508,8 +492,6 @@ bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pA } - - void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, LanguageType& rLangType, sal_uInt16& nFmtLbSelPos, @@ -534,7 +516,6 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, eCurLanguage )); - CategoryToPos_Impl( nCurCategory, nCatLbPos ); rLangType = eCurLanguage; @@ -547,7 +528,6 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, } - short SvxNumberFormatShell::FillEntryList_Impl( std::vector<OUString>& rList ) { /* Erstellen einer aktuellen Liste von Format-Eintraegen. @@ -1101,8 +1081,6 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, } - - void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor ) { rpColor = nullptr; @@ -1122,28 +1100,24 @@ void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpC } - ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetRemoved_Impl( size_t nKey ) { return ::std::find(aDelList.begin(), aDelList.end(), nKey); } - bool SvxNumberFormatShell::IsRemoved_Impl( size_t nKey ) { return GetRemoved_Impl( nKey ) != aDelList.end(); } - ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetAdded_Impl( size_t nKey ) { return ::std::find(aAddList.begin(), aAddList.end(), nKey); } - bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey ) { return GetAdded_Impl( nKey ) != aAddList.end(); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 630218127468..31c3374bb601 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -20,8 +20,6 @@ #include <svx/numinf.hxx> - - #define INIT(pNum,eVal,nDouble,rStr) \ SfxPoolItem ( nId ), \ \ @@ -40,7 +38,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const sal_uInt16 nId ) : @@ -50,7 +47,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const OUString& rVal, const sal_uInt16 nId ) : @@ -60,7 +56,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const sal_uInt16 nId ) : @@ -70,7 +65,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const OUString& rValueStr, const sal_uInt16 nId ) : @@ -83,7 +77,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, #undef INIT - SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : SfxPoolItem( rItem.Which() ), @@ -106,14 +99,12 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : } - SvxNumberInfoItem::~SvxNumberInfoItem() { delete [] pDelFormatArr; } - bool SvxNumberInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -127,7 +118,6 @@ bool SvxNumberInfoItem::GetPresentation } - bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); @@ -161,7 +151,6 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const { return new SvxNumberInfoItem( *this ); @@ -176,14 +165,12 @@ SfxPoolItem* SvxNumberInfoItem::Create( SvStream& /*rStream*/, sal_uInt16 ) cons } - SvStream& SvxNumberInfoItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } - void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, const sal_uInt32 nCount ) { diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index ee99635b0840..1f40e9498c2c 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -82,7 +82,6 @@ inline OUString GetUsageText( const sal_uInt16 eU ) } - bool SvxPageItem::GetPresentation ( SfxItemPresentation ePres, @@ -220,7 +219,6 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt8 eType; @@ -243,7 +241,6 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const } - SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; @@ -278,7 +275,6 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const } - bool SvxSetItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 97cc424b3f70..1741b8f3f580 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -23,8 +23,6 @@ #include <svx/dialmgr.hxx> - - SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); } SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); } SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); } @@ -35,7 +33,6 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich ) } - SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rAuthor ) @@ -43,7 +40,6 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, } - bool SvxPostItAuthorItem::GetPresentation ( SfxItemPresentation ePres, @@ -66,7 +62,6 @@ bool SvxPostItAuthorItem::GetPresentation } - SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const { return new SvxPostItAuthorItem( *this ); @@ -78,7 +73,6 @@ SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich ) } - SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rDate ) @@ -86,7 +80,6 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich } - bool SvxPostItDateItem::GetPresentation ( SfxItemPresentation ePres, @@ -109,7 +102,6 @@ bool SvxPostItDateItem::GetPresentation } - SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const { return new SvxPostItDateItem( *this ); @@ -121,7 +113,6 @@ SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich ) } - SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rText ) @@ -129,7 +120,6 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich } - bool SvxPostItTextItem::GetPresentation ( SfxItemPresentation ePres, @@ -152,7 +142,6 @@ bool SvxPostItTextItem::GetPresentation } - SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { return new SvxPostItTextItem( *this ); diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index c3fa82b4bd50..11c76c6aceb7 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -138,5 +138,4 @@ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index ea349097cd44..986348466f47 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -26,7 +26,6 @@ #include <osl/diagnose.h> - SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; } #define VIEWLAYOUT_PARAM_COLUMNS "Columns" @@ -34,7 +33,6 @@ SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; #define VIEWLAYOUT_PARAMS 2 - SvxViewLayoutItem::SvxViewLayoutItem ( sal_uInt16 nColumns, @@ -47,7 +45,6 @@ SvxViewLayoutItem::SvxViewLayoutItem } - SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), mbBookMode( rOrig.IsBookMode() ) @@ -55,34 +52,29 @@ SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) } - SvxViewLayoutItem::~SvxViewLayoutItem() { } - SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxViewLayoutItem( *this ); } - SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { return nullptr; } - SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } - bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 6b8cb85617a7..a4db8d27b872 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> - - SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; } #define ZOOMSLIDER_PARAM_CURRENTZOOM "Columns" @@ -36,14 +34,12 @@ SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; #define ZOOMSLIDER_PARAMS 4 - SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) { } - SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ) , maValues( rOrig.maValues ) @@ -53,34 +49,29 @@ SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig ) } - SvxZoomSliderItem::~SvxZoomSliderItem() { } - SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomSliderItem( *this ); } - SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { return nullptr; } - SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } - bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); |