diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:42:51 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:42:51 +0000 |
| commit | feb1db85b2c9638deb2bec0b3788a6e953a19863 (patch) | |
| tree | e7b281c06a15b4e51bdbb1813ad275569ba03715 /svx | |
| parent | 599377f65d6c837cd68feb942dc5e21e0d8ff609 (diff) | |
INTEGRATION: CWS ause083 (1.10.22); FILE MERGED
2007/07/23 12:05:58 hjs 1.10.22.2: RESYNC: (1.10-1.11); FILE MERGED
2007/07/17 10:30:31 hjs 1.10.22.1: #i79470# cleanup to survive pch
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/hyphen.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/dialog/hyphen.cxx b/svx/source/dialog/hyphen.cxx index ad93a7906b1f..fc122633578e 100644 --- a/svx/source/dialog/hyphen.cxx +++ b/svx/source/dialog/hyphen.cxx @@ -4,9 +4,9 @@ * * $RCSfile: hyphen.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ihi $ $Date: 2007-07-12 10:54:49 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:42:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,8 +78,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::linguistic2; -#define S2U(s) StringToOUString(s, CHARSET_SYSTEM) -#define U2S(s) OUStringToString(s, CHARSET_SYSTEM) +#undef S2U +#undef U2S +//#define S2U(s) StringToOUString(s, CHARSET_SYSTEM) +//#define U2S(s) OUStringToString(s, CHARSET_SYSTEM) // define ---------------------------------------------------------------- |