summaryrefslogtreecommitdiff
path: root/unodevtools
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-12-28 17:01:38 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-12-28 17:01:38 +0000
commitdc65d628749cfd222637207ddbeb7937f7c1265a (patch)
tree6b374339a7d503323c2cac44a7c3cb19eaa76ae3 /unodevtools
parent0ac9e7f0d1c623c0572dba2617e4f58e3b5a571e (diff)
INTEGRATION: CWS jsc2 (1.3.4); FILE MERGED
2005/12/15 16:51:00 jsc 1.3.4.1: #i58329# dump abbreviated namespace
Diffstat (limited to 'unodevtools')
-rw-r--r--unodevtools/source/skeletonmaker/cpptypemaker.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index d43ba1b666a0..241bb37ffe2b 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: cpptypemaker.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: jsc $ $Date: 2005-10-21 13:52:35 $
+ * last change: $Author: hr $ $Date: 2005-12-28 18:01:38 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -155,7 +155,7 @@ bool printConstructorParameters(std::ostream & o,
printType(o,
options, manager,
codemaker::convertString(reader.getFieldTypeName(i)),
- 4);
+ 4, options.shortnames);
} else if (arguments.empty()) {
o << "java.lang.Object";
} else {
@@ -168,7 +168,8 @@ bool printConstructorParameters(std::ostream & o,
}
// assume std::vector< OString >::size_type is at least as
// large as sal_uInt16:
- printType(o, options, manager, arguments[tparam], 4);
+ printType(o, options, manager, arguments[tparam], 4,
+ options.shortnames);
}
o << ' '
<< (codemaker::cpp::translateUnoToCppIdentifier(
@@ -568,7 +569,7 @@ void printServiceMembers(std::ostream & o,
codemaker::convertString(reader.getFieldTypeName(i)));
o << "// private ";
- printType(o, options, manager, fieldType, 1);
+ printType(o, options, manager, fieldType, 1, options.shortnames);
o << " "
<< codemaker::cpp::translateUnoToCppIdentifier(
fieldName, "property").getStr()
@@ -732,7 +733,7 @@ void generateDocumentation(std::ostream & o,
codemaker::GeneratedTypeSet generated;
printMethods(o, options, manager, reader, generated,
- delegate, options.implname);
+ delegate, options.implname, "", options.shortnames);
}
break;