summaryrefslogtreecommitdiff
path: root/codemaker
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-01-22 19:57:09 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-01-23 11:41:29 +0100
commit22832569e1436171b8707be36365d9bdb7857c62 (patch)
tree8a69e417ca7010ba8d97c9846c143ee818a297df /codemaker
parent747ef9b682679272237698ad882729ec185126ce (diff)
Do not acquire again in direct constructor function calls.
Missing in c2c530da69152ff9192b9726aa95961803ce9b29 "Introduce static inline cppu::acquire(), and make use of that." Change-Id: I4a856eeaff1fce3f429c62c1897fe3898371d1ec
Diffstat (limited to 'codemaker')
-rw-r--r--codemaker/source/cppumaker/cpputype.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 4dbfd3a2a344..d3898d993b1b 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3463,7 +3463,7 @@ void ServiceType::dumpHxxFile(
"LO_URE_CTOR_FUN_")
<< name_.replaceAll(".", "_dot_")
<< (")(the_context.get(), ::css::uno::Sequence<"
- " ::css::uno::Any >()))),"
+ " ::css::uno::Any >())), ::SAL_NO_ACQUIRE),"
" ::css::uno::UNO_QUERY);\n#else\n")
<< indent() << "the_instance = ::css::uno::Reference< "
<< scopedBaseName
@@ -3606,7 +3606,7 @@ void ServiceType::dumpHxxFile(
} else {
o << "the_arguments";
}
- o << "))), ::css::uno::UNO_QUERY);\n" << indent()
+ o << ")), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);\n" << indent()
<< ("::css::uno::Reference< ::css::lang::XInitialization > "
"init(the_instance, ::css::uno::UNO_QUERY);\n")
<< indent() << "if (init.is()) {\n"