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 /sw/source/ui/uno/unomailmerge.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 'sw/source/ui/uno/unomailmerge.cxx')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 89c896baee88..db9bf9d0e151 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -852,7 +852,6 @@ void SAL_CALL SwXMailMerge::setPropertyValue( else { void *pData = NULL; - const uno::Type* pType = pCur->pType; switch (pCur->nWID) { case WID_SELECTION : pData = &aSelection; break; @@ -889,7 +888,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue( default : OSL_FAIL("unknown WID"); } - Any aOld( pData, *pType ); + Any aOld( pData, pCur->aType ); bool bChanged = false; sal_Bool bOK = sal_True; |