[Libreoffice-commits] core.git: sc/inc sc/source

[Eike Rathke]

 sc/inc/document.hxx              |    5 -----
 sc/source/core/data/documen2.cxx |    7 -------
 2 files changed, 12 deletions(-)

New commits:
commit 99cc76e41bc418aff8cc14e646b42b3c59ffac9e
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Nov 12 18:38:01 2015 +0100

    remove fixme comment and fragments of things that are done since long
    
    Change-Id: Ia1daaecb69e4d2e42315edeb96f9d659a3efed0c

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fc13ec9..1fc5d2d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -387,11 +387,6 @@ private:
         documents, GRAM_ODFF for ODF 1.2 documents. */
     formula::FormulaGrammar::Grammar  eStorageGrammar;
 
-    /** The compiler grammar used in ODF import after brackets had been
-        stripped (which they shouldn't, but until that's fixed) by the XML
-        importer. */
-    formula::FormulaGrammar::Grammar  eXmlImportGrammar;
-
     sal_uLong               nFormulaCodeInTree;             // FormelRPN im Formelbaum
     sal_uLong               nXMLImportedFormulaCount;        // progress count during XML import
     sal_uInt16              nInterpretLevel;                // >0 if in interpreter
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 5582176..d0a960e 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -283,13 +283,6 @@ void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram )
             "ScDocument::SetStorageGrammar: wrong storage grammar");
 
     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 = formula::FormulaGrammar::mergeToGrammar( eGram,
-            formula::FormulaGrammar::CONV_OOO);
 }
 
 void ScDocument::SetDocVisible( bool bSet )