diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 14:48:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 14:48:17 +0000 |
| commit | 7e57c0d911c6935e07e49da442856af9692df367 (patch) | |
| tree | c5f5c410cc63bf229776cfeb669965ed51523fee /unodevtools | |
| parent | bb1350309b7e56e423f833fef87aea5a1541cc70 (diff) | |
INTEGRATION: CWS jsc20 (1.9.22); FILE MERGED
2008/01/04 14:30:20 jsc 1.9.22.1: #i82699# changed copy constructor and assignment operator, move destructor to public
Diffstat (limited to 'unodevtools')
| -rw-r--r-- | unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 27eb8f50989c..a9b9ae30e4e7 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cppcompskeleton.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ihi $ $Date: 2006-12-20 12:43:05 $ + * last change: $Author: vg $ $Date: 2008-01-28 15:48:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -684,7 +684,8 @@ OString generateClassDefinition(std::ostream& o, o << "\n{\npublic:\n" << " explicit " << classname << "(" - << "css::uno::Reference< css::uno::XComponentContext > const & context);\n\n"; + << "css::uno::Reference< css::uno::XComponentContext > const & context);\n" + << " virtual ~" << classname << "() {}\n\n"; // generate component/service helper functions // o << " // component and service helper functions:\n" @@ -734,7 +735,8 @@ OString generateClassDefinition(std::ostream& o, it++; } - o << "private:\n"; + o << "private:\n " << classname << "(const " << classname << " &); // not defined\n" + << " " << classname << "& operator=(const " << classname << " &); // not defined\n\n"; if (options.componenttype == 2) { o << " typedef std::hash_map< ::sal_Int32, rtl::OUString, " @@ -746,10 +748,6 @@ OString generateClassDefinition(std::ostream& o, "throw (css::uno::RuntimeException);\n\n"; } - o << " " << classname << "(" << classname << " &); // not defined\n" - << " void operator =(" << classname << " &); // not defined\n\n" - << " virtual ~" << classname << "() {}\n\n"; - if (supportxcomponent) { o << " // overload WeakComponentImplHelperBase::disposing()\n" " // This function is called upon disposing the component,\n" |