diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 20:44:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 11:39:01 +0100 |
| commit | 74929bba736cc6cceed3c088e13f5952abb1bd2b (patch) | |
| tree | 8a026d95bc586ca6a41686dee32dfa53b659b252 /sc/source/ui/miscdlgs/solvrdlg.cxx | |
| parent | fc7e7b683112e9ccd23104f38d4acc3417e9d5b8 (diff) | |
Related: fdo#38838 remove UniString::ToUpperAscii
things got a little out of hand and I ended up
converting quite a bit of calc to OUString
Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216
Diffstat (limited to 'sc/source/ui/miscdlgs/solvrdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index b7eae4771bff..0a4d6554fbd7 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -84,8 +84,6 @@ ScSolverDlg::~ScSolverDlg() void ScSolverDlg::Init() { - String aStr; - m_pBtnOk->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) ); m_pBtnCancel->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) ); @@ -102,7 +100,7 @@ void ScSolverDlg::Init() m_pEdVariableCell->SetLoseFocusHdl ( aLink ); m_pRBVariableCell->SetLoseFocusHdl ( aLink ); - theFormulaCell.Format( aStr, SCA_ABS, NULL, pDoc->GetAddressConvention() ); + OUString aStr(theFormulaCell.Format(SCA_ABS, NULL, pDoc->GetAddressConvention())); m_pEdFormulaCell->SetText( aStr ); m_pEdFormulaCell->GrabFocus(); @@ -142,13 +140,12 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(pEdActive); - String aStr; ScAddress aAdr = rRef.aStart; sal_uInt16 nFmt = ( aAdr.Tab() == nCurTab ) ? SCA_ABS : SCA_ABS_3D; - aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); + OUString aStr(aAdr.Format(nFmt, pDocP, pDocP->GetAddressConvention())); pEdActive->SetRefString( aStr ); if ( pEdActive == m_pEdFormulaCell ) |