diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-07 14:07:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-08 23:25:27 +0200 |
| commit | 40b4567be2ea4aca90677167e0251cfd05385055 (patch) | |
| tree | ead3bece658d38ab0aadf39b102db09a90898c16 /sw/source/ui/chrdlg | |
| parent | df7ffcdb022b0b30006aa8238ba4070eb4c64bd5 (diff) | |
sw: convert SwCondCollItem to OUString
Change-Id: Id3efca3f1cb555ec995973b8a5bdd2a78318e18f
Diffstat (limited to 'sw/source/ui/chrdlg')
| -rw-r--r-- | sw/source/ui/chrdlg/ccoll.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index a12d8d5c9968..7968527f30e3 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -162,7 +162,8 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const OSL_ENSURE( SfxPoolItem::operator==(rItem), "different types" ); sal_Bool bReturn = sal_True; for(sal_uInt16 i = 0; i < COND_COMMAND_COUNT; i++) - if(sStyles[i] != ((SwCondCollItem&)rItem).sStyles[i]) + if (m_sStyles[i] != + static_cast<SwCondCollItem const&>(rItem).m_sStyles[i]) { bReturn = sal_False; break; @@ -171,15 +172,16 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const return bReturn; } -const String& SwCondCollItem::GetStyle(sal_uInt16 nPos) const +OUString SwCondCollItem::GetStyle(sal_uInt16 const nPos) const { - return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr; + return (nPos < COND_COMMAND_COUNT) ? m_sStyles[nPos] : OUString(); } -void SwCondCollItem::SetStyle(const String* pStyle, sal_uInt16 nPos) +void +SwCondCollItem::SetStyle(OUString const*const pStyle, sal_uInt16 const nPos) { if( nPos < COND_COMMAND_COUNT ) - sStyles[nPos] = pStyle ? *pStyle : aEmptyStr; + m_sStyles[nPos] = (pStyle) ? *pStyle : OUString(); } const CommandStruct* SwCondCollItem::GetCmds() |