diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-08 17:45:08 +0200 |
| commit | 9222f5d065bb2aafcfef93e77c58a82672a9ad22 (patch) | |
| tree | 0dfad9f13099a73ecf3893e9cbdd5020b55cd7b3 /dbaccess | |
| parent | c4dca26eafd60dc4c4f19e0be0b8e086108b3048 (diff) | |
A UNO Any can't contain an Any
...and css::uno::makeAny<css::uno::Any>() was never meant to be used. Introduce
css::uno::toAny for the (template-code) cases that shall return an Any for both
Any and non-Any inputs.
Change-Id: Ifa977d73f1da71b2fedde7e8140b19497c4a0257
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index b23f85e4f861..159f0fbb646f 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -286,7 +286,7 @@ void OFieldDescription::SetDefaultValue(const Any& _rDefaultValue) try { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_DEFAULTVALUE) ) - m_xDest->setPropertyValue(PROPERTY_DEFAULTVALUE,makeAny(_rDefaultValue)); + m_xDest->setPropertyValue(PROPERTY_DEFAULTVALUE, _rDefaultValue); else m_aDefaultValue = _rDefaultValue; } @@ -301,7 +301,7 @@ void OFieldDescription::SetControlDefault(const Any& _rControlDefault) try { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_CONTROLDEFAULT) ) - m_xDest->setPropertyValue(PROPERTY_CONTROLDEFAULT,makeAny(_rControlDefault)); + m_xDest->setPropertyValue(PROPERTY_CONTROLDEFAULT, _rControlDefault); else m_aControlDefault = _rControlDefault; } |