diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:45:10 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:45:10 +0000 |
commit | f7b0a62757c75144b504a869c247750bdc872d58 (patch) | |
tree | f93e6da5ecbec0ab0e818766778f03f8fe0c3162 /svx/source/dialog | |
parent | 18e5ae76433bbe087fa309c5f7833d0176b37fbc (diff) |
INTEGRATION: CWS ause083 (1.17.22); FILE MERGED
2007/07/17 10:30:32 hjs 1.17.22.1: #i79470# cleanup to survive pch
Diffstat (limited to 'svx/source/dialog')
-rw-r--r-- | svx/source/dialog/thesdlg.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx index ac891a7eb886..2660bc67ab88 100644 --- a/svx/source/dialog/thesdlg.cxx +++ b/svx/source/dialog/thesdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: thesdlg.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2007-06-27 17:47:34 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:45:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,8 +85,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) // GetReplaceEditString ------------------------------- |