Skip to content

C
core
Kaydet (Commit) 8ab1c610 authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

could not convert from ‘const char*’ to ‘rtl::OUString’ 

Since 3eb84bcb which apparently Clang
has no problem with.

Change-Id: I21af4e20dd116705e53d73a968fde478bff142bb
üst 47794c41
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 146 deletions
sdext/source/minimizer/configurationaccess.cxx
Dosyayı görüntüle @ 8ab1c610
...@@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla ...@@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
if ( rSettings.is() ) if ( rSettings.is() )
{ {
OUString pNames[] = { OUString pNames[] = {
"Name", OUString("Name"),
"JPEGCompression", OUString("JPEGCompression"),
"JPEGQuality", OUString("JPEGQuality"),
"RemoveCropArea", OUString("RemoveCropArea"),
"ImageResolution", OUString("ImageResolution"),
"EmbedLinkedGraphics", OUString("EmbedLinkedGraphics"),
"OLEOptimization", OUString("OLEOptimization"),
"OLEOptimizationType", OUString("OLEOptimizationType"),
"DeleteUnusedMasterPages", OUString("DeleteUnusedMasterPages"),
"DeleteHiddenSlides", OUString("DeleteHiddenSlides"),
"DeleteNotesPages", OUString("DeleteNotesPages"),
"SaveAs", OUString("SaveAs"),
// "SaveAsURL", // OUString("SaveAsURL"),
// "FilterName", // OUString("FilterName"),
"OpenNewDocument" }; OUString("OpenNewDocument") };
Any pValues[] = { Any pValues[] = {
Any( maName ), Any( maName ),
......
sdext/source/minimizer/informationdialog.cxx
Dosyayı görüntüle @ 8ab1c610
...@@ -62,14 +62,14 @@ OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString& ...@@ -62,14 +62,14 @@ OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString&
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Height", OUString("Height"),
"Label", OUString("Label"),
"MultiLine", OUString("MultiLine"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( nHeight ), Any( nHeight ),
...@@ -101,13 +101,13 @@ OUString InsertImage( ...@@ -101,13 +101,13 @@ OUString InsertImage(
sal_Bool bScale ) sal_Bool bScale )
{ {
OUString pNames[] = { OUString pNames[] = {
"Border", OUString("Border"),
"Height", OUString("Height"),
"ImageURL", OUString("ImageURL"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"ScaleImage", OUString("ScaleImage"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_Int16( 0 ) ), Any( sal_Int16( 0 ) ),
...@@ -131,14 +131,14 @@ OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString& ...@@ -131,14 +131,14 @@ OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString&
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"Label", OUString("Label"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
...@@ -165,15 +165,15 @@ OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rC ...@@ -165,15 +165,15 @@ OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rC
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, PPPOptimizerTokenEnum nResID )
{ {
OUString pNames[] = { OUString pNames[] = {
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"Label", OUString("Label"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"PushButtonType", OUString("PushButtonType"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
...@@ -217,13 +217,13 @@ void InformationDialog::InitDialog() ...@@ -217,13 +217,13 @@ void InformationDialog::InitDialog()
// setting the dialog properties // setting the dialog properties
OUString pNames[] = { OUString pNames[] = {
"Closeable", OUString("Closeable"),
"Height", OUString("Height"),
"Moveable", OUString("Moveable"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Title", OUString("Title"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
......
sdext/source/minimizer/optimizerdialog.cxx
Dosyayı görüntüle @ 8ab1c610
...@@ -54,13 +54,13 @@ void OptimizerDialog::InitDialog() ...@@ -54,13 +54,13 @@ void OptimizerDialog::InitDialog()
{ {
// setting the dialog properties // setting the dialog properties
OUString pNames[] = { OUString pNames[] = {
"Closeable", OUString("Closeable"),
"Height", OUString("Height"),
"Moveable", OUString("Moveable"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Title", OUString("Title"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
...@@ -86,12 +86,12 @@ void OptimizerDialog::InitRoadmap() ...@@ -86,12 +86,12 @@ void OptimizerDialog::InitRoadmap()
try try
{ {
OUString pNames[] = { OUString pNames[] = {
"Height", OUString("Height"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_Int32( DIALOG_HEIGHT - 26 ) ), Any( sal_Int32( DIALOG_HEIGHT - 26 ) ),
......
sdext/source/minimizer/optimizerdialogcontrols.cxx
Dosyayı görüntüle @ 8ab1c610
...@@ -64,12 +64,12 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo ...@@ -64,12 +64,12 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
{ {
OUString pNames[] = { OUString pNames[] = {
"Height", OUString("Height"),
"Orientation", OUString("Orientation"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( nHeight ), Any( nHeight ),
...@@ -95,15 +95,15 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr ...@@ -95,15 +95,15 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType )
{ {
OUString pNames[] = { OUString pNames[] = {
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"Label", OUString("Label"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"PushButtonType", OUString("PushButtonType"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( bEnabled ), Any( bEnabled ),
...@@ -132,14 +132,14 @@ OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rCo ...@@ -132,14 +132,14 @@ OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rCo
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, sal_Int16 nTabIndex ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Height", OUString("Height"),
"Label", OUString("Label"),
"MultiLine", OUString("MultiLine"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( nHeight ), Any( nHeight ),
...@@ -169,14 +169,14 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon ...@@ -169,14 +169,14 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"Label", OUString("Label"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
...@@ -206,17 +206,17 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString ...@@ -206,17 +206,17 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex ) double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"EffectiveMax", OUString("EffectiveMax"),
"EffectiveMin", OUString("EffectiveMin"),
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Repeat", OUString("Repeat"),
"Spin", OUString("Spin"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( fEffectiveMax ), Any( fEffectiveMax ),
...@@ -254,16 +254,16 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon ...@@ -254,16 +254,16 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Dropdown", OUString("Dropdown"),
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"LineCount", OUString("LineCount"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"StringItemList", OUString("StringItemList"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
...@@ -294,14 +294,14 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r ...@@ -294,14 +294,14 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r
const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex ) const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Height", OUString("Height"),
"Label", OUString("Label"),
"MultiLine", OUString("MultiLine"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( nHeight ), Any( nHeight ),
...@@ -331,17 +331,17 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont ...@@ -331,17 +331,17 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont
sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex )
{ {
OUString pNames[] = { OUString pNames[] = {
"Dropdown", OUString("Dropdown"),
"Enabled", OUString("Enabled"),
"Height", OUString("Height"),
"LineCount", OUString("LineCount"),
"MultiSelection", OUString("MultiSelection"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"Step", OUString("Step"),
"StringItemList", OUString("StringItemList"),
"TabIndex", OUString("TabIndex"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( sal_True ), Any( sal_True ),
...@@ -837,14 +837,14 @@ void OptimizerDialog::InitPage4() ...@@ -837,14 +837,14 @@ void OptimizerDialog::InitPage4()
{ {
{ // creating progress bar: { // creating progress bar:
OUString pNames[] = { OUString pNames[] = {
"Height", OUString("Height"),
"Name", OUString("Name"),
"PositionX", OUString("PositionX"),
"PositionY", OUString("PositionY"),
"ProgressValue", OUString("ProgressValue"),
"ProgressValueMax", OUString("ProgressValueMax"),
"ProgressValueMin", OUString("ProgressValueMin"),
"Width" }; OUString("Width") };
Any pValues[] = { Any pValues[] = {
Any( (sal_Int32)12 ), Any( (sal_Int32)12 ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment