diff options
Diffstat (limited to 'forms/source/component/Columns.cxx')
| -rw-r--r-- | forms/source/component/Columns.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 3453b15169ed..1ba457d567a7 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -36,6 +36,7 @@ #include <services.hxx> #include <tools/debug.hxx> #include <o3tl/sorted_vector.hxx> +#include <utility> namespace frm @@ -45,7 +46,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::form; -using namespace ::com::sun::star::awt; using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; @@ -82,8 +82,8 @@ const css::uno::Sequence<OUString>& getColumnTypes() sal_Int32 getColumnTypeByModelName(const OUString& aModelName) { - static const OUStringLiteral aModelPrefix (u"com.sun.star.form.component."); - static const OUStringLiteral aCompatibleModelPrefix (u"stardiv.one.form.component."); + static constexpr OUString aModelPrefix (u"com.sun.star.form.component."_ustr); + static constexpr OUString aCompatibleModelPrefix (u"stardiv.one.form.component."_ustr); sal_Int32 nTypeId = -1; if (aModelName == FRM_COMPONENT_EDIT) @@ -186,11 +186,11 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) } -OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const OUString& _sModelName ) +OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, OUString _sModelName ) :OGridColumn_BASE(m_aMutex) ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper) - ,m_aHidden( makeAny( false ) ) - ,m_aModelName(_sModelName) + ,m_aHidden( Any( false ) ) + ,m_aModelName(std::move(_sModelName)) { // Create the UnoControlModel @@ -443,7 +443,7 @@ Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const case PROPERTY_ID_ALIGN: return Any(); case PROPERTY_ID_HIDDEN: - return makeAny(false); + return Any(false); default: return OPropertySetAggregationHelper::getPropertyDefaultByHandle(nHandle); } |