toolkit: Use appropriate OUString functions on string constants

Change-Id: I3bb1e560eb325046f5b170da0c4c46c1139f3225

2 files changed, 5 insertions, 60 deletions

diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index f1d715565445..49df534f6faa 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -80,16 +80,16 @@ struct ImplPropertyInfo
 };
 
 #define DECL_PROP_1( asciiname, id, type, attrib1 ) \
-    ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 )
+    ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 )
 #define DECL_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
-    ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 )
+    ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 )
 #define DECL_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \
-    ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 )
+    ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 )
 
 #define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
-    ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true )
+    ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true )
 #define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \
-    ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true )
+    ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true )
 
 ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
 {
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 30f3afac0512..94a802e631fb 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -29,11 +29,7 @@ const sal_Char szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar";
 const sal_Char szServiceName_Pointer[] = "stardiv.vcl.Pointer";
 const sal_Char szServiceName2_Pointer[] = "com.sun.star.awt.Pointer";
 const sal_Char szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer";
-const sal_Char szServiceName2_UnoControlContainer[] = "com.sun.star.awt.UnoControlContainer";
-
-
 const sal_Char szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer";
-const sal_Char szServiceName2_UnoControlContainerModel[] = "com.sun.star.awt.UnoControlContainerModel";
 const sal_Char szServiceName_TabController[] = "stardiv.vcl.control.TabController";
 const sal_Char szServiceName2_TabController[] = "com.sun.star.awt.TabController";
 const sal_Char szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController";
@@ -45,105 +41,54 @@ const sal_Char szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoCon
 const sal_Char szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit";
 const sal_Char szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit";
 const sal_Char szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit";
-const sal_Char szServiceName2_UnoControlEditModel[] = "com.sun.star.awt.UnoControlEditModel";
 const sal_Char szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl";
-const sal_Char szServiceName2_UnoControlFileControl[] = "com.sun.star.awt.UnoControlFileControl";
 const sal_Char szServiceName_UnoControlFileControlModel[] = "stardiv.vcl.controlmodel.FileControl";
-const sal_Char szServiceName2_UnoControlFileControlModel[] = "com.sun.star.awt.UnoControlFileControlModel";
 const sal_Char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button";
-const sal_Char szServiceName2_UnoControlButton[] = "com.sun.star.awt.UnoControlButton";
 const sal_Char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button";
-const sal_Char szServiceName2_UnoControlButtonModel[] = "com.sun.star.awt.UnoControlButtonModel";
 const sal_Char szServiceName_UnoControlImageButton[] = "stardiv.vcl.control.ImageButton";
 const sal_Char szServiceName2_UnoControlImageButton[] = "com.sun.star.awt.UnoControlImageButton";
 const sal_Char szServiceName_UnoControlImageButtonModel[] = "stardiv.vcl.controlmodel.ImageButton";
 const sal_Char szServiceName2_UnoControlImageButtonModel[] = "com.sun.star.awt.UnoControlImageButtonModel";
 const sal_Char szServiceName_UnoControlImageControl[] = "stardiv.vcl.control.ImageControl";
-const sal_Char szServiceName2_UnoControlImageControl[] = "com.sun.star.awt.UnoControlImageControl";
 const sal_Char szServiceName_UnoControlImageControlModel[] = "stardiv.vcl.controlmodel.ImageControl";
-const sal_Char szServiceName2_UnoControlImageControlModel[] = "com.sun.star.awt.UnoControlImageControlModel";
 const sal_Char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton";
-const sal_Char szServiceName2_UnoControlRadioButton[] = "com.sun.star.awt.UnoControlRadioButton";
 const sal_Char szServiceName_UnoControlRadioButtonModel[] = "stardiv.vcl.controlmodel.RadioButton";
-const sal_Char szServiceName2_UnoControlRadioButtonModel[] = "com.sun.star.awt.UnoControlRadioButtonModel";
 const sal_Char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox";
-const sal_Char szServiceName2_UnoControlCheckBox[] = "com.sun.star.awt.UnoControlCheckBox";
 const sal_Char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox";
-const sal_Char szServiceName2_UnoControlCheckBoxModel[] = "com.sun.star.awt.UnoControlCheckBoxModel";
 const sal_Char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox";
-const sal_Char szServiceName2_UnoControlListBox[] = "com.sun.star.awt.UnoControlListBox";
 const sal_Char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox";
-const sal_Char szServiceName2_UnoControlListBoxModel[] = "com.sun.star.awt.UnoControlListBoxModel";
 const sal_Char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox";
-const sal_Char szServiceName2_UnoControlComboBox[] = "com.sun.star.awt.UnoControlComboBox";
 const sal_Char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox";
-const sal_Char szServiceName2_UnoControlComboBoxModel[] = "com.sun.star.awt.UnoControlComboBoxModel";
 const sal_Char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText";
-const sal_Char szServiceName2_UnoControlFixedText[] = "com.sun.star.awt.UnoControlFixedText";
-const sal_Char szServiceName_UnoControlFixedTextModel[] = "stardiv.vcl.controlmodel.FixedText";
-const sal_Char szServiceName2_UnoControlFixedTextModel[] = "com.sun.star.awt.UnoControlFixedTextModel";
 const sal_Char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox";
-const sal_Char szServiceName2_UnoControlGroupBox[] = "com.sun.star.awt.UnoControlGroupBox";
 const sal_Char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox";
-const sal_Char szServiceName2_UnoControlGroupBoxModel[] = "com.sun.star.awt.UnoControlGroupBoxModel";
 const sal_Char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField";
-const sal_Char szServiceName2_UnoControlDateField[] = "com.sun.star.awt.UnoControlDateField";
 const sal_Char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField";
-const sal_Char szServiceName2_UnoControlDateFieldModel[] = "com.sun.star.awt.UnoControlDateFieldModel";
 const sal_Char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField";
-const sal_Char szServiceName2_UnoControlTimeField[] = "com.sun.star.awt.UnoControlTimeField";
 const sal_Char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField";
-const sal_Char szServiceName2_UnoControlTimeFieldModel[] = "com.sun.star.awt.UnoControlTimeFieldModel";
 const sal_Char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField";
-const sal_Char szServiceName2_UnoControlNumericField[] = "com.sun.star.awt.UnoControlNumericField";
 const sal_Char szServiceName_UnoControlNumericFieldModel[] = "stardiv.vcl.controlmodel.NumericField";
-const sal_Char szServiceName2_UnoControlNumericFieldModel[] = "com.sun.star.awt.UnoControlNumericFieldModel";
 const sal_Char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField";
-const sal_Char szServiceName2_UnoControlCurrencyField[] = "com.sun.star.awt.UnoControlCurrencyField";
 const sal_Char szServiceName_UnoControlCurrencyFieldModel[] = "stardiv.vcl.controlmodel.CurrencyField";
-const sal_Char szServiceName2_UnoControlCurrencyFieldModel[] = "com.sun.star.awt.UnoControlCurrencyFieldModel";
 const sal_Char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField";
-const sal_Char szServiceName2_UnoControlPatternField[] = "com.sun.star.awt.UnoControlPatternField";
 const sal_Char szServiceName_UnoControlPatternFieldModel[] = "stardiv.vcl.controlmodel.PatternField";
-const sal_Char szServiceName2_UnoControlPatternFieldModel[] = "com.sun.star.awt.UnoControlPatternFieldModel";
 const sal_Char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField";
-const sal_Char szServiceName2_UnoControlFormattedField[] = "com.sun.star.awt.UnoControlFormattedField";
 const sal_Char szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField";
-const sal_Char szServiceName2_UnoControlFormattedFieldModel[] = "com.sun.star.awt.UnoControlFormattedFieldModel";
 const sal_Char szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection";
 const sal_Char szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection";
 const sal_Char szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer";
 const sal_Char szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer";
 const sal_Char szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar";
-const sal_Char szServiceName2_UnoControlProgressBar[] = "com.sun.star.awt.UnoControlProgressBar";
 const sal_Char szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar";
-const sal_Char szServiceName2_UnoControlProgressBarModel[] = "com.sun.star.awt.UnoControlProgressBarModel";
 const sal_Char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar";
-const sal_Char szServiceName2_UnoControlScrollBar[] = "com.sun.star.awt.UnoControlScrollBar";
 const sal_Char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar";
-const sal_Char szServiceName2_UnoControlScrollBarModel[] = "com.sun.star.awt.UnoControlScrollBarModel";
 const sal_Char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine";
-const sal_Char szServiceName2_UnoControlFixedLine[] = "com.sun.star.awt.UnoControlFixedLine";
 const sal_Char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine";
-const sal_Char szServiceName2_UnoControlFixedLineModel[] = "com.sun.star.awt.UnoControlFixedLineModel";
 const sal_Char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap";
-const sal_Char szServiceName2_UnoControlRoadmap[] = "com.sun.star.awt.UnoControlRoadmap";
 const sal_Char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap";
-const sal_Char szServiceName2_UnoControlRoadmapModel[] = "com.sun.star.awt.UnoControlRoadmapModel";
 const sal_Char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton";
 const sal_Char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel";
-const sal_Char szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage";
-const sal_Char szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
-const sal_Char szServiceName_UnoPageControl[] = "com.sun.star.awt.UnoControlPage";
-const sal_Char szServiceName_UnoPageModel[] = "com.sun.star.awt.UnoPageModel";
-const sal_Char szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFrame";
-const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
-const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
-const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
-const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
-const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
 const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
-const sal_Char szServiceName_GridControlModel[] = "com.sun.star.awt.grid.UnoControlGridModel";
 const sal_Char szServiceName_DefaultGridDataModel[] = "com.sun.star.awt.grid.DefaultGridDataModel";
 const sal_Char szServiceName_DefaultGridColumnModel[] = "com.sun.star.awt.grid.DefaultGridColumnModel";
 const sal_Char szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn";