diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 09:00:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 09:00:34 +0000 |
| commit | 707dacc9f56af37569e9f385b64512524875c6c7 (patch) | |
| tree | b7af9e76af56c919e88c08f9d55f15eddbe42163 /sc/source/ui/miscdlgs/solvrdlg.cxx | |
| parent | 3d65f3f47289bc5c8afa2e909381e736edbe4820 (diff) | |
INTEGRATION: CWS koheiformula01 (1.11.314); FILE MERGED
2008/04/23 15:09:22 kohei 1.11.314.3: RESYNC: (1.11-1.12); FILE MERGED
2008/03/21 17:23:57 kohei 1.11.314.2: const a read-only variable.
2008/03/20 23:20:34 kohei 1.11.314.1: Use the current address convention everywhere instead of always using the OOo convention.
Diffstat (limited to 'sc/source/ui/miscdlgs/solvrdlg.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/solvrdlg.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 6f6f03b64c82..4f26c9626838 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: solvrdlg.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -121,7 +121,7 @@ void __EXPORT ScSolverDlg::Init() aEdVariableCell.SetLoseFocusHdl ( aLink ); aRBVariableCell.SetLoseFocusHdl ( aLink ); - theFormulaCell.Format( aStr, SCA_ABS ); + theFormulaCell.Format( aStr, SCA_ABS, NULL, pDoc->GetAddressConvention() ); aEdFormulaCell.SetText( aStr ); aEdFormulaCell.GrabFocus(); @@ -167,7 +167,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) ? SCA_ABS : SCA_ABS_3D; - aAdr.Format( aStr, nFmt, pDocP ); + aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); pEdActive->SetRefString( aStr ); if ( pEdActive == &aEdFormulaCell ) @@ -236,8 +236,9 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) // 2. verweist die Formel-Koordinate wirklich auf eine Formelzelle? // 3. wurde ein korrekter Zielwert eingegeben - USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc ); - USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc ); + const ScAddress::Convention eConv = pDoc->GetAddressConvention(); + USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); + USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); if ( SCA_VALID == ( nRes1 & SCA_VALID ) ) { |