diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-21 13:49:22 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-21 13:49:22 +0100 |
| commit | 5fc2b31a91680c7e4548ff9ffcf2638a48639bea (patch) | |
| tree | bf370125585f46ff7a297ac1aa12f93e0f06dfe6 /sw/source/ui/chrdlg/ccoll.cxx | |
| parent | e488bbd9693d9162082dafc5ea8cea6085cdb372 (diff) | |
| parent | fdde737ea0caf7450a6676f46651f78ee05321ab (diff) | |
resync to DEV300_m70
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 } |