diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:55:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:55:51 +0000 |
| commit | e701d07a5b1cbfbc0ce95dad20fe0c13281ab4e1 (patch) | |
| tree | d8f3cfcc2a32852d9f98109c79da3edb500286da /sc | |
| parent | 1351eb10c16d470c3ca84f5ceb46dc1389e0e391 (diff) | |
INTEGRATION: CWS koheiformula01 (1.12.314); FILE MERGED
2008/04/23 15:08:37 kohei 1.12.314.3: RESYNC: (1.12-1.13); FILE MERGED
2008/03/21 03:54:21 kohei 1.12.314.2: use the grammar setting in the advanced filter dialog.
2008/03/20 23:20:04 kohei 1.12.314.1: Use the current address convention everywhere instead of always using the OOo convention.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/dbgui/sfiltdlg.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 1a6479d682c7..cba8a0b28c85 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sfiltdlg.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This file is part of OpenOffice.org. * @@ -186,7 +186,7 @@ void __EXPORT ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) if (rQueryItem.GetAdvancedQuerySource(aAdvSource)) { String aRefStr; - aAdvSource.Format( aRefStr, SCR_ABS_3D, pDoc ); + aAdvSource.Format( aRefStr, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() ); aEdFilterArea.SetRefString( aRefStr ); } } @@ -249,11 +249,12 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) RefInputStart( pRefInputEdit ); String aRefStr; + const ScAddress::Convention eConv = pDocP->GetAddressConvention(); if ( pRefInputEdit == &aEdCopyArea) - rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP ); + rRef.aStart.Format( aRefStr, SCA_ABS_3D, pDocP, eConv ); else if ( pRefInputEdit == &aEdFilterArea) - rRef.Format( aRefStr, SCR_ABS_3D, pDocP ); + rRef.Format( aRefStr, SCR_ABS_3D, pDocP, eConv ); pRefInputEdit->SetRefString( aRefStr ); } @@ -323,6 +324,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) BOOL bEditInputOk = TRUE; BOOL bQueryOk = FALSE; ScRange theFilterArea; + const ScAddress::Convention eConv = pDoc->GetAddressConvention(); if ( aBtnCopyResult.IsChecked() ) { @@ -331,7 +333,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) if ( STRING_NOTFOUND != nColonPos ) theCopyStr.Erase( nColonPos ); - USHORT nResult = theAdrCopy.Parse( theCopyStr, pDoc ); + USHORT nResult = theAdrCopy.Parse( theCopyStr, pDoc, eConv ); if ( SCA_VALID != (nResult & SCA_VALID) ) { @@ -346,7 +348,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) if ( bEditInputOk ) { - USHORT nResult = ScRange().Parse( theAreaStr, pDoc ); + USHORT nResult = ScRange().Parse( theAreaStr, pDoc, eConv ); if ( SCA_VALID != (nResult & SCA_VALID) ) { @@ -364,7 +366,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) * ein ScQueryParam zu erzeugen: */ - USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc ); + USHORT nResult = theFilterArea.Parse( theAreaStr, pDoc, eConv ); if ( SCA_VALID == (nResult & SCA_VALID) ) { |