diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-10-18 11:29:52 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-10-18 11:29:52 +0000 |
| commit | d1087ed6b3b0c29427e463de310597eaf15674e1 (patch) | |
| tree | d0730a50267abe89bf952c236c1a11175838be68 /sc/source/ui/view/colrowba.cxx | |
| parent | 32e2ea42b3a3b74d8e4949718ff45bbf2d26020d (diff) | |
INTEGRATION: CWS scr1c1 (1.14.58); FILE MERGED
2006/09/07 14:21:00 jodygoldberg 1.14.58.1: Issue number: 20857
Submitted by: jodygoldberg
Implements the the core changes to support parsing and generating cell/range
references in different formats (XL R1C1/A1) along with some tools for using
the new types. This adds two new functions
XL_INDIRECT
XL_ADDRESS
but does _not_ connect them in the xls importer. Nor does the patch make any
UI changes. Those will need to be discussed. The OOo parser/generator should
not be impacted by the changes.
Diffstat (limited to 'sc/source/ui/view/colrowba.cxx')
| -rw-r--r-- | sc/source/ui/view/colrowba.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index d27f6887f7d6..a8d7657d52e0 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -4,9 +4,9 @@ * * $RCSfile: colrowba.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2006-07-21 14:52:02 $ + * last change: $Author: ihi $ $Date: 2006-10-18 12:29:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -95,6 +95,11 @@ ScColBar::~ScColBar() { } +inline BOOL ScColBar::UseNumericHeader() const +{ + return pViewData->GetDocument()->GetAddressConvention() == ScAddress::CONV_XL_R1C1; +} + SCCOLROW ScColBar::GetPos() { return pViewData->GetPosX(eWhich); @@ -112,7 +117,9 @@ USHORT ScColBar::GetEntrySize( SCCOLROW nEntryNo ) String ScColBar::GetEntryText( SCCOLROW nEntryNo ) { - return ColToAlpha( static_cast<SCCOL>(nEntryNo) ); + return UseNumericHeader() + ? String::CreateFromInt32( nEntryNo + 1 ) + : ColToAlpha( static_cast<SCCOL>(nEntryNo) ); } void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) |