diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:16:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 08:26:40 +0100 |
| commit | a62c2a5fa5d5be465b0edab6adeb1fd16ace462f (patch) | |
| tree | 47cf29b4b7a0ba3ce321ce628a6b0a6175d978d7 /sc/source/ui/unoobj/tokenuno.cxx | |
| parent | cff72ec4bf87c6484be97d954966309ba7a5eb8a (diff) | |
Don't hold css::uno::Type instances by pointer
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the
arrays of such need to be initialized dynamically anyway, also change their name
members to proper OUStrings while at it. Plus some const clean-up.
Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
Diffstat (limited to 'sc/source/ui/unoobj/tokenuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/tokenuno.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index ff1b41731b12..a75c38be2935 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -51,12 +51,12 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_COMPILEFAP), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_COMPILEENGLISH), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_IGNORELEADING), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_FORMULACONVENTION), 0, &getCppuType(&sheet::AddressConvention::UNSPECIFIED), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_OPCODEMAP), 0, &getCppuType((uno::Sequence< sheet::FormulaOpCodeMapEntry >*)0), 0, 0 }, - {0,0,0,0,0,0} + {OUString(SC_UNO_COMPILEFAP), 0, getBooleanCppuType(), 0, 0 }, + {OUString(SC_UNO_COMPILEENGLISH), 0, getBooleanCppuType(), 0, 0 }, + {OUString(SC_UNO_IGNORELEADING), 0, getBooleanCppuType(), 0, 0 }, + {OUString(SC_UNO_FORMULACONVENTION), 0, getCppuType(&sheet::AddressConvention::UNSPECIFIED), 0, 0 }, + {OUString(SC_UNO_OPCODEMAP), 0, getCppuType((uno::Sequence< sheet::FormulaOpCodeMapEntry >*)0), 0, 0 }, + { OUString(), 0, css::uno::Type(), 0, 0 } }; return aFormulaParserMap_Impl; } |