diff options
-rw-r--r-- | sc/source/ui/inc/solveroptions.hxx | 10 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index d79cb2b21ad0..b632b47f94d3 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -50,7 +50,7 @@ class ScSolverOptionsDialog : public ModalDialog SvLBoxButtonData* mpCheckButtonData; com::sun::star::uno::Sequence<OUString> maImplNames; com::sun::star::uno::Sequence<OUString> maDescriptions; - String maEngine; + OUString maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; DECL_LINK( EngineSelectHdl, void* ); @@ -66,11 +66,11 @@ public: ScSolverOptionsDialog( Window* pParent, const com::sun::star::uno::Sequence<OUString>& rImplNames, 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 ); ~ScSolverOptionsDialog(); - const String& GetEngine() const; + const OUString& GetEngine() const; const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); }; @@ -87,7 +87,7 @@ public: ScSolverIntegerDialog( Window * pParent ); ~ScSolverIntegerDialog(); - void SetOptionName( const String& rName ); + void SetOptionName( const OUString& rName ); void SetValue( sal_Int32 nValue ); sal_Int32 GetValue() const; }; @@ -104,7 +104,7 @@ public: ScSolverValueDialog( Window * pParent ); ~ScSolverValueDialog(); - void SetOptionName( const String& rName ); + void SetOptionName( const OUString& rName ); void SetValue( double fValue ); double GetValue() const; }; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index fa7885d687f3..4d12b8d7b686 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -111,7 +111,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, const uno::Sequence<OUString>& rImplNames, const uno::Sequence<OUString>& rDescriptions, - const String& rEngine, + const OUString& rEngine, const uno::Sequence<beans::PropertyValue>& rProperties ) : ModalDialog( pParent, ScResId( RID_SCDLG_SOLVEROPTIONS ) ), maFtEngine ( this, ScResId( FT_ENGINE ) ), @@ -158,7 +158,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, nSelect = 0; } else - maEngine.Erase(); + maEngine = ""; maProperties.realloc(0); // don't use options from different engine } if ( nSelect >= 0 ) // select in list box @@ -176,7 +176,7 @@ ScSolverOptionsDialog::~ScSolverOptionsDialog() delete mpCheckButtonData; } -const String& ScSolverOptionsDialog::GetEngine() const +const OUString& ScSolverOptionsDialog::GetEngine() const { return maEngine; // already updated in selection handler } @@ -416,7 +416,7 @@ ScSolverIntegerDialog::~ScSolverIntegerDialog() { } -void ScSolverIntegerDialog::SetOptionName( const String& rName ) +void ScSolverIntegerDialog::SetOptionName( const OUString& rName ) { maFtName.SetText( rName ); } @@ -453,7 +453,7 @@ ScSolverValueDialog::~ScSolverValueDialog() { } -void ScSolverValueDialog::SetOptionName( const String& rName ) +void ScSolverValueDialog::SetOptionName( const OUString& rName ) { maFtName.SetText( rName ); } |