diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:54:42 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:54:42 +0000 |
| commit | 3014924f8a29d43a5566d5784eb80e4e4584c60c (patch) | |
| tree | d560addc9c46d390cb0d1cfafb6fb09a548449c8 /sc | |
| parent | 4181ee0bc348ff4c7af519f9e6136e8b4bf9b6ac (diff) | |
INTEGRATION: CWS koheiformula01 (1.8.314); FILE MERGED
2008/04/23 15:08:33 kohei 1.8.314.3: RESYNC: (1.8-1.9); FILE MERGED
2008/03/20 23:20:04 kohei 1.8.314.2: Use the current address convention everywhere instead of always using the OOo convention.
2008/03/20 04:37:59 kohei 1.8.314.1: use grammar in the database range dialog.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/dbgui/dbnamdlg.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index abfa4d1e350f..45bf3b5259c6 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbnamdlg.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -184,6 +184,7 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, pViewData ( ptrViewData ), pDoc ( ptrViewData->GetDocument() ), bRefInputMode ( FALSE ), + aAddrDetails ( pDoc->GetAddressConvention(), 0, 0 ), aLocalDbCol ( *(pDoc->GetDBCollection()) ) { // WB_NOLABEL can't be set in resource... @@ -258,7 +259,7 @@ void ScDbNameDlg::Init() theCurArea = ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), ScAddress( nEndCol, nEndRow, nEndTab ) ); - theCurArea.Format( theAreaStr, ABS_DREF3D, pDoc ); + theCurArea.Format( theAreaStr, ABS_DREF3D, pDoc, aAddrDetails ); if ( pDBColl ) { @@ -337,7 +338,7 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) theCurArea = rRef; String aRefStr; - theCurArea.Format( aRefStr, ABS_DREF3D, pDocP ); + theCurArea.Format( aRefStr, ABS_DREF3D, pDocP, aAddrDetails ); aEdAssign.SetRefString( aRefStr ); aBtnHeader.Enable(); aBtnDoSize.Enable(); @@ -432,7 +433,7 @@ void ScDbNameDlg::UpdateDBData( const String& rStrName ) pData->GetArea( nTab, nColStart, nRowStart, nColEnd, nRowEnd ); theCurArea = ScRange( ScAddress( nColStart, nRowStart, nTab ), ScAddress( nColEnd, nRowEnd, nTab ) ); - theCurArea.Format( theArea, ABS_DREF3D, pDoc ); + theCurArea.Format( theArea, ABS_DREF3D, pDoc, aAddrDetails ); aEdAssign.SetText( theArea ); aBtnAdd.SetText( aStrModify ); aBtnHeader.Check( pData->HasHeader() ); @@ -506,7 +507,7 @@ IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) // weil jetzt editiert werden kann, muss erst geparst werden ScRange aTmpRange; String aText = aEdAssign.GetText(); - if ( aTmpRange.ParseAny( aText, pDoc ) & SCA_VALID ) + if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID ) { theCurArea = aTmpRange; ScAddress aStart = theCurArea.aStart; @@ -725,7 +726,7 @@ IMPL_LINK( ScDbNameDlg, AssModifyHdl, void *, EMPTYARG ) ScRange aTmpRange; String aText = aEdAssign.GetText(); - if ( aTmpRange.ParseAny( aText, pDoc ) & SCA_VALID ) + if ( aTmpRange.ParseAny( aText, pDoc, aAddrDetails ) & SCA_VALID ) theCurArea = aTmpRange; return 0; |