Kaydet (Commit) b269f2af authored tarafından Michael Stahl's avatar Michael Stahl

svl: translate some comment in itemset.cxx

Change-Id: I0d306854ed295826418ad88ea5c0c72b949eeb22
üst ff644819
...@@ -109,8 +109,6 @@ SfxItemSet::SfxItemSet ...@@ -109,8 +109,6 @@ SfxItemSet::SfxItemSet
memset(static_cast<void*>(m_pItems), 0, nSize * sizeof(SfxPoolItem*)); memset(static_cast<void*>(m_pItems), 0, nSize * sizeof(SfxPoolItem*));
} }
SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2) SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2)
: m_pPool( &rPool ) : m_pPool( &rPool )
, m_pParent(nullptr) , m_pParent(nullptr)
...@@ -121,8 +119,6 @@ SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich ...@@ -121,8 +119,6 @@ SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich
InitRanges_Impl(nWhich1, nWhich2); InitRanges_Impl(nWhich1, nWhich2);
} }
void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2) void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2)
{ {
m_pWhichRanges = new sal_uInt16[ 3 ]; m_pWhichRanges = new sal_uInt16[ 3 ];
...@@ -134,8 +130,6 @@ void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2) ...@@ -134,8 +130,6 @@ void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2)
memset(static_cast<void*>(m_pItems), 0, nRg * sizeof(SfxPoolItem*)); memset(static_cast<void*>(m_pItems), 0, nRg * sizeof(SfxPoolItem*));
} }
void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 nNull) void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 nNull)
{ {
sal_uInt16 nSize = InitializeRanges_Impl(m_pWhichRanges, pArgs, nWh1, nWh2, nNull); sal_uInt16 nSize = InitializeRanges_Impl(m_pWhichRanges, pArgs, nWh1, nWh2, nNull);
...@@ -143,8 +137,6 @@ void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2 ...@@ -143,8 +137,6 @@ void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2
memset(static_cast<void*>(m_pItems), 0, sizeof(SfxPoolItem*) * nSize); memset(static_cast<void*>(m_pItems), 0, sizeof(SfxPoolItem*) * nSize);
} }
SfxItemSet::SfxItemSet(SfxItemPool& rPool, SfxItemSet::SfxItemSet(SfxItemPool& rPool,
USHORT_ARG nWh1, USHORT_ARG nWh2, USHORT_ARG nNull, ...) USHORT_ARG nWh1, USHORT_ARG nWh2, USHORT_ARG nNull, ...)
: m_pPool( &rPool ) : m_pPool( &rPool )
...@@ -169,8 +161,6 @@ SfxItemSet::SfxItemSet(SfxItemPool& rPool, ...@@ -169,8 +161,6 @@ SfxItemSet::SfxItemSet(SfxItemPool& rPool,
} }
} }
void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable) void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable)
{ {
sal_uInt16 nCnt = 0; sal_uInt16 nCnt = 0;
...@@ -189,9 +179,6 @@ void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable) ...@@ -189,9 +179,6 @@ void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable)
memcpy( m_pWhichRanges, pWhichPairTable, sizeof( sal_uInt16 ) * cnt ); memcpy( m_pWhichRanges, pWhichPairTable, sizeof( sal_uInt16 ) * cnt );
} }
SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable ) SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable )
: m_pPool(&rPool) : m_pPool(&rPool)
, m_pParent(nullptr) , m_pParent(nullptr)
...@@ -199,7 +186,7 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable ) ...@@ -199,7 +186,7 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable )
, m_pWhichRanges(nullptr) , m_pWhichRanges(nullptr)
, m_nCount(0) , m_nCount(0)
{ {
// pWhichPairTable == 0 ist f"ur das SfxAllEnumItemSet // pWhichPairTable == 0 is for the SfxAllEnumItemSet
if ( pWhichPairTable ) if ( pWhichPairTable )
InitRanges_Impl(pWhichPairTable); InitRanges_Impl(pWhichPairTable);
} }
...@@ -246,8 +233,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ) ...@@ -246,8 +233,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet )
memcpy( m_pWhichRanges, rASet.m_pWhichRanges, sizeof( sal_uInt16 ) * cnt); memcpy( m_pWhichRanges, rASet.m_pWhichRanges, sizeof( sal_uInt16 ) * cnt);
} }
SfxItemSet::~SfxItemSet() SfxItemSet::~SfxItemSet()
{ {
sal_uInt16 nCount = TotalCount(); sal_uInt16 nCount = TotalCount();
...@@ -271,14 +256,12 @@ SfxItemSet::~SfxItemSet() ...@@ -271,14 +256,12 @@ SfxItemSet::~SfxItemSet()
} }
} }
// FIXME: could be delete[] (SfxPoolItem **)m_pItems;
delete[] m_pItems; delete[] m_pItems;
if (m_pWhichRanges != m_pPool->GetFrozenIdRanges()) if (m_pWhichRanges != m_pPool->GetFrozenIdRanges())
delete[] m_pWhichRanges; delete[] m_pWhichRanges;
m_pWhichRanges = nullptr; // for invariant-testing m_pWhichRanges = nullptr; // for invariant-testing
} }
/** /**
* Delete single Items or all Items (nWhich == 0) * Delete single Items or all Items (nWhich == 0)
*/ */
...@@ -376,8 +359,6 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich ) ...@@ -376,8 +359,6 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
return nDel; return nDel;
} }
void SfxItemSet::ClearInvalidItems( bool bHardDefault ) void SfxItemSet::ClearInvalidItems( bool bHardDefault )
{ {
sal_uInt16* pPtr = m_pWhichRanges; sal_uInt16* pPtr = m_pWhichRanges;
...@@ -428,8 +409,6 @@ void SfxItemSet::InvalidateAllItems() ...@@ -428,8 +409,6 @@ void SfxItemSet::InvalidateAllItems()
memset(static_cast<void*>(m_pItems), -1, m_nCount * sizeof(SfxPoolItem*)); memset(static_cast<void*>(m_pItems), -1, m_nCount * sizeof(SfxPoolItem*));
} }
SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich, SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
bool bSrchInParent, bool bSrchInParent,
const SfxPoolItem **ppItem ) const const SfxPoolItem **ppItem ) const
...@@ -486,8 +465,6 @@ bool SfxItemSet::HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem) const ...@@ -486,8 +465,6 @@ bool SfxItemSet::HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem) const
return bRet; return bRet;
} }
const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ) const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich )
{ {
if ( !nWhich ) if ( !nWhich )
...@@ -563,8 +540,6 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ...@@ -563,8 +540,6 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
return 0; return 0;
} }
bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault ) bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault )
{ {
bool bRet = false; bool bRet = false;
...@@ -595,7 +570,6 @@ bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault ) ...@@ -595,7 +570,6 @@ bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault )
return bRet; return bRet;
} }
/** /**
* This method takes the Items from the 'rSet' and adds to '*this'. * This method takes the Items from the 'rSet' and adds to '*this'.
* Which ranges in '*this' that are non-existent in 'rSet' will not * Which ranges in '*this' that are non-existent in 'rSet' will not
...@@ -676,7 +650,6 @@ void SfxItemSet::PutExtended ...@@ -676,7 +650,6 @@ void SfxItemSet::PutExtended
} }
} }
/** /**
* Expands the ranges of settable items by 'nFrom' to 'nTo'. Keeps state of * Expands the ranges of settable items by 'nFrom' to 'nTo'. Keeps state of
* items which are new ranges too. * items which are new ranges too.
...@@ -694,7 +667,6 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo ) ...@@ -694,7 +667,6 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
SetRanges( aRanges ); SetRanges( aRanges );
} }
/** /**
* Modifies the ranges of settable items. Keeps state of items which * Modifies the ranges of settable items. Keeps state of items which
* are new ranges too. * are new ranges too.
...@@ -783,7 +755,6 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges ) ...@@ -783,7 +755,6 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges )
} }
} }
/** /**
* The SfxItemSet takes over exactly those SfxPoolItems that are * The SfxItemSet takes over exactly those SfxPoolItems that are
* set in rSet and are in their own Which range. All others are removed. * set in rSet and are in their own Which range. All others are removed.
...@@ -883,9 +854,6 @@ const SfxPoolItem* SfxItemSet::GetItem ...@@ -883,9 +854,6 @@ const SfxPoolItem* SfxItemSet::GetItem
return 0; return 0;
} }
const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const
{ {
// Search the Range in which the Which is located in: // Search the Range in which the Which is located in:
...@@ -942,8 +910,6 @@ void SfxItemSet::Changed( const SfxPoolItem&, const SfxPoolItem& ) ...@@ -942,8 +910,6 @@ void SfxItemSet::Changed( const SfxPoolItem&, const SfxPoolItem& )
{ {
} }
sal_uInt16 SfxItemSet::TotalCount() const sal_uInt16 SfxItemSet::TotalCount() const
{ {
sal_uInt16 nRet = 0; sal_uInt16 nRet = 0;
...@@ -956,7 +922,6 @@ sal_uInt16 SfxItemSet::TotalCount() const ...@@ -956,7 +922,6 @@ sal_uInt16 SfxItemSet::TotalCount() const
return nRet; return nRet;
} }
/** /**
* Only retain the Items that are also present in rSet * Only retain the Items that are also present in rSet
* (nevermind their value). * (nevermind their value).
...@@ -1037,8 +1002,6 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet ) ...@@ -1037,8 +1002,6 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
} }
} }
void SfxItemSet::Differentiate( const SfxItemSet& rSet ) void SfxItemSet::Differentiate( const SfxItemSet& rSet )
{ {
if( !Count() || !rSet.Count() )// None set? if( !Count() || !rSet.Count() )// None set?
...@@ -1108,7 +1071,6 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet ) ...@@ -1108,7 +1071,6 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
} }
} }
/** /**
* Decision table for MergeValue(s) * Decision table for MergeValue(s)
* *
...@@ -1307,8 +1269,6 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults ) ...@@ -1307,8 +1269,6 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults )
} }
} }
void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults ) void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults )
{ {
SfxItemArray ppFnd = m_pItems; SfxItemArray ppFnd = m_pItems;
...@@ -1328,8 +1288,6 @@ void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults ) ...@@ -1328,8 +1288,6 @@ void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults )
} }
} }
void SfxItemSet::InvalidateItem( sal_uInt16 nWhich ) void SfxItemSet::InvalidateItem( sal_uInt16 nWhich )
{ {
SfxItemArray ppFnd = m_pItems; SfxItemArray ppFnd = m_pItems;
...@@ -1361,8 +1319,6 @@ void SfxItemSet::InvalidateItem( sal_uInt16 nWhich ) ...@@ -1361,8 +1319,6 @@ void SfxItemSet::InvalidateItem( sal_uInt16 nWhich )
} }
} }
sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const
{ {
sal_uInt16 n = 0; sal_uInt16 n = 0;
...@@ -1379,7 +1335,6 @@ sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const ...@@ -1379,7 +1335,6 @@ sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const
return 0; return 0;
} }
/** /**
* Saves the SfxItemSet instance to the supplied Stream. * Saves the SfxItemSet instance to the supplied Stream.
* The surrogates as well as the ones with 'bDirect == true' are saved * The surrogates as well as the ones with 'bDirect == true' are saved
...@@ -1438,7 +1393,6 @@ SvStream &SfxItemSet::Store ...@@ -1438,7 +1393,6 @@ SvStream &SfxItemSet::Store
return rStream; return rStream;
} }
/** /**
* This method loads an SfxItemSet from a stream. * This method loads an SfxItemSet from a stream.
* If the SfxItemPool was loaded without RefCounts the loaded Item * If the SfxItemPool was loaded without RefCounts the loaded Item
...@@ -1517,8 +1471,6 @@ SvStream &SfxItemSet::Load ...@@ -1517,8 +1471,6 @@ SvStream &SfxItemSet::Load
return rStream; return rStream;
} }
bool SfxItemSet::operator==(const SfxItemSet &rCmp) const bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
{ {
// Values we can get quickly need to be the same // Values we can get quickly need to be the same
...@@ -1585,8 +1537,6 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const ...@@ -1585,8 +1537,6 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
return true; return true;
} }
SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
{ {
if (pToPool && pToPool != m_pPool) if (pToPool && pToPool != m_pPool)
...@@ -1612,8 +1562,6 @@ SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const ...@@ -1612,8 +1562,6 @@ SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
: new SfxItemSet(*m_pPool, m_pWhichRanges); : new SfxItemSet(*m_pPool, m_pWhichRanges);
} }
int SfxItemSet::PutDirect(const SfxPoolItem &rItem) int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
{ {
SfxItemArray ppFnd = m_pItems; SfxItemArray ppFnd = m_pItems;
...@@ -1672,10 +1620,6 @@ SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool ) ...@@ -1672,10 +1620,6 @@ SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
memset( m_pWhichRanges, 0, (nInitCount + 1) * sizeof(sal_uInt16) ); memset( m_pWhichRanges, 0, (nInitCount + 1) * sizeof(sal_uInt16) );
} }
SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy) SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy)
: SfxItemSet(rCopy), : SfxItemSet(rCopy),
aDefault(0), aDefault(0),
...@@ -1683,9 +1627,6 @@ SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy) ...@@ -1683,9 +1627,6 @@ SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy)
{ {
} }
/** /**
* Explicitly define this ctor to avoid auto-generation by the compiler. * Explicitly define this ctor to avoid auto-generation by the compiler.
* The compiler does not take the ctor with the 'const SfxItemSet&'! * The compiler does not take the ctor with the 'const SfxItemSet&'!
...@@ -1697,7 +1638,6 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy) ...@@ -1697,7 +1638,6 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy)
{ {
} }
/** /**
* This internal function creates a new WhichRanges array, which is copied * This internal function creates a new WhichRanges array, which is copied
* from the 'nOldSize'-USHORTs long 'pUS'. It has new USHORTs at the end instead * from the 'nOldSize'-USHORTs long 'pUS'. It has new USHORTs at the end instead
...@@ -1725,7 +1665,6 @@ static sal_uInt16 *AddRanges_Impl( ...@@ -1725,7 +1665,6 @@ static sal_uInt16 *AddRanges_Impl(
return pNew; return pNew;
} }
/** /**
* This internal function creates a new ItemArray, which is copied from 'pItems', * This internal function creates a new ItemArray, which is copied from 'pItems',
* but has room for a new ItemPointer at 'nPos'. * but has room for a new ItemPointer at 'nPos'.
...@@ -1759,7 +1698,6 @@ static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_u ...@@ -1759,7 +1698,6 @@ static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_u
return pNew; return pNew;
} }
/** /**
* Putting with automatic extension of the WhichId with the ID of the Item. * Putting with automatic extension of the WhichId with the ID of the Item.
*/ */
...@@ -1883,7 +1821,6 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi ...@@ -1883,7 +1821,6 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi
return &rNew; return &rNew;
} }
/** /**
* Disable Item * Disable Item
* Using a VoidItem with Which value 0 * Using a VoidItem with Which value 0
...@@ -1893,8 +1830,6 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich) ...@@ -1893,8 +1830,6 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich)
Put( SfxVoidItem(0), nWhich ); Put( SfxVoidItem(0), nWhich );
} }
SfxItemSet *SfxAllItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const SfxItemSet *SfxAllItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
{ {
if (pToPool && pToPool != m_pPool) if (pToPool && pToPool != m_pPool)
...@@ -1915,8 +1850,6 @@ sal_Int32 SfxItemSet::getHash() const ...@@ -1915,8 +1850,6 @@ sal_Int32 SfxItemSet::getHash() const
return stringify().hashCode(); return stringify().hashCode();
} }
OString SfxItemSet::stringify() const OString SfxItemSet::stringify() const
{ {
SvMemoryStream aStream; SvMemoryStream aStream;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment