diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:01:54 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:01:54 +0100 |
| commit | 8bfd7efc07f735520771ff50eb044835602567c8 (patch) | |
| tree | de1e2e39f95f01a32bc3273c2d8c761ce3004f81 | |
| parent | 382d9d48dd6edf55504b165d6b8d7bd7e0c52b83 (diff) | |
| parent | 588ab4c41627d18c063c40871f8f5c8c81923ad7 (diff) | |
CWS-TOOLING: integrate CWS sb116
| -rw-r--r-- | sw/source/ui/chrdlg/ccoll.cxx | 8 | ||||
| -rw-r--r-- | sw/util/makefile.mk | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index 6045cf87b5..c76e64381b 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 } diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index fc1ff731b4..08afadc106 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -43,10 +43,6 @@ USE_DEFFILE=TRUE # --- Allgemein ----------------------------------------------------------- -.IF "$(OS)"=="IRIX" -LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=40 -.ENDIF - sw_res_files= \ $(SRS)$/app.srs \ $(SRS)$/dialog.srs \ |