diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:23:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:23:34 +0000 |
| commit | c2828a5ef4f2a586697d06d37fa4776d80f2ae77 (patch) | |
| tree | 22afb489ca54cc8ef92c6beeeac2725cfa048277 /codemaker/source/commoncpp | |
| parent | 31b7525644f006069b9460b176e0da1c5e3cdd36 (diff) | |
INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED
2006/04/20 08:10:37 sb 1.4.4.1: #i53898# Made code warning-free again after resync to SRC680m162.
Diffstat (limited to 'codemaker/source/commoncpp')
| -rw-r--r-- | codemaker/source/commoncpp/commoncpp.cxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 25a9a5237105..06b9eb465957 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: commoncpp.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: vg $ $Date: 2006-03-15 09:12:25 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:23:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,7 +59,7 @@ rtl::OString typeToPrefix(TypeManager const & manager, rtl::OString const & type typeclass == RT_TYPE_PUBLISHED) return rtl::OString("_"); - static char* const typeclassPrefix[RT_TYPE_UNION + 1] = { + static char const * const typeclassPrefix[RT_TYPE_UNION + 1] = { "invalid", /* RT_TYPE_INVALID, is here only as placeholder */ "interface", /* RT_TYPE_INTERFACE */ "module", /* RT_TYPE_MODULE */ @@ -77,8 +77,7 @@ rtl::OString typeToPrefix(TypeManager const & manager, rtl::OString const & type return rtl::OString(typeclassPrefix[typeclass]); } -rtl::OString scopedCppName(TypeManager const & manager, - rtl::OString const & type, bool bNoNameSpace, +rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, bool shortname) { char c('/'); @@ -98,16 +97,6 @@ rtl::OString scopedCppName(TypeManager const & manager, do { tmpBuf.append("::"); -// rtl::OString token(type.getToken(0, c, nPos)); -// rtl::OString prefix; -// if (nPos != -1) -// prefix = typeToPrefix(manager, type.copy(0, nPos-1)); -// else -// prefix = typeToPrefix(manager, type); - -// tmpBuf.append(translateUnoToCppIdentifier( -// token, prefix, ITM_KEYWORDSONLY)); - tmpBuf.append(type.getToken(0, c, nPos)); } while( nPos != -1 ); @@ -138,7 +127,7 @@ rtl::OString translateUnoToCppType( buf.append(nucleus); } } else { - static char* const cppTypes[codemaker::UnoType::SORT_ANY + 1] = { + static char const * const cppTypes[codemaker::UnoType::SORT_ANY + 1] = { "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16", "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", "float", "double", "::sal_Unicode", "::rtl::OUString", |