strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Since 3eb84bcb45 which apparently Clang
has no problem with.

Change-Id: I21af4e20dd116705e53d73a968fde478bff142bb
This commit is contained in:
Eike Rathke 2013-10-15 16:59:36 +02:00
parent 47794c41b1
commit 8ab1c6103d
4 changed files with 146 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sdext/source/minimizer/configurationaccess.cxx
View file

@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
if ( rSettings.is() )
{
OUString pNames[] = {
"Name",
"JPEGCompression",
"JPEGQuality",
"RemoveCropArea",
"ImageResolution",
"EmbedLinkedGraphics",
"OLEOptimization",
"OLEOptimizationType",
"DeleteUnusedMasterPages",
"DeleteHiddenSlides",
"DeleteNotesPages",
"SaveAs",
// "SaveAsURL",
// "FilterName",
"OpenNewDocument" };
OUString("Name"),
OUString("JPEGCompression"),
OUString("JPEGQuality"),
OUString("RemoveCropArea"),
OUString("ImageResolution"),
OUString("EmbedLinkedGraphics"),
OUString("OLEOptimization"),
OUString("OLEOptimizationType"),
OUString("DeleteUnusedMasterPages"),
OUString("DeleteHiddenSlides"),
OUString("DeleteNotesPages"),
OUString("SaveAs"),
// OUString("SaveAsURL"),
// OUString("FilterName"),
OUString("OpenNewDocument") };
Any pValues[] = {
Any( maName ),

78
sdext/source/minimizer/informationdialog.cxx
View file

@ -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 )
{
OUString pNames[] = {
"Height",
"Label",
"MultiLine",
"PositionX",
"PositionY",
"Step",
"TabIndex",
"Width" };
OUString("Height"),
OUString("Label"),
OUString("MultiLine"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( nHeight ),
@ -101,13 +101,13 @@ OUString InsertImage(
sal_Bool bScale )
{
OUString pNames[] = {
"Border",
"Height",
"ImageURL",
"PositionX",
"PositionY",
"ScaleImage",
"Width" };
OUString("Border"),
OUString("Height"),
OUString("ImageURL"),
OUString("PositionX"),
OUString("PositionY"),
OUString("ScaleImage"),
OUString("Width") };
Any pValues[] = {
Any( sal_Int16( 0 ) ),
@ -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 )
{
OUString pNames[] = {
"Enabled",
"Height",
"Label",
"PositionX",
"PositionY",
"Step",
"TabIndex",
"Width" };
OUString("Enabled"),
OUString("Height"),
OUString("Label"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),
@ -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 )
{
OUString pNames[] = {
"Enabled",
"Height",
"Label",
"PositionX",
"PositionY",
"PushButtonType",
"Step",
"TabIndex",
"Width" };
OUString("Enabled"),
OUString("Height"),
OUString("Label"),
OUString("PositionX"),
OUString("PositionY"),
OUString("PushButtonType"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),
@ -217,13 +217,13 @@ void InformationDialog::InitDialog()
// setting the dialog properties
OUString pNames[] = {
"Closeable",
"Height",
"Moveable",
"PositionX",
"PositionY",
"Title",
"Width" };
OUString("Closeable"),
OUString("Height"),
OUString("Moveable"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Title"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),

26
sdext/source/minimizer/optimizerdialog.cxx
View file

@ -54,13 +54,13 @@ void OptimizerDialog::InitDialog()
{
// setting the dialog properties
OUString pNames[] = {
"Closeable",
"Height",
"Moveable",
"PositionX",
"PositionY",
"Title",
"Width" };
OUString("Closeable"),
OUString("Height"),
OUString("Moveable"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Title"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),
@ -86,12 +86,12 @@ void OptimizerDialog::InitRoadmap()
try
{
OUString pNames[] = {
"Height",
"PositionX",
"PositionY",
"Step",
"TabIndex",
"Width" };
OUString("Height"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( sal_Int32( DIALOG_HEIGHT - 26 ) ),

158
sdext/source/minimizer/optimizerdialogcontrols.cxx
View file

@ -64,12 +64,12 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
{
OUString pNames[] = {
"Height",
"Orientation",
"PositionX",
"PositionY",
"Step",
"Width" };
OUString("Height"),
OUString("Orientation"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("Width") };
Any pValues[] = {
Any( nHeight ),
@ -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 )
{
OUString pNames[] = {
"Enabled",
"Height",
"Label",
"PositionX",
"PositionY",
"PushButtonType",
"Step",
"TabIndex",
"Width" };
OUString("Enabled"),
OUString("Height"),
OUString("Label"),
OUString("PositionX"),
OUString("PositionY"),
OUString("PushButtonType"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( bEnabled ),
@ -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 )
{
OUString pNames[] = {
"Height",
"Label",
"MultiLine",
"PositionX",
"PositionY",
"Step",
"TabIndex",
"Width" };
OUString("Height"),
OUString("Label"),
OUString("MultiLine"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( nHeight ),
@ -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 )
{
OUString pNames[] = {
"Enabled",
"Height",
"Label",
"PositionX",
"PositionY",
"Step",
"TabIndex",
"Width" };
OUString("Enabled"),
OUString("Height"),
OUString("Label"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),
@ -206,17 +206,17 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex )
{
OUString pNames[] = {
"EffectiveMax",
"EffectiveMin",
"Enabled",
"Height",
"PositionX",
"PositionY",
"Repeat",
"Spin",
"Step",
"TabIndex",
"Width" };
OUString("EffectiveMax"),
OUString("EffectiveMin"),
OUString("Enabled"),
OUString("Height"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Repeat"),
OUString("Spin"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( fEffectiveMax ),
@ -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 )
{
OUString pNames[] = {
"Dropdown",
"Enabled",
"Height",
"LineCount",
"PositionX",
"PositionY",
"Step",
"StringItemList",
"TabIndex",
"Width" };
OUString("Dropdown"),
OUString("Enabled"),
OUString("Height"),
OUString("LineCount"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("StringItemList"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),
@ -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 )
{
OUString pNames[] = {
"Height",
"Label",
"MultiLine",
"PositionX",
"PositionY",
"Step",
"TabIndex",
"Width" };
OUString("Height"),
OUString("Label"),
OUString("MultiLine"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( nHeight ),
@ -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 )
{
OUString pNames[] = {
"Dropdown",
"Enabled",
"Height",
"LineCount",
"MultiSelection",
"PositionX",
"PositionY",
"Step",
"StringItemList",
"TabIndex",
"Width" };
OUString("Dropdown"),
OUString("Enabled"),
OUString("Height"),
OUString("LineCount"),
OUString("MultiSelection"),
OUString("PositionX"),
OUString("PositionY"),
OUString("Step"),
OUString("StringItemList"),
OUString("TabIndex"),
OUString("Width") };
Any pValues[] = {
Any( sal_True ),
@ -837,14 +837,14 @@ void OptimizerDialog::InitPage4()
{
{ // creating progress bar:
OUString pNames[] = {
"Height",
"Name",
"PositionX",
"PositionY",
"ProgressValue",
"ProgressValueMax",
"ProgressValueMin",
"Width" };
OUString("Height"),
OUString("Name"),
OUString("PositionX"),
OUString("PositionY"),
OUString("ProgressValue"),
OUString("ProgressValueMax"),
OUString("ProgressValueMin"),
OUString("Width") };
Any pValues[] = {
Any( (sal_Int32)12 ),