diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-23 11:19:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-23 15:12:20 +0100 |
commit | b0543bb714e5a646dae0ede594df4a564e569951 (patch) | |
tree | 798e0a2a98c013e84ee44e5afd5545841a835b8c /toolkit | |
parent | d3faa9ea62ba62a71ee7bef68aab4636ed0e338b (diff) |
sal_Char->char in toolkit
Change-Id: I3016c8c672beb5a2d5f772f8a2ddc0047088e1da
Reviewed-on: https://gerrit.libreoffice.org/85743
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/accessiblecontrolcontext.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/grid/gridcolumn.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/grid/gridcolumn.hxx | 4 | ||||
-rw-r--r-- | toolkit/source/helper/servicenames.cxx | 146 |
5 files changed, 78 insertions, 78 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 27ceb86b5462..a7a9078ad6b4 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -800,7 +800,7 @@ WindowType ImplGetComponentType( const OUString& rServiceName ) struct MessageBoxTypeInfo { css::awt::MessageBoxType const eType; - const sal_Char *pName; + const char *pName; sal_Int32 const nLen; }; diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 39614d0a5916..a47f04d8906e 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -197,7 +197,7 @@ namespace toolkit } - OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) + OUString OAccessibleControlContext::getModelStringProperty( const char* _pPropertyName ) { OUString sReturn; try diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 5cada204bc77..1b7365468d65 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -77,7 +77,7 @@ namespace toolkit } - void GridColumn::broadcast_changed( sal_Char const * const i_asciiAttributeName, const Any& i_oldValue, const Any& i_newValue, + void GridColumn::broadcast_changed( char const * const i_asciiAttributeName, const Any& i_oldValue, const Any& i_newValue, ::comphelper::ComponentGuard& i_Guard ) { Reference< XInterface > const xSource( static_cast< ::cppu::OWeakObject* >( this ) ); diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx index 077a491e5295..6ff9d4fe73df 100644 --- a/toolkit/source/controls/grid/gridcolumn.hxx +++ b/toolkit/source/controls/grid/gridcolumn.hxx @@ -89,14 +89,14 @@ public: private: void broadcast_changed( - sal_Char const * const i_asciiAttributeName, + char const * const i_asciiAttributeName, const css::uno::Any& i_oldValue, const css::uno::Any& i_newValue, ::comphelper::ComponentGuard& i_Guard ); template< class TYPE > - void impl_set( TYPE & io_attribute, TYPE const & i_newValue, sal_Char const * i_attributeName ) + void impl_set( TYPE & io_attribute, TYPE const & i_newValue, char const * i_attributeName ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); if ( io_attribute == i_newValue ) diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index 94a802e631fb..c34f464c52da 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -20,78 +20,78 @@ #include <sal/types.h> #include <toolkit/helper/servicenames.hxx> -const sal_Char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit"; -const sal_Char szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit"; -const sal_Char szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu"; -const sal_Char szServiceName2_PopupMenu[] = "com.sun.star.awt.PopupMenu"; -const sal_Char szServiceName_MenuBar[] = "stardiv.vcl.MenuBar"; -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 szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer"; -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"; -const sal_Char szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel"; -const sal_Char szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog"; -const sal_Char szServiceName2_UnoControlDialog[] = "com.sun.star.awt.UnoControlDialog"; -const sal_Char szServiceName_UnoControlDialogModel[] = "stardiv.vcl.controlmodel.Dialog"; -const sal_Char szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoControlDialogModel"; -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 szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl"; -const sal_Char szServiceName_UnoControlFileControlModel[] = "stardiv.vcl.controlmodel.FileControl"; -const sal_Char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button"; -const sal_Char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button"; -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 szServiceName_UnoControlImageControlModel[] = "stardiv.vcl.controlmodel.ImageControl"; -const sal_Char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton"; -const sal_Char szServiceName_UnoControlRadioButtonModel[] = "stardiv.vcl.controlmodel.RadioButton"; -const sal_Char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox"; -const sal_Char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox"; -const sal_Char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox"; -const sal_Char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox"; -const sal_Char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox"; -const sal_Char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox"; -const sal_Char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText"; -const sal_Char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox"; -const sal_Char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox"; -const sal_Char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField"; -const sal_Char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField"; -const sal_Char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField"; -const sal_Char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField"; -const sal_Char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField"; -const sal_Char szServiceName_UnoControlNumericFieldModel[] = "stardiv.vcl.controlmodel.NumericField"; -const sal_Char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField"; -const sal_Char szServiceName_UnoControlCurrencyFieldModel[] = "stardiv.vcl.controlmodel.CurrencyField"; -const sal_Char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField"; -const sal_Char szServiceName_UnoControlPatternFieldModel[] = "stardiv.vcl.controlmodel.PatternField"; -const sal_Char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField"; -const sal_Char szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField"; -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 szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar"; -const sal_Char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar"; -const sal_Char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar"; -const sal_Char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine"; -const sal_Char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine"; -const sal_Char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap"; -const sal_Char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap"; -const sal_Char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton"; -const sal_Char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel"; -const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; -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"; -const sal_Char szServiceName_SortableGridDataModel[] = "com.sun.star.awt.grid.SortableGridDataModel"; +const char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit"; +const char szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit"; +const char szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu"; +const char szServiceName2_PopupMenu[] = "com.sun.star.awt.PopupMenu"; +const char szServiceName_MenuBar[] = "stardiv.vcl.MenuBar"; +const char szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar"; +const char szServiceName_Pointer[] = "stardiv.vcl.Pointer"; +const char szServiceName2_Pointer[] = "com.sun.star.awt.Pointer"; +const char szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer"; +const char szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer"; +const char szServiceName_TabController[] = "stardiv.vcl.control.TabController"; +const char szServiceName2_TabController[] = "com.sun.star.awt.TabController"; +const char szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController"; +const char szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel"; +const char szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog"; +const char szServiceName2_UnoControlDialog[] = "com.sun.star.awt.UnoControlDialog"; +const char szServiceName_UnoControlDialogModel[] = "stardiv.vcl.controlmodel.Dialog"; +const char szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoControlDialogModel"; +const char szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit"; +const char szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit"; +const char szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit"; +const char szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl"; +const char szServiceName_UnoControlFileControlModel[] = "stardiv.vcl.controlmodel.FileControl"; +const char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button"; +const char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button"; +const char szServiceName_UnoControlImageButton[] = "stardiv.vcl.control.ImageButton"; +const char szServiceName2_UnoControlImageButton[] = "com.sun.star.awt.UnoControlImageButton"; +const char szServiceName_UnoControlImageButtonModel[] = "stardiv.vcl.controlmodel.ImageButton"; +const char szServiceName2_UnoControlImageButtonModel[] = "com.sun.star.awt.UnoControlImageButtonModel"; +const char szServiceName_UnoControlImageControl[] = "stardiv.vcl.control.ImageControl"; +const char szServiceName_UnoControlImageControlModel[] = "stardiv.vcl.controlmodel.ImageControl"; +const char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton"; +const char szServiceName_UnoControlRadioButtonModel[] = "stardiv.vcl.controlmodel.RadioButton"; +const char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox"; +const char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox"; +const char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox"; +const char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox"; +const char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox"; +const char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox"; +const char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText"; +const char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox"; +const char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox"; +const char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField"; +const char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField"; +const char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField"; +const char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField"; +const char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField"; +const char szServiceName_UnoControlNumericFieldModel[] = "stardiv.vcl.controlmodel.NumericField"; +const char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField"; +const char szServiceName_UnoControlCurrencyFieldModel[] = "stardiv.vcl.controlmodel.CurrencyField"; +const char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField"; +const char szServiceName_UnoControlPatternFieldModel[] = "stardiv.vcl.controlmodel.PatternField"; +const char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField"; +const char szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField"; +const char szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection"; +const char szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection"; +const char szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer"; +const char szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer"; +const char szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar"; +const char szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar"; +const char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar"; +const char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar"; +const char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine"; +const char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine"; +const char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap"; +const char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap"; +const char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton"; +const char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel"; +const char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid"; +const char szServiceName_DefaultGridDataModel[] = "com.sun.star.awt.grid.DefaultGridDataModel"; +const char szServiceName_DefaultGridColumnModel[] = "com.sun.star.awt.grid.DefaultGridColumnModel"; +const char szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn"; +const char szServiceName_SortableGridDataModel[] = "com.sun.star.awt.grid.SortableGridDataModel"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |