diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:55:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:55:10 +0000 |
| commit | 0980406354d534304630ebae1414fae24e18d723 (patch) | |
| tree | 921d1c3958fd155ea72b4d5d21e114c38e4d8158 /sc/source/ui/dbgui/foptmgr.cxx | |
| parent | 8e2b1f0cf760c61c92e9660fe7fbb721f052b9f4 (diff) | |
INTEGRATION: CWS koheiformula01 (1.6.314); FILE MERGED
2008/04/23 15:08:44 kohei 1.6.314.3: RESYNC: (1.6-1.7); FILE MERGED
2008/03/21 03:44:02 kohei 1.6.314.2: use the grammar setting in the filter options.
2008/03/20 23:20:04 kohei 1.6.314.1: Use the current address convention everywhere instead of always using the OOo convention.
Diffstat (limited to 'sc/source/ui/dbgui/foptmgr.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/foptmgr.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index e39431227b95..44c4f14de22d 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: foptmgr.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -148,8 +148,9 @@ void ScFilterOptionsMgr::Init() ScDBCollection* pDBColl = pDoc->GetDBCollection(); String theDbArea; String theDbName = rStrNoName; + const ScAddress::Convention eConv = pDoc->GetAddressConvention(); - theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc ); + theCurArea.Format( theAreaStr, SCR_ABS_3D, pDoc, eConv ); // Zielbereichsliste fuellen @@ -164,7 +165,7 @@ void ScFilterOptionsMgr::Init() { USHORT nInsert = rLbCopyPos.InsertEntry( aName ); - aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc ); + aRange.aStart.Format( aRefStr, SCA_ABS_3D, pDoc, eConv ); rLbCopyPos.SetEntryData( nInsert, new String( aRefStr ) ); } @@ -213,7 +214,7 @@ void ScFilterOptionsMgr::Init() ScAddress( rQueryData.nDestCol, rQueryData.nDestRow, rQueryData.nDestTab - ).Format( aString, SCA_ABS_3D, pDoc ); + ).Format( aString, SCA_ABS_3D, pDoc, eConv ); rBtnCopyResult.Check( TRUE ); rEdCopyPos.SetText( aString ); @@ -248,7 +249,7 @@ BOOL ScFilterOptionsMgr::VerifyPosStr( const String& rPosStr ) const if ( STRING_NOTFOUND != nColonPos ) aPosStr.Erase( nColonPos ); - USHORT nResult = ScAddress().Parse( aPosStr, pDoc ); + USHORT nResult = ScAddress().Parse( aPosStr, pDoc, pDoc->GetAddressConvention() ); return ( SCA_VALID == (nResult & SCA_VALID) ); } @@ -283,7 +284,7 @@ IMPL_LINK( ScFilterOptionsMgr, EdPosModifyHdl, Edit*, pEd ) if ( pEd == &rEdCopyPos ) { String theCurPosStr = pEd->GetText(); - USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc ); + USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); if ( SCA_VALID == (nResult & SCA_VALID) ) { |