diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:40:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:40:26 +0000 |
| commit | 6b8744583ad3f012e4cfb1d5f8855e17aa76907e (patch) | |
| tree | 3b93232c527f11e7e33be0b5e1373b3d114be287 /oox/source | |
| parent | 20b427e4a7372dab6241342b0313ecbe475c2ccc (diff) | |
INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED
2008/03/25 10:33:28 sj 1.2.12.6: fixed merge problems
2008/03/20 06:46:26 hbrinkm 1.2.12.5: #RESYNC DEV300:m3
2008/03/19 03:40:50 kohei 1.2.12.4: switch from FormulaConvention to AddressConvention.
2008/03/12 14:22:32 dr 1.2.12.3: more code finetuning
2008/03/07 01:43:33 kohei 1.2.12.2: switched to using the new FormulaConvention constant to specify the XL A1 style formula.
2008/02/21 12:42:07 hbrinkm 1.2.12.1: joined changes from xmlfilter03
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/xls/formulaparser.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/xls/formulaparser.cxx b/oox/source/xls/formulaparser.cxx index b3cf35f88112..055dd31532eb 100644 --- a/oox/source/xls/formulaparser.cxx +++ b/oox/source/xls/formulaparser.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formulaparser.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -35,6 +35,7 @@ #include <com/sun/star/sheet/SingleReference.hpp> #include <com/sun/star/sheet/ComplexReference.hpp> #include <com/sun/star/sheet/XFormulaParser.hpp> +#include <com/sun/star/sheet/AddressConvention.hpp> #include "oox/helper/containerhelper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/helper/recordinputstream.hxx" @@ -1108,8 +1109,7 @@ OoxFormulaParserImpl::OoxFormulaParserImpl( const WorkbookHelper& rHelper, const OSL_ENSURE( mxParser.is(), "OoxFormulaParserImpl::OoxFormulaParserImpl - cannot create formula parser" ); maParserProps.set( mxParser ); maParserProps.setProperty( CREATE_OUSTRING( "CompileEnglish" ), true ); - maParserProps.setProperty( CREATE_OUSTRING( "R1C1Notation" ), false ); - maParserProps.setProperty( CREATE_OUSTRING( "Compatibility3DNotation" ), true ); + maParserProps.setProperty( CREATE_OUSTRING( "FormulaConvention" ), ::com::sun::star::sheet::AddressConvention::XL_A1 ); maParserProps.setProperty( CREATE_OUSTRING( "IgnoreLeadingSpaces" ), false ); maParserProps.setProperty( CREATE_OUSTRING( "OpCodeMap" ), mrFuncProv.getOoxParserMap() ); } |