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

Replace uses of rtl/instance.hxx with plain local static vars in configmgr

Browse Source 
Change-Id: Iebd72f1cfd2b3af54efaabba04a89d043eef28c8
Reviewed-on: https://gerrit.libreoffice.org/66405
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-01-15 19:05:35 +01:00
parent 77243437c4
commit 939d744cee
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configmgr/source/components.cxx
View File

@@ -48,7 +48,6 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <rtl/instance.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <sal/types.h> #include <sal/types.h>
#include <salhelper/thread.hxx> #include <salhelper/thread.hxx>
@@ -196,19 +195,12 @@ void Components::WriteThread::execute() {
reference_->clear(); reference_->clear();
} }
class theComponentsSingleton :
public rtl::StaticWithArg<
Components,
css::uno::Reference< css::uno::XComponentContext >,
theComponentsSingleton>
{
};
Components & Components::getSingleton( Components & Components::getSingleton(
css::uno::Reference< css::uno::XComponentContext > const & context) css::uno::Reference< css::uno::XComponentContext > const & context)
{ {
assert(context.is()); assert(context.is());
return theComponentsSingleton::get(context); static Components singleton(context);
return singleton;
} }
bool Components::allLocales(OUString const & locale) { bool Components::allLocales(OUString const & locale) {