extensions: Use appropriate OUString functions on string constants

Change-Id: I2476f409604d69e8e8ea1a132cd0a9169b5d435e

1 files changed, 18 insertions, 17 deletions

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 41c955dad78d..ca270ce04d18 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1014,39 +1014,39 @@ namespace pcr
         {
         case PROPERTY_ID_DEFAULT_SELECT_SEQ:
         case PROPERTY_ID_SELECTEDITEMS:
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SELECTION);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_SELECTION;
             break;
 
         case PROPERTY_ID_FILTER:
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILTER);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILTER;
             break;
 
         case PROPERTY_ID_SORT:
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ORDER);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_ORDER;
             break;
 
         case PROPERTY_ID_MASTERFIELDS:
         case PROPERTY_ID_DETAILFIELDS:
             nControlType = PropertyControlType::StringListField;
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FORMLINKFIELDS);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_FORMLINKFIELDS;
             break;
 
         case PROPERTY_ID_COMMAND:
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND;
             break;
 
         case PROPERTY_ID_TABINDEX:
         {
             Reference< XControlContainer > xControlContext( impl_getContextControlContainer_nothrow() );
             if ( xControlContext.is() )
-                aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_TABINDEX);
+                aDescriptor.PrimaryButtonId = UID_PROP_DLG_TABINDEX;
             nControlType = PropertyControlType::NumericField;
         };
         break;
 
         case PROPERTY_ID_FONT:
             bReadOnly = true;
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FONT_TYPE);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_FONT_TYPE;
             break;
 
         case PROPERTY_ID_TARGET_URL:
@@ -1054,8 +1054,9 @@ namespace pcr
         {
             aDescriptor.Control = new OFileUrlControl( impl_getDefaultDialogParent_nothrow(), WB_TABSTOP | WB_BORDER );
 
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(( PROPERTY_ID_TARGET_URL == nPropId )
-                ? UID_PROP_DLG_ATTR_TARGET_URL : UID_PROP_DLG_IMAGE_URL);
+            aDescriptor.PrimaryButtonId = PROPERTY_ID_TARGET_URL == nPropId
+                ? OUString(UID_PROP_DLG_ATTR_TARGET_URL)
+                : OUString(UID_PROP_DLG_IMAGE_URL);
         }
         break;
 
@@ -1072,13 +1073,13 @@ namespace pcr
             switch( nPropId )
             {
             case PROPERTY_ID_BACKGROUNDCOLOR:
-                aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BACKGROUNDCOLOR); break;
+                aDescriptor.PrimaryButtonId = UID_PROP_DLG_BACKGROUNDCOLOR; break;
             case PROPERTY_ID_FILLCOLOR:
-                aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_FILLCOLOR); break;
+                aDescriptor.PrimaryButtonId = UID_PROP_DLG_FILLCOLOR; break;
             case PROPERTY_ID_SYMBOLCOLOR:
-                aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SYMBOLCOLOR); break;
+                aDescriptor.PrimaryButtonId = UID_PROP_DLG_SYMBOLCOLOR; break;
             case PROPERTY_ID_BORDERCOLOR:
-                aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_BORDERCOLOR); break;
+                aDescriptor.PrimaryButtonId = UID_PROP_DLG_BORDERCOLOR; break;
             }
             break;
 
@@ -1102,7 +1103,7 @@ namespace pcr
 
         case PROPERTY_ID_CONTROLLABEL:
             bReadOnly = true;
-            aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_CONTROLLABEL);
+            aDescriptor.PrimaryButtonId = UID_PROP_DLG_CONTROLLABEL;
             break;
 
         case PROPERTY_ID_FORMATKEY:
@@ -1132,7 +1133,7 @@ namespace pcr
                         aDescriptor.Control = pControl;
                         pControl->SetFormatSupplier( pSupplier );
 
-                        aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_NUMBER_FORMAT);
+                        aDescriptor.PrimaryButtonId = UID_PROP_DLG_NUMBER_FORMAT;
                     }
                     else
                     {
@@ -1357,7 +1358,7 @@ namespace pcr
             // DataSource
             case PROPERTY_ID_DATASOURCE:
             {
-                aDescriptor.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE);
+                aDescriptor.PrimaryButtonId = UID_PROP_DLG_ATTR_DATASOURCE;
 
                 ::std::vector< OUString > aListEntries;
 
@@ -2455,7 +2456,7 @@ namespace pcr
             _out_rProperty.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_COMMAND );
 
             _out_rProperty.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_COMMAND ) );
-            _out_rProperty.PrimaryButtonId = OUString::createFromAscii(UID_PROP_DLG_SQLCOMMAND);
+            _out_rProperty.PrimaryButtonId = UID_PROP_DLG_SQLCOMMAND;
 
 
             sal_Int32 nCommandType = CommandType::COMMAND;