include/svx/sdasitm.hxx | 10 +-
include/svx/svdtrans.hxx | 24 +++---
svx/source/items/customshapeitem.cxx | 128 +++++++++++++++++------------------
svx/source/svdraw/svdtrans.cxx | 24 +++---
4 files changed, 93 insertions(+), 93 deletions(-)
New commits:
commit 107ab712725e92fc527b54e91f317f932b78146a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 17 08:09:53 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jul 17 11:20:22 2023 +0200
svx: prefix members of SdrCustomShapeGeometryItem and SdrFormatter
See tdf#94879 for motivation.
Change-Id: If7ca1e0117943f82c9ea46d6a6eb9ba9f67b1b09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154507
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index ee1c05ebc634..e53e9c3604a2 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -43,16 +43,16 @@ private:
typedef std::unordered_map <PropertyPair, sal_Int32, PropertyPairHash>
PropertyPairHashMap;
typedef std::unordered_map<OUString, sal_Int32> PropertyHashMap;
- PropertyHashMap aPropHashMap;
- PropertyPairHashMap aPropPairHashMap;
+ PropertyHashMap m_aPropHashMap;
+ PropertyPairHashMap m_aPropPairHashMap;
- css::uno::Sequence< css::beans::PropertyValue > aPropSeq;
+ css::uno::Sequence< css::beans::PropertyValue > m_aPropSeq;
// For fast comparisons keep a hash of the content, computed on demand
// (unusable state is if anyToHash() returns no hash).
enum HashState { Unknown, Valid, Unusable };
- mutable HashState aHashState = HashState::Unknown;
- mutable size_t aHash = 0xdeadbeef;
+ mutable HashState m_aHashState = HashState::Unknown;
+ mutable size_t m_aHash = 0xdeadbeef;
void SetPropSeq( const css::uno::Sequence< css::beans::PropertyValue >&
rPropSeq );
inline void UpdateHash() const;
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index aa8992a34bd3..ae225426afd6 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -264,22 +264,22 @@ inline bool IsInch(FieldUnit eU) {
}
class SVXCORE_DLLPUBLIC SdrFormatter {
- tools::Long nMul_;
- tools::Long nDiv_;
- short nComma_;
- bool bDirty;
- MapUnit eSrcMU;
- MapUnit eDstMU;
+ tools::Long m_nMul;
+ tools::Long m_nDiv;
+ short m_nComma;
+ bool m_bDirty;
+ MapUnit m_eSrcMU;
+ MapUnit m_eDstMU;
private:
SVX_DLLPRIVATE void Undirty();
public:
SdrFormatter(MapUnit eSrc, MapUnit eDst)
- : nMul_(0)
- , nDiv_(0)
- , nComma_(0)
- , bDirty(true)
- , eSrcMU(eSrc)
- , eDstMU(eDst)
+ : m_nMul(0)
+ , m_nDiv(0)
+ , m_nComma(0)
+ , m_bDirty(true)
+ , m_eSrcMU(eSrc)
+ , m_eDstMU(eDst)
{
}
OUString GetStr(tools::Long nVal) const;
diff --git a/svx/source/items/customshapeitem.cxx
b/svx/source/items/customshapeitem.cxx
index 5f2ef96a251b..1aaa0e7ff02b 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -42,18 +42,18 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem(
const uno::Sequence< bea
css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const
OUString& rPropName )
{
css::uno::Any* pRet = nullptr;
- PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) );
- if ( aHashIter != aPropHashMap.end() )
- pRet = &aPropSeq.getArray()[ (*aHashIter).second ].Value;
+ PropertyHashMap::iterator aHashIter( m_aPropHashMap.find( rPropName ) );
+ if ( aHashIter != m_aPropHashMap.end() )
+ pRet = &m_aPropSeq.getArray()[ (*aHashIter).second ].Value;
return pRet;
}
const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const
OUString& rPropName ) const
{
const css::uno::Any* pRet = nullptr;
- PropertyHashMap::const_iterator aHashIter( aPropHashMap.find( rPropName )
);
- if ( aHashIter != aPropHashMap.end() )
- pRet = &aPropSeq[ (*aHashIter).second ].Value;
+ PropertyHashMap::const_iterator aHashIter( m_aPropHashMap.find( rPropName
) );
+ if ( aHashIter != m_aPropHashMap.end() )
+ pRet = &m_aPropSeq[ (*aHashIter).second ].Value;
return pRet;
}
@@ -65,8 +65,8 @@ css::uno::Any*
SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUStrin
{
if ( auto rSecSequence =
o3tl::tryAccess<css::uno::Sequence<beans::PropertyValue>>(*pSeqAny) )
{
- PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find(
PropertyPair( rSequenceName, rPropName ) ) );
- if ( aHashIter != aPropPairHashMap.end() )
+ PropertyPairHashMap::iterator aHashIter( m_aPropPairHashMap.find(
PropertyPair( rSequenceName, rPropName ) ) );
+ if ( aHashIter != m_aPropPairHashMap.end() )
{
pRet =
&const_cast<css::uno::Sequence<css::beans::PropertyValue>
&>(*rSecSequence).getArray()[ (*aHashIter).second ].Value;
}
@@ -83,8 +83,8 @@ const css::uno::Any*
SdrCustomShapeGeometryItem::GetPropertyValueByName( const O
{
if ( auto rSecSequence =
o3tl::tryAccess<css::uno::Sequence<beans::PropertyValue>>(*pSeqAny) )
{
- PropertyPairHashMap::const_iterator aHashIter(
aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) );
- if ( aHashIter != aPropPairHashMap.end() )
+ PropertyPairHashMap::const_iterator aHashIter(
m_aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) );
+ if ( aHashIter != m_aPropPairHashMap.end() )
{
pRet = &(*rSecSequence)[ (*aHashIter).second ].Value;
}
@@ -102,9 +102,9 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
css::beans::PropertyVal
{ // old property is a sequence->each entry has to be removed from
the HashPairMap
for ( auto const & i : *rSecSequence )
{
- PropertyPairHashMap::iterator aHashIter(
aPropPairHashMap.find( PropertyPair( rPropVal.Name, i.Name ) ) );
- if ( aHashIter != aPropPairHashMap.end() )
- aPropPairHashMap.erase( aHashIter );
+ PropertyPairHashMap::iterator aHashIter(
m_aPropPairHashMap.find( PropertyPair( rPropVal.Name, i.Name ) ) );
+ if ( aHashIter != m_aPropPairHashMap.end() )
+ m_aPropPairHashMap.erase( aHashIter );
}
}
*pAny = rPropVal.Value;
@@ -113,20 +113,20 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
css::beans::PropertyVal
for ( sal_Int32 i = 0; i < rSecSequence->getLength(); i++ )
{
beans::PropertyValue const & rPropVal2 = (*rSecSequence)[ i ];
- aPropPairHashMap[ PropertyPair( rPropVal.Name, rPropVal2.Name
) ] = i;
+ m_aPropPairHashMap[ PropertyPair( rPropVal.Name,
rPropVal2.Name ) ] = i;
}
}
}
else
{ // it's a new property
- assert(std::none_of(std::cbegin(aPropSeq), std::cend(aPropSeq),
+ assert(std::none_of(std::cbegin(m_aPropSeq), std::cend(m_aPropSeq),
[&rPropVal](beans::PropertyValue const& rVal)
{ return rVal.Name == rPropVal.Name; } ));
- sal_uInt32 nIndex = aPropSeq.getLength();
- aPropSeq.realloc( nIndex + 1 );
- aPropSeq.getArray()[ nIndex ] = rPropVal ;
+ sal_uInt32 nIndex = m_aPropSeq.getLength();
+ m_aPropSeq.realloc( nIndex + 1 );
+ m_aPropSeq.getArray()[ nIndex ] = rPropVal ;
- aPropHashMap[ rPropVal.Name ] = nIndex;
+ m_aPropHashMap[ rPropVal.Name ] = nIndex;
}
InvalidateHash();
}
@@ -146,14 +146,14 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
OUString& rSequenceName
aValue.Name = rSequenceName;
aValue.Value <<= aSeq;
- assert(std::none_of(std::cbegin(aPropSeq), std::cend(aPropSeq),
+ assert(std::none_of(std::cbegin(m_aPropSeq), std::cend(m_aPropSeq),
[&rSequenceName](beans::PropertyValue const& rV)
{ return rV.Name == rSequenceName; } ));
- sal_uInt32 nIndex = aPropSeq.getLength();
- aPropSeq.realloc( nIndex + 1 );
- auto pPropSeq = aPropSeq.getArray();
+ sal_uInt32 nIndex = m_aPropSeq.getLength();
+ m_aPropSeq.realloc( nIndex + 1 );
+ auto pPropSeq = m_aPropSeq.getArray();
pPropSeq[ nIndex ] = aValue;
- aPropHashMap[ rSequenceName ] = nIndex;
+ m_aPropHashMap[ rSequenceName ] = nIndex;
pSeqAny = &pPropSeq[ nIndex ].Value;
}
@@ -161,9 +161,9 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
OUString& rSequenceName
if (auto pSecSequence =
o3tl::tryAccess<css::uno::Sequence<beans::PropertyValue>>(*pSeqAny))
{
PropertyPairHashMap::iterator aHashIter(
- aPropPairHashMap.find(PropertyPair(rSequenceName,
rPropVal.Name)));
+ m_aPropPairHashMap.find(PropertyPair(rSequenceName,
rPropVal.Name)));
auto& rSeq =
const_cast<css::uno::Sequence<css::beans::PropertyValue>&>(*pSecSequence);
- if (aHashIter != aPropPairHashMap.end())
+ if (aHashIter != m_aPropPairHashMap.end())
{
rSeq.getArray()[(*aHashIter).second].Value = rPropVal.Value;
}
@@ -173,7 +173,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
OUString& rSequenceName
rSeq.realloc(nCount + 1);
rSeq.getArray()[nCount] = rPropVal;
- aPropPairHashMap[PropertyPair(rSequenceName, rPropVal.Name)] =
nCount;
+ m_aPropPairHashMap[PropertyPair(rSequenceName, rPropVal.Name)]
= nCount;
}
}
}
@@ -182,38 +182,38 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
OUString& rSequenceName
void SdrCustomShapeGeometryItem::ClearPropertyValue( const OUString& rPropName
)
{
- if ( !aPropSeq.hasElements() )
+ if ( !m_aPropSeq.hasElements() )
return;
- PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) );
- if ( aHashIter == aPropHashMap.end() )
+ PropertyHashMap::iterator aHashIter( m_aPropHashMap.find( rPropName ) );
+ if ( aHashIter == m_aPropHashMap.end() )
return;
- auto pPropSeq = aPropSeq.getArray();
+ auto pPropSeq = m_aPropSeq.getArray();
css::uno::Any& rSeqAny = pPropSeq[(*aHashIter).second].Value;
if (auto pSecSequence
= o3tl::tryAccess<css::uno::Sequence<beans::PropertyValue>>(rSeqAny))
{
for (const auto& rPropVal : *pSecSequence)
{
- auto _aHashIter(aPropPairHashMap.find(PropertyPair(rPropName,
rPropVal.Name)));
- if (_aHashIter != aPropPairHashMap.end())
- aPropPairHashMap.erase(_aHashIter); // removing property from
pair hashmap
+ auto _aHashIter(m_aPropPairHashMap.find(PropertyPair(rPropName,
rPropVal.Name)));
+ if (_aHashIter != m_aPropPairHashMap.end())
+ m_aPropPairHashMap.erase(_aHashIter); // removing property
from pair hashmap
}
}
- sal_Int32 nLength = aPropSeq.getLength();
+ sal_Int32 nLength = m_aPropSeq.getLength();
if ( nLength )
{
sal_Int32 nIndex = (*aHashIter).second;
if ( nIndex != ( nLength - 1 ) ) // resizing
sequence
{
- PropertyHashMap::iterator aHashIter2( aPropHashMap.find( aPropSeq[
nLength - 1 ].Name ) );
+ PropertyHashMap::iterator aHashIter2( m_aPropHashMap.find(
m_aPropSeq[ nLength - 1 ].Name ) );
(*aHashIter2).second = nIndex;
- pPropSeq[ nIndex ] = aPropSeq[ nLength - 1 ];
+ pPropSeq[ nIndex ] = m_aPropSeq[ nLength - 1 ];
}
- aPropSeq.realloc( nLength - 1 );
+ m_aPropSeq.realloc( nLength - 1 );
}
- aPropHashMap.erase( aHashIter ); // removing
property from hashmap
+ m_aPropHashMap.erase( aHashIter ); // removing
property from hashmap
InvalidateHash();
}
@@ -231,12 +231,12 @@ bool SdrCustomShapeGeometryItem::operator==( const
SfxPoolItem& rCmp ) const
// compare using that.
UpdateHash();
other.UpdateHash();
- if( aHashState != other.aHashState )
+ if( m_aHashState != other.m_aHashState )
return false;
- if( aHashState == HashState::Valid && aHash != other.aHash )
+ if( m_aHashState == HashState::Valid && m_aHash != other.m_aHash )
return false;
- return aPropSeq == other.aPropSeq;
+ return m_aPropSeq == other.m_aPropSeq;
}
bool SdrCustomShapeGeometryItem::operator<( const SfxPoolItem& rCmp ) const
@@ -247,32 +247,32 @@ bool SdrCustomShapeGeometryItem::operator<( const
SfxPoolItem& rCmp ) const
// so the ordering can be somewhat arbitrary).
UpdateHash();
other.UpdateHash();
- if( aHashState != other.aHashState )
- return aHashState < other.aHashState;
- if( aHashState == HashState::Valid )
- return aHash < other.aHash;
+ if( m_aHashState != other.m_aHashState )
+ return m_aHashState < other.m_aHashState;
+ if( m_aHashState == HashState::Valid )
+ return m_aHash < other.m_aHash;
- return comphelper::anyLess( css::uno::Any( aPropSeq ),
- css::uno::Any( other.aPropSeq ));
+ return comphelper::anyLess( css::uno::Any( m_aPropSeq ),
+ css::uno::Any( other.m_aPropSeq ));
}
void SdrCustomShapeGeometryItem::UpdateHash() const
{
- if( aHashState != HashState::Unknown )
+ if( m_aHashState != HashState::Unknown )
return;
- std::optional< size_t > hash = comphelper::anyToHash( css::uno::Any(
aPropSeq ));
+ std::optional< size_t > hash = comphelper::anyToHash( css::uno::Any(
m_aPropSeq ));
if( hash.has_value())
{
- aHash = *hash;
- aHashState = HashState::Valid;
+ m_aHash = *hash;
+ m_aHashState = HashState::Valid;
}
else
- aHashState = HashState::Unusable;
+ m_aHashState = HashState::Unusable;
}
void SdrCustomShapeGeometryItem::InvalidateHash()
{
- aHashState = HashState::Unknown;
+ m_aHashState = HashState::Unknown;
}
bool SdrCustomShapeGeometryItem::GetPresentation(
@@ -292,12 +292,12 @@ bool SdrCustomShapeGeometryItem::GetPresentation(
SdrCustomShapeGeometryItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool *
/*pPool*/ ) const
{
- return new SdrCustomShapeGeometryItem( aPropSeq );
+ return new SdrCustomShapeGeometryItem( m_aPropSeq );
}
bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8
/*nMemberId*/ ) const
{
- rVal <<= aPropSeq;
+ rVal <<= m_aPropSeq;
return true;
}
@@ -313,17 +313,17 @@ bool SdrCustomShapeGeometryItem::PutValue( const
uno::Any& rVal, sal_uInt8 /*nMe
void SdrCustomShapeGeometryItem::SetPropSeq( const css::uno::Sequence<
css::beans::PropertyValue >& rVal )
{
- if( aPropSeq == rVal )
+ if( m_aPropSeq == rVal )
return;
- aPropSeq = rVal;
- aPropHashMap.clear();
- aPropPairHashMap.clear();
- for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
+ m_aPropSeq = rVal;
+ m_aPropHashMap.clear();
+ m_aPropPairHashMap.clear();
+ for ( sal_Int32 i = 0; i < m_aPropSeq.getLength(); i++ )
{
- const beans::PropertyValue& rPropVal = aPropSeq[ i ];
+ const beans::PropertyValue& rPropVal = m_aPropSeq[ i ];
std::pair<PropertyHashMap::iterator, bool> const ret(
- aPropHashMap.insert(std::make_pair(rPropVal.Name, i)));
+ m_aPropHashMap.insert(std::make_pair(rPropVal.Name, i)));
assert(ret.second); // serious bug: duplicate xml attribute exported
if (!ret.second)
{
@@ -336,7 +336,7 @@ void SdrCustomShapeGeometryItem::SetPropSeq( const
css::uno::Sequence< css::bean
for ( sal_Int32 j = 0; j < rPropSeq->getLength(); j++ )
{
beans::PropertyValue const & rPropVal2 = (*rPropSeq)[ j ];
- aPropPairHashMap[ PropertyPair( rPropVal.Name, rPropVal2.Name
) ] = j;
+ m_aPropPairHashMap[ PropertyPair( rPropVal.Name,
rPropVal2.Name ) ] = j;
}
}
}
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 967ce9042c04..fac6d3bf376b 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -649,8 +649,8 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
void SdrFormatter::Undirty()
{
- const o3tl::Length eFrom = MapToO3tlLength(eSrcMU, o3tl::Length::invalid);
- const o3tl::Length eTo = MapToO3tlLength(eDstMU, o3tl::Length::invalid);
+ const o3tl::Length eFrom = MapToO3tlLength(m_eSrcMU,
o3tl::Length::invalid);
+ const o3tl::Length eTo = MapToO3tlLength(m_eDstMU, o3tl::Length::invalid);
if (eFrom != o3tl::Length::invalid && eTo != o3tl::Length::invalid)
{
const auto& [mul, div] = o3tl::getConversionMulDiv(eFrom, eTo);
@@ -671,16 +671,16 @@ void SdrFormatter::Undirty()
nComma++;
nDiv /= 10;
}
- nMul_ = nMul;
- nDiv_ = nDiv;
- nComma_ = nComma;
+ m_nMul = nMul;
+ m_nDiv = nDiv;
+ m_nComma = nComma;
}
else
{
- nMul_ = nDiv_ = 1;
- nComma_ = 0;
+ m_nMul = m_nDiv = 1;
+ m_nComma = 0;
}
- bDirty=false;
+ m_bDirty=false;
}
@@ -698,10 +698,10 @@ OUString SdrFormatter::GetStr(tools::Long nVal) const
SvtSysLocale aSysLoc;
const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
- if (bDirty)
+ if (m_bDirty)
const_cast<SdrFormatter*>(this)->Undirty();
- sal_Int16 nC(nComma_);
+ sal_Int16 nC(m_nComma);
if(bNeg)
nVal = -nVal;
@@ -718,8 +718,8 @@ OUString SdrFormatter::GetStr(tools::Long nVal) const
nC++;
}
- if(nMul_ != nDiv_)
- nVal = BigMulDiv(nVal, nMul_, nDiv_);
+ if(m_nMul != m_nDiv)
+ nVal = BigMulDiv(nVal, m_nMul, m_nDiv);
OUStringBuffer aStr = OUString::number(nVal);
