diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-08 01:10:37 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-02-11 22:33:33 -0500 |
| commit | 96d89d9cc77105cb5cf864f4392554f9613d12cf (patch) | |
| tree | 36543a3cd096be7446075f93324a2039c73eea32 /sc/source/filter/xml/xmlcelli.hxx | |
| parent | 9f023774b84986fd754e3be7a5bd2e1db0ca6800 (diff) | |
Use EditEngine to create ScEditCell directly.
Change-Id: I51a37482e793f620cf0dffcf392ce69822652cef
Diffstat (limited to 'sc/source/filter/xml/xmlcelli.hxx')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index cb61ce4a4956..cbd622fdc12b 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -21,18 +21,17 @@ #include "XMLDetectiveContext.hxx" #include "XMLCellRangeSourceContext.hxx" -#include <xmloff/xmlictxt.hxx> -#include <xmloff/xmlimp.hxx> - +#include "importcontext.hxx" #include "formula/grammar.hxx" #include <boost/optional.hpp> #include <boost/scoped_ptr.hpp> class ScXMLImport; class ScFormulaCell; +class ScEditEngineDefaulter; struct ScXMLAnnotationData; -class ScXMLTableRowCellContext : public SvXMLImportContext +class ScXMLTableRowCellContext : public ScXMLImportContext { typedef std::pair<OUString, OUString> FormulaWithNamespace; @@ -40,7 +39,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext boost::optional<OUString> maStringValue; /// office:string-value attribute boost::optional<OUString> maContentValidationName; - std::vector<OUString> maParagraphs; + ScEditEngineDefaulter* mpEditEngine; OUStringBuffer maParagraph; boost::scoped_ptr< ScXMLAnnotationData > mxAnnotationData; @@ -62,9 +61,6 @@ class ScXMLTableRowCellContext : public SvXMLImportContext bool mbPossibleErrorCell; bool mbCheckWithCompilerForError; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } - sal_Int16 GetCellType(const rtl::OUString& sOUValue) const; void DoMerge(const ScAddress& rScCellPos, const SCCOL nCols, const SCROW nRows); |