Kaydet (Commit) 2d4922da authored tarafından Noel Grandin's avatar Noel Grandin

convert sc/.../solveroptions.hxx from String to OUString

Change-Id: I2f00c298acfa79403d3e5e596b1c2e6cf6d84128
üst f164e012
...@@ -50,7 +50,7 @@ class ScSolverOptionsDialog : public ModalDialog ...@@ -50,7 +50,7 @@ class ScSolverOptionsDialog : public ModalDialog
SvLBoxButtonData* mpCheckButtonData; SvLBoxButtonData* mpCheckButtonData;
com::sun::star::uno::Sequence<OUString> maImplNames; com::sun::star::uno::Sequence<OUString> maImplNames;
com::sun::star::uno::Sequence<OUString> maDescriptions; com::sun::star::uno::Sequence<OUString> maDescriptions;
String maEngine; OUString maEngine;
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties;
DECL_LINK( EngineSelectHdl, void* ); DECL_LINK( EngineSelectHdl, void* );
...@@ -66,11 +66,11 @@ public: ...@@ -66,11 +66,11 @@ public:
ScSolverOptionsDialog( Window* pParent, ScSolverOptionsDialog( Window* pParent,
const com::sun::star::uno::Sequence<OUString>& rImplNames, const com::sun::star::uno::Sequence<OUString>& rImplNames,
const com::sun::star::uno::Sequence<OUString>& rDescriptions, const com::sun::star::uno::Sequence<OUString>& rDescriptions,
const String& rEngine, const OUString& rEngine,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties ); const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProperties );
~ScSolverOptionsDialog(); ~ScSolverOptionsDialog();
const String& GetEngine() const; const OUString& GetEngine() const;
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties();
}; };
...@@ -87,7 +87,7 @@ public: ...@@ -87,7 +87,7 @@ public:
ScSolverIntegerDialog( Window * pParent ); ScSolverIntegerDialog( Window * pParent );
~ScSolverIntegerDialog(); ~ScSolverIntegerDialog();
void SetOptionName( const String& rName ); void SetOptionName( const OUString& rName );
void SetValue( sal_Int32 nValue ); void SetValue( sal_Int32 nValue );
sal_Int32 GetValue() const; sal_Int32 GetValue() const;
}; };
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
ScSolverValueDialog( Window * pParent ); ScSolverValueDialog( Window * pParent );
~ScSolverValueDialog(); ~ScSolverValueDialog();
void SetOptionName( const String& rName ); void SetOptionName( const OUString& rName );
void SetValue( double fValue ); void SetValue( double fValue );
double GetValue() const; double GetValue() const;
}; };
......
...@@ -111,7 +111,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const ...@@ -111,7 +111,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const
ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent,
const uno::Sequence<OUString>& rImplNames, const uno::Sequence<OUString>& rImplNames,
const uno::Sequence<OUString>& rDescriptions, const uno::Sequence<OUString>& rDescriptions,
const String& rEngine, const OUString& rEngine,
const uno::Sequence<beans::PropertyValue>& rProperties ) const uno::Sequence<beans::PropertyValue>& rProperties )
: ModalDialog( pParent, ScResId( RID_SCDLG_SOLVEROPTIONS ) ), : ModalDialog( pParent, ScResId( RID_SCDLG_SOLVEROPTIONS ) ),
maFtEngine ( this, ScResId( FT_ENGINE ) ), maFtEngine ( this, ScResId( FT_ENGINE ) ),
...@@ -158,7 +158,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, ...@@ -158,7 +158,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent,
nSelect = 0; nSelect = 0;
} }
else else
maEngine.Erase(); maEngine = "";
maProperties.realloc(0); // don't use options from different engine maProperties.realloc(0); // don't use options from different engine
} }
if ( nSelect >= 0 ) // select in list box if ( nSelect >= 0 ) // select in list box
...@@ -176,7 +176,7 @@ ScSolverOptionsDialog::~ScSolverOptionsDialog() ...@@ -176,7 +176,7 @@ ScSolverOptionsDialog::~ScSolverOptionsDialog()
delete mpCheckButtonData; delete mpCheckButtonData;
} }
const String& ScSolverOptionsDialog::GetEngine() const const OUString& ScSolverOptionsDialog::GetEngine() const
{ {
return maEngine; // already updated in selection handler return maEngine; // already updated in selection handler
} }
...@@ -416,7 +416,7 @@ ScSolverIntegerDialog::~ScSolverIntegerDialog() ...@@ -416,7 +416,7 @@ ScSolverIntegerDialog::~ScSolverIntegerDialog()
{ {
} }
void ScSolverIntegerDialog::SetOptionName( const String& rName ) void ScSolverIntegerDialog::SetOptionName( const OUString& rName )
{ {
maFtName.SetText( rName ); maFtName.SetText( rName );
} }
...@@ -453,7 +453,7 @@ ScSolverValueDialog::~ScSolverValueDialog() ...@@ -453,7 +453,7 @@ ScSolverValueDialog::~ScSolverValueDialog()
{ {
} }
void ScSolverValueDialog::SetOptionName( const String& rName ) void ScSolverValueDialog::SetOptionName( const OUString& rName )
{ {
maFtName.SetText( rName ); maFtName.SetText( rName );
} }
......
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