diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:51:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:51:46 +0000 |
| commit | a96733513a8d04c46d36218bc2b22ee0f7cb2a74 (patch) | |
| tree | 12cca53631ec02474371881aeaa48c3f52a9d91f /unodevtools | |
| parent | 1d6cf55d6a25c090c12060de7a9ec753d90ce7ca (diff) | |
INTEGRATION: CWS jsc21 (1.10.2); FILE MERGED
2008/04/23 09:54:33 jsc 1.10.2.2: RESYNC: (1.10-1.11); FILE MERGED
2008/02/13 07:21:34 jsc 1.10.2.1: #i86052# move destructor to private
Diffstat (limited to 'unodevtools')
| -rw-r--r-- | unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 01b79317f039..c9866cd536f4 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cppcompskeleton.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -679,8 +679,7 @@ OString generateClassDefinition(std::ostream& o, o << "\n{\npublic:\n" << " explicit " << classname << "(" - << "css::uno::Reference< css::uno::XComponentContext > const & context);\n" - << " virtual ~" << classname << "() {}\n\n"; + << "css::uno::Reference< css::uno::XComponentContext > const & context);\n\n"; // generate component/service helper functions // o << " // component and service helper functions:\n" @@ -731,7 +730,9 @@ OString generateClassDefinition(std::ostream& o, } o << "private:\n " << classname << "(const " << classname << " &); // not defined\n" - << " " << classname << "& operator=(const " << classname << " &); // not defined\n\n"; + << " " << classname << "& operator=(const " << classname << " &); // not defined\n\n" + << " // destructor is private and will be called indirectly by the release call" + << " virtual ~" << classname << "() {}\n\n"; if (options.componenttype == 2) { o << " typedef std::hash_map< ::sal_Int32, rtl::OUString, " |