summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-02-12 13:30:06 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-02-13 11:26:31 +0100
commit924a415e68cfeb8eda54db3e19f71eafcd2b9b1e (patch)
treeaf16bde540037c7dbbade1f52ebc3f2f32f05e9f /framework
parenteb1799714c7f57cbb8006d33736cd5e088ed6558 (diff)
cosmetics
Change-Id: Ice4f20db3a590568a7ae4ae59fa0c4ff13e59051
Diffstat (limited to 'framework')
-rw-r--r--framework/source/jobs/jobexecutor.cxx5
-rw-r--r--framework/source/services/autorecovery.cxx3
-rw-r--r--framework/source/uiconfiguration/uicategorydescription.cxx3
3 files changed, 6 insertions, 5 deletions
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 077a39f173bc..c595f5cd1c64 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -429,9 +429,8 @@ com_sun_star_comp_framework_JobExecutor_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
- css::uno::XInterface *inst = Singleton::get(context).instance.get();
- inst->acquire();
- return inst;
+ return cppu::acquire(static_cast<cppu::OWeakObject *>(
+ Singleton::get(context).instance.get()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index faf8e86cbb57..01519ba09fee 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -4562,7 +4562,8 @@ com_sun_star_comp_framework_AutoRecovery_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(static_cast<cppu::OWeakObject *>(Singleton::get(context).instance.get()));
+ return cppu::acquire(static_cast<cppu::OWeakObject *>(
+ Singleton::get(context).instance.get()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 43ee09b4bfcb..58023cb983b0 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -463,7 +463,8 @@ com_sun_star_comp_framework_UICategoryDescription_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(static_cast<cppu::OWeakObject *>(Singleton::get(context).instance.get()));
+ return cppu::acquire(static_cast<cppu::OWeakObject *>(
+ Singleton::get(context).instance.get()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */