mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize also implementations created directly by generated function.

Browse Source 
This was forgotten in commit bdeb57c239.

Change-Id: Idd339222e3c464abc2524f78f16c8fe0a02dcd5b
This commit is contained in:
Matúš Kukan
2014-01-17 11:25:25 +01:00
parent d185daec68
commit a0ada918c1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
codemaker/source/cppumaker/cpputype.cxx
View File

@@ -3357,6 +3357,7 @@ void ServiceType::dumpHxxFile(
includes.addReference(); includes.addReference();
includes.addRtlUstringH(); includes.addRtlUstringH();
includes.addRtlUstringHxx(); includes.addRtlUstringHxx();
includes.add("com.sun.star.lang.XInitialization");
includes.add("com.sun.star.uno.DeploymentException"); includes.add("com.sun.star.uno.DeploymentException");
includes.add("com.sun.star.uno.XComponentContext"); includes.add("com.sun.star.uno.XComponentContext");
for (std::vector< for (std::vector<
@@ -3460,7 +3461,7 @@ void ServiceType::dumpHxxFile(
"LO_URE_CTOR_FUN_") "LO_URE_CTOR_FUN_")
<< name_.replaceAll(".", "_dot_") << name_.replaceAll(".", "_dot_")
<< (")(the_context.get(), ::css::uno::Sequence<" << (")(the_context.get(), ::css::uno::Sequence<"
" ::css::uno::Any >().get())), ::SAL_NO_ACQUIRE)," " ::css::uno::Any >())), ::SAL_NO_ACQUIRE),"
" ::css::uno::UNO_QUERY);\n#else\n") " ::css::uno::UNO_QUERY);\n#else\n")
<< indent() << "the_instance = ::css::uno::Reference< " << indent() << "the_instance = ::css::uno::Reference< "
<< scopedBaseName << scopedBaseName
@@ -3599,12 +3600,22 @@ void ServiceType::dumpHxxFile(
u2b(i->parameters.back().name), "param", u2b(i->parameters.back().name), "param",
codemaker::cpp::ITM_NONGLOBAL); codemaker::cpp::ITM_NONGLOBAL);
} else if (i->parameters.empty()) { } else if (i->parameters.empty()) {
o << ("::css::uno::Sequence< ::css::uno::Any >()"); o << "::css::uno::Sequence< ::css::uno::Any >()";
} else { } else {
o << "the_arguments"; o << "the_arguments";
} }
o << (".get())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);\n" o << ")), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);\n" << indent()
"#else\n") << ("::css::uno::Reference< ::css::lang::XInitialization > "
"init(the_instance, ::css::uno::UNO_QUERY);\n")
<< indent() << "if (init.is()) {\n"
<< indent() << " init->initialize(";
if (i->parameters.empty()) {
o << "::css::uno::Sequence< ::css::uno::Any >()";
} else {
o << "the_arguments";
}
o << ");\n" << indent() << "}\n";
o << ("#else\n")
<< indent() << "the_instance = ::css::uno::Reference< " << indent() << "the_instance = ::css::uno::Reference< "
<< scopedBaseName << scopedBaseName
<< (" >(the_context->getServiceManager()->" << (" >(the_context->getServiceManager()->"