diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 10:11:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-04 12:11:29 +0200 |
commit | efdf328a7147582d21da43966ed8afef2394d812 (patch) | |
tree | 89bc3f5051b9538340099db2bb29ffe7d2475eeb /forms/source/component/Edit.cxx | |
parent | 6b6df07d2fe6346bc5a6b32912abcb7694853e2a (diff) |
Just use Any ctor instead of makeAny in forms
Change-Id: I25183cc06728c81e45b28fd41071c15abf05bbc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133809
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'forms/source/component/Edit.cxx')
-rw-r--r-- | forms/source/component/Edit.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 00b22a797b92..6c7d83f20bf5 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -514,19 +514,19 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) aCurrentText = m_xAggregateSet->getPropertyValue(PROPERTY_TEXT); m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN) >>= nOldTextLen; - m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, makeAny(sal_Int16(0))); + m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, Any(sal_Int16(0))); } OEditBaseModel::write(_rxOutStream); if ( m_bMaxTextLenModified ) { // Reset again - m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, makeAny(nOldTextLen)); + m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, Any(nOldTextLen)); // and reset the text // First we set it to an empty string : Without this the second setPropertyValue would not do anything as it thinks // we aren't changing the prop (it didn't notify the - implicit - change of the text prop while setting the max text len) // This seems to be a bug with in toolkit's EditControl-implementation. - m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(OUString())); + m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, Any(OUString())); m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, aCurrentText); } } @@ -546,7 +546,7 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) && (getString(aDefaultControl) == STARDIV_ONE_FORM_CONTROL_TEXTFIELD ) ) { - m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( OUString(STARDIV_ONE_FORM_CONTROL_EDIT) ) ); + m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, Any( OUString(STARDIV_ONE_FORM_CONTROL_EDIT) ) ); // Older as well as current versions should understand this : the former knew only the STARDIV_ONE_FORM_CONTROL_EDIT, // the latter are registered for both STARDIV_ONE_FORM_CONTROL_EDIT and STARDIV_ONE_FORM_CONTROL_TEXTFIELD. } @@ -689,13 +689,13 @@ Any OEditModel::translateDbColumnToControlValue() } } - return aRet.hasValue() ? aRet : makeAny( OUString() ); + return aRet.hasValue() ? aRet : Any( OUString() ); } Any OEditModel::getDefaultForReset() const { - return makeAny( m_aDefaultText ); + return Any( m_aDefaultText ); } } |