include/svl/rngitem.hxx | 20 ----------
svl/source/items/rngitem.cxx | 85 -------------------------------------------
2 files changed, 105 deletions(-)
New commits:
commit feade09e18ad496159615167ddb57a4dd0abab35
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Jan 11 10:10:09 2017 +0200
SfxUShortRangesItem is unused
Change-Id: I6f88f37eca2bdd6b40c8713f1b2e35ad0be94ab0
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index a776ce3..aa39e27 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -47,26 +47,6 @@ public:
};
-class SVL_DLLPUBLIC SfxUShortRangesItem : public SfxPoolItem
-{
-private:
- sal_uInt16* _pRanges;
-
-public:
- SfxUShortRangesItem( sal_uInt16 nWID, SvStream
&rStream );
- SfxUShortRangesItem( const
SfxUShortRangesItem& rItem );
- virtual ~SfxUShortRangesItem() override;
- virtual bool operator==( const SfxPoolItem& ) const
override;
- virtual bool GetPresentation( SfxItemPresentation ePres,
- MapUnit eCoreMetric,
- MapUnit ePresMetric,
- OUString &rText,
- const IntlWrapper * = nullptr ) const
override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
- virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion )
const override;
- virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion )
const override;
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 2aa9e60..be60ce3 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -23,13 +23,6 @@
#include <tools/stream.hxx>
#include <svl/rngitem.hxx>
-static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges)
-{
- sal_uInt16 nCount = 0;
- for (; *pRanges; pRanges += 2) nCount += 2;
- return nCount;
-}
-
SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ):
SfxPoolItem( which ),
@@ -91,82 +84,4 @@ SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16)
const
return rStream;
}
-SfxUShortRangesItem::SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream )
-: SfxPoolItem( nWID )
-{
- sal_uInt16 nCount(0);
- rStream.ReadUInt16(nCount);
- const size_t nMaxEntries = rStream.remainingSize() / sizeof(sal_uInt16);
- if (nCount > nMaxEntries)
- {
- nCount = nMaxEntries;
- SAL_WARN("svl.items", "SfxUShortRangesItem: truncated Stream");
- }
- _pRanges = new sal_uInt16[nCount + 1];
- for ( sal_uInt16 n = 0; n < nCount; ++n )
- rStream.ReadUInt16( _pRanges[n] );
- _pRanges[nCount] = 0;
-}
-
-SfxUShortRangesItem::SfxUShortRangesItem( const SfxUShortRangesItem& rItem )
-: SfxPoolItem( rItem )
-{
- sal_uInt16 nCount = Count_Impl(rItem._pRanges) + 1;
- _pRanges = new sal_uInt16[nCount];
- memcpy( _pRanges, rItem._pRanges, sizeof(sal_uInt16) * nCount );
-}
-
-SfxUShortRangesItem::~SfxUShortRangesItem()
-{
- delete _pRanges;
-}
-
-
-bool SfxUShortRangesItem::operator==( const SfxPoolItem &rItem ) const
-{
- const SfxUShortRangesItem &rOther = static_cast<const
SfxUShortRangesItem&>(rItem);
- if ( !_pRanges && !rOther._pRanges )
- return true;
- if ( _pRanges || rOther._pRanges )
- return false;
-
- sal_uInt16 n;
- for ( n = 0; _pRanges[n] && rOther._pRanges[n]; ++n )
- if ( _pRanges[n] != rOther._pRanges[n] )
- return false;
-
- return !_pRanges[n] && !rOther._pRanges[n];
-}
-
-bool SfxUShortRangesItem::GetPresentation( SfxItemPresentation /*ePres*/,
- MapUnit /*eCoreMetric*/,
- MapUnit /*ePresMetric*/,
- OUString & /*rText*/,
- const IntlWrapper * ) const
-{
- // not implemented
- return false;
-}
-
-SfxPoolItem* SfxUShortRangesItem::Clone( SfxItemPool * ) const
-{
- return new SfxUShortRangesItem( *this );
-}
-
-
-SfxPoolItem* SfxUShortRangesItem::Create( SvStream &rStream, sal_uInt16 ) const
-{
- return new SfxUShortRangesItem( Which(), rStream );
-}
-
-
-SvStream& SfxUShortRangesItem::Store( SvStream &rStream, sal_uInt16 ) const
-{
- sal_uInt16 nCount = Count_Impl( _pRanges );
- rStream.ReadUInt16( nCount );
- for ( sal_uInt16 n = 0; _pRanges[n]; ++n )
- rStream.ReadUInt16( _pRanges[n] );
- return rStream;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
