diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:56:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:56:24 +0000 |
| commit | 314c2a7d8b088ed6aff4188ed2e302679235ce00 (patch) | |
| tree | 6393a8c25ec0fe299f615bf43fbd8f504dc01fa0 /codemaker/source/commoncpp | |
| parent | 575f61be386f6a97aa0bf103368706d55f6b5149 (diff) | |
INTEGRATION: CWS jsc2 (1.2.8); FILE MERGED
2005/12/15 16:54:07 jsc 1.2.8.2: #i58329# return short name or default
2005/12/09 16:50:01 jsc 1.2.8.1: #i58320# prepare shortnames in dump cpp mode
Diffstat (limited to 'codemaker/source/commoncpp')
| -rw-r--r-- | codemaker/source/commoncpp/commoncpp.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 5810597fd313..4e36e010c553 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: commoncpp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2005-10-27 17:11:08 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:56:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,8 +59,12 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, sal_Int32 nPos = type.lastIndexOf( c ); if (nPos == -1) { nPos = type.lastIndexOf( '.' ); - if (nPos == -1) + if (nPos == -1) { + if (shortname && type.indexOf("::com::sun::star") == 0) + return type.replaceAt(0, 16, "css"); + return type; + } c = '.'; } if (bNoNameSpace) @@ -78,6 +82,8 @@ rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace, rtl::OString s(tmpBuf.makeStringAndClear()); if (s.indexOf("::com::sun::star") == 0) return s.replaceAt(0, 16, "css"); + else + return s; } return tmpBuf.makeStringAndClear(); |