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/runtime | |
| 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/runtime')
| -rw-r--r-- | forms/source/runtime/formoperations.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index ae40c527b4d6..390319dad9df 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -105,7 +105,6 @@ namespace frm using namespace ::com::sun::star::sdb; using ::com::sun::star::form::XReset; using ::com::sun::star::beans::XMultiPropertySet; - using ::com::sun::star::uno::makeAny; using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::ui::dialogs::XExecutableDialog; using ::com::sun::star::beans::NamedValue; @@ -740,7 +739,7 @@ namespace frm // simply toggle the value bool bApplied = false; m_xCursorProperties->getPropertyValue( PROPERTY_APPLYFILTER ) >>= bApplied; - m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( !bApplied ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, Any( !bApplied ) ); // and reload weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent())); @@ -1551,7 +1550,7 @@ namespace frm weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent())); try { - m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_SORT, Any( m_xParser->getOrder() ) ); m_xLoadableForm->reload(); } catch( const Exception& ) @@ -1565,7 +1564,7 @@ namespace frm try { m_xParser->setOrder( sOriginalSort ); - m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_SORT, Any( m_xParser->getOrder() ) ); m_xLoadableForm->reload(); } catch( const Exception& ) @@ -1622,9 +1621,9 @@ namespace frm weld::WaitObject aWO(Application::GetFrameWeld(GetDialogParent())); try { - m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) ); - m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, makeAny( m_xParser->getHavingClause() ) ); - m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( true ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, Any( m_xParser->getFilter() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, Any( m_xParser->getHavingClause() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, Any( true ) ); m_xLoadableForm->reload(); } @@ -1640,9 +1639,9 @@ namespace frm { m_xParser->setFilter ( sOriginalFilter ); m_xParser->setHavingClause( sOriginalHaving ); - m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( bApplied ) ); - m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) ); - m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, makeAny( m_xParser->getHavingClause() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, Any( bApplied ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, Any( m_xParser->getFilter() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, Any( m_xParser->getHavingClause() ) ); m_xLoadableForm->reload(); } catch( const Exception& ) @@ -1709,11 +1708,11 @@ namespace frm weld::WaitObject aWO(Application::GetFrameWeld(xDialogParent)); if ( _bFilter ) { - m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) ); - m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, makeAny( m_xParser->getHavingClause() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, Any( m_xParser->getFilter() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_HAVINGCLAUSE, Any( m_xParser->getHavingClause() ) ); } else - m_xCursorProperties->setPropertyValue( PROPERTY_SORT, makeAny( m_xParser->getOrder() ) ); + m_xCursorProperties->setPropertyValue( PROPERTY_SORT, Any( m_xParser->getOrder() ) ); m_xLoadableForm->reload(); } |