Bit of re-organization...

Change-Id: I843d798007eaeb7175991210bd4f0d42078836d9

1 files changed, 6 insertions, 4 deletions

diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 9584d8e0ccc4..2f7b3e6816f1 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -34,11 +34,13 @@ struct ScXMLAnnotationData;
 
 class ScXMLTableRowCellContext : public SvXMLImportContext
 {
-    typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > FormulaWithNamespace;
-    ::boost::optional< rtl::OUString > pOUTextValue;
+    typedef std::pair<OUString, OUString> FormulaWithNamespace;
+
+    boost::optional<FormulaWithNamespace> maFormula; /// table:formula attribute
+    boost::optional<OUString> maStringValue;         /// office:string-value attribute
+    boost::optional<OUString> maContentValidationName;
+
     ::boost::optional< rtl::OUString > pOUTextContent;
-    ::boost::optional< FormulaWithNamespace > pOUFormula;
-    rtl::OUString* pContentValidationName;
     boost::scoped_ptr< ScXMLAnnotationData > mxAnnotationData;
     ScMyImpDetectiveObjVec* pDetectiveObjVec;
     ScMyImpCellRangeSource* pCellRangeSource;