1 files changed, 24 insertions, 17 deletions

diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 6e94aa0d1eb3..8ebfe136dac7 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/VetoException.hpp>
 #include <cppuhelper/typeprovider.hxx>
+#include <utility>
 
 
 namespace pcr
@@ -56,12 +57,12 @@ namespace pcr
 
 
     FormController::FormController( const Reference< XComponentContext >& _rxContext,
-            const OUString& sImplementationName,
+            OUString sImplementationName,
             const css::uno::Sequence<OUString>& aSupportedServiceNames,
             bool _bUseFormFormComponentHandlers )
         :OPropertyBrowserController( _rxContext )
         ,FormController_PropertyBase1( m_aBHelper )
-        ,m_sImplementationName( sImplementationName )
+        ,m_sImplementationName(std::move( sImplementationName ))
         ,m_aSupportedServiceNames( aSupportedServiceNames )
     {
         osl_atomic_increment( &m_refCount );
@@ -130,13 +131,13 @@ namespace pcr
         Sequence< Property > aProps{
             Property(
                 PROPERTY_CURRENTPAGE,
-                OWN_PROPERTY_ID_CURRENTPAGE,
+                static_cast<sal_Int32>(OwnPropertyId::CURRENTPAGE),
                 ::cppu::UnoType<OUString>::get(),
                 PropertyAttribute::TRANSIENT
             ),
             Property(
                 PROPERTY_INTROSPECTEDOBJECT,
-                OWN_PROPERTY_ID_INTROSPECTEDOBJECT,
+                static_cast<sal_Int32>(OwnPropertyId::INTROSPECTEDOBJECT),
                 cppu::UnoType<XPropertySet>::get(),
                 PropertyAttribute::TRANSIENT | PropertyAttribute::CONSTRAINED
             )
@@ -147,16 +148,18 @@ namespace pcr
 
     sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue )
     {
-        switch ( nHandle )
+        switch ( static_cast<OwnPropertyId>(nHandle) )
         {
-        case OWN_PROPERTY_ID_INTROSPECTEDOBJECT:
+        case OwnPropertyId::INTROSPECTEDOBJECT:
             if ( rValue.getValueTypeClass() != TypeClass_INTERFACE )
                 throw IllegalArgumentException();
             break;
-        case OWN_PROPERTY_ID_CURRENTPAGE:
+        case OwnPropertyId::CURRENTPAGE:
             if ( rValue.getValueTypeClass() != TypeClass_STRING )
                 throw IllegalArgumentException();
             break;
+        default:
+            break;
         }
 
         getFastPropertyValue( rOldValue, nHandle );
@@ -167,9 +170,9 @@ namespace pcr
 
     void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
     {
-        switch ( _nHandle )
+        switch ( static_cast<OwnPropertyId>(_nHandle) )
         {
-        case OWN_PROPERTY_ID_INTROSPECTEDOBJECT:
+        case OwnPropertyId::INTROSPECTEDOBJECT:
         {
             Reference< XObjectInspectorModel > xModel( getInspectorModel() );
             if ( xModel.is() )
@@ -193,24 +196,28 @@ namespace pcr
             }
         }
         break;
-        case OWN_PROPERTY_ID_CURRENTPAGE:
+        case OwnPropertyId::CURRENTPAGE:
             restoreViewData( _rValue );
             break;
+        default:
+            break;
         }
     }
 
 
     void SAL_CALL FormController::getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const
     {
-        switch ( nHandle )
+        switch ( static_cast<OwnPropertyId>(nHandle) )
         {
-        case OWN_PROPERTY_ID_INTROSPECTEDOBJECT:
+        case OwnPropertyId::INTROSPECTEDOBJECT:
             rValue <<= m_xCurrentInspectee;
             break;
 
-        case OWN_PROPERTY_ID_CURRENTPAGE:
+        case OwnPropertyId::CURRENTPAGE:
             rValue = const_cast< FormController* >( this )->getViewData();
             break;
+        default:
+            break;
         }
     }
 
@@ -223,8 +230,8 @@ extensions_propctrlr_FormController_get_implementation(
     css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&)
 {
     return cppu::acquire(new pcr::FormController( context,
-                "org.openoffice.comp.extensions.FormController",
-                { "com.sun.star.form.PropertyBrowserController" },
+                u"org.openoffice.comp.extensions.FormController"_ustr,
+                { u"com.sun.star.form.PropertyBrowserController"_ustr },
                 true ) );
 }
 
@@ -233,8 +240,8 @@ extensions_propctrlr_DialogController_get_implementation(
     css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&)
 {
     return cppu::acquire(new pcr::FormController( context,
-            "org.openoffice.comp.extensions.DialogController",
-            { "com.sun.star.awt.PropertyBrowserController" },
+            u"org.openoffice.comp.extensions.DialogController"_ustr,
+            { u"com.sun.star.awt.PropertyBrowserController"_ustr },
             false ) );
 }