diff options
Diffstat (limited to 'sw/source/ui/chrdlg/ccoll.cxx')
-rw-r--r-- | sw/source/ui/chrdlg/ccoll.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 44b144d28f4b..f2099aabdda1 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -156,7 +156,7 @@ TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem) ****************************************************************************/ -SwCondCollItem::SwCondCollItem(USHORT _nWhich ) : +SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) : SfxPoolItem(_nWhich) { @@ -188,11 +188,11 @@ SfxPoolItem* SwCondCollItem::Clone( SfxItemPool * /*pPool*/ ) const int SwCondCollItem::operator==( const SfxPoolItem& rItem) const { DBG_ASSERT( SfxPoolItem::operator==(rItem), "unterschiedliche Typen" ); - BOOL bReturn = TRUE; - for(USHORT i = 0; i < COND_COMMAND_COUNT; i++) + sal_Bool bReturn = sal_True; + for(sal_uInt16 i = 0; i < COND_COMMAND_COUNT; i++) if(sStyles[i] != ((SwCondCollItem&)rItem).sStyles[i]) { - bReturn = FALSE; + bReturn = sal_False; break; } @@ -204,7 +204,7 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const ****************************************************************************/ -const String& SwCondCollItem::GetStyle(USHORT nPos) const +const String& SwCondCollItem::GetStyle(sal_uInt16 nPos) const { return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr; } @@ -214,7 +214,7 @@ const String& SwCondCollItem::GetStyle(USHORT nPos) const ****************************************************************************/ -void SwCondCollItem::SetStyle(const String* pStyle, USHORT nPos) +void SwCondCollItem::SetStyle(const String* pStyle, sal_uInt16 nPos) { if( nPos < COND_COMMAND_COUNT ) sStyles[nPos] = pStyle ? *pStyle : aEmptyStr; |