diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:50:52 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:50:52 +0000 |
| commit | d52e89f0c7563dc06005f16c971c5febb1347244 (patch) | |
| tree | bcca53db2ef08da3693517006766936d9155addb /sc | |
| parent | 5176f9214ec15b7ad9a84857254f7379df324683 (diff) | |
INTEGRATION: CWS koheiformula01 (1.71.12); FILE MERGED
2008/04/30 15:41:07 kohei 1.71.12.7: change the default grammar to GRAM_NATIVE which has the CONV_OOO address convention embedded in.
2008/04/23 15:10:39 kohei 1.71.12.6: RESYNC: (1.71-1.72); FILE MERGED
2008/03/31 20:11:20 kohei 1.71.12.5: renamed locale instance of ScGrammar::Grammar from eGrammar to eGram, to avoid a naming clash.
2008/03/19 17:37:10 kohei 1.71.12.4: changed a lot of places to prepare for a single global grammar value that applies to all places where formulas are used.
2008/03/18 23:14:31 kohei 1.71.12.3: switched to putting the separators into mxSymbolsNative and put everything else back to the way it was.
2008/03/14 01:19:40 kohei 1.71.12.2: set the convention back to OOO.
2008/03/14 01:06:11 kohei 1.71.12.1: initial commit from the ooo-build patch with lots of build breakages fixed.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/documen2.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index c00f0523aeb5..e766c4fd3b34 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: documen2.cxx,v $ - * $Revision: 1.72 $ + * $Revision: 1.73 $ * * This file is part of OpenOffice.org. * @@ -197,7 +197,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, nInDdeLinkUpdate( 0 ), bInUnoBroadcast( FALSE ), bInUnoListenerCall( FALSE ), - eAddrConv( ScAddress::CONV_OOO ), + eGrammar( ScGrammar::GRAM_NATIVE ), bStyleSheetUsageInvalid( TRUE ), bUndoEnabled( TRUE ), mbAdjustHeightEnabled( true ), @@ -249,20 +249,20 @@ ScDocument::ScDocument( ScDocumentMode eMode, } -void ScDocument::SetStorageGrammar( ScGrammar::Grammar eGrammar ) +void ScDocument::SetStorageGrammar( ScGrammar::Grammar eGram ) { DBG_ASSERT( - eGrammar == ScGrammar::GRAM_ODFF || - eGrammar == ScGrammar::GRAM_PODF, + eGram == ScGrammar::GRAM_ODFF || + eGram == ScGrammar::GRAM_PODF, "ScDocument::SetStorageGrammar: wrong storage grammar"); - eStorageGrammar = eGrammar; + eStorageGrammar = eGram; // FIXME: the XML import shouldn't strip brackets, the compiler should // digest them instead, which could also speedup reference recognition // during import. - eXmlImportGrammar = ScGrammar::mergeToGrammar( eGrammar, + eXmlImportGrammar = ScGrammar::mergeToGrammar( eGram, ScAddress::CONV_OOO); } |