diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-12 13:57:35 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-02-12 13:57:35 +0100 |
| commit | 8523afb0a718df3218b9aa27380a62310744e3cc (patch) | |
| tree | c47f5dc0b09c825f8655a215c4dd79fe0fe45f92 /sw/source/ui/chrdlg/ccoll.cxx | |
| parent | 382d6a28327cd53e6fe1da612a1086b1e5242e20 (diff) | |
| parent | b36241988ea99ba2a9d290ec838a3557d0333d63 (diff) | |
cws tl74: merge
Diffstat (limited to 'sw/source/ui/chrdlg/ccoll.cxx')
| -rw-r--r-- | sw/source/ui/chrdlg/ccoll.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 25276c2cc4bc..e0e4826a93d4 100644 --- a/sw/source/ui/chrdlg/ccoll.cxx +++ b/sw/source/ui/chrdlg/ccoll.cxx @@ -209,11 +209,7 @@ int SwCondCollItem::operator==( const SfxPoolItem& rItem) const const String& SwCondCollItem::GetStyle(USHORT nPos) const { -#ifndef IRIX return nPos < COND_COMMAND_COUNT ? sStyles[nPos] : aEmptyStr; -#else - return nPos < COND_COMMAND_COUNT ? (String)sStyles[nPos] : aEmptyStr; -#endif } /**************************************************************************** @@ -224,11 +220,7 @@ const String& SwCondCollItem::GetStyle(USHORT nPos) const void SwCondCollItem::SetStyle(const String* pStyle, USHORT nPos) { if( nPos < COND_COMMAND_COUNT ) -#ifndef IRIX sStyles[nPos] = pStyle ? *pStyle : aEmptyStr; -#else - sStyles[nPos] = pStyle ? (String)*pStyle : aEmptyStr; -#endif } |