summaryrefslogtreecommitdiff
path: root/forms/source/xforms/convert.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-21 11:48:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-21 13:00:02 +0100
commit55e42805ea796cc92d2e93dfce9200b9c13eaeb4 (patch)
treeb8543b0dd478ec2adf25fd199a9bf7d126bf824b /forms/source/xforms/convert.cxx
parent2dbd02b576f28224204ac962f6ce20fde6687093 (diff)
improve function-local statics in forms..reportdesign
Change-Id: I285e2e75c8d9cad35445c89f00ef68b155806ea2 Reviewed-on: https://gerrit.libreoffice.org/63703 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms/source/xforms/convert.cxx')
-rw-r--r--forms/source/xforms/convert.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index f82dfd9e0a7d..f00dd5e166db 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -288,12 +288,8 @@ void Convert::init()
Convert& Convert::get()
{
// create our Singleton instance on demand
- static Convert* pConvert = nullptr;
- if( pConvert == nullptr )
- pConvert = new Convert();
-
- OSL_ENSURE( pConvert != nullptr, "no converter?" );
- return *pConvert;
+ static Convert aConvert;
+ return aConvert;
}
bool Convert::hasType( const css::uno::Type& rType )