diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-03-18 17:44:00 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-19 09:00:53 +0200 |
| commit | a0d2fd2096e267a29c5b8a07b0349e699e13ded5 (patch) | |
| tree | 29ad6dc7243b5eaf890e525dff6541a54df744fd | |
| parent | 39228c6d2419636be04ee4a320a7c0ca08276f37 (diff) | |
add all imported properties to ScDBData, fdo#40426
(cherry picked from commit ed88b144ce24b9a733d4a9ab6614307c96537baa)
Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
| -rw-r--r-- | sc/source/filter/xml/xmldrani.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmldrani.hxx | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 653af637990f..a0ca75478cdd 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -148,6 +148,8 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, bSubTotalsEnabledUserList(false), bSubTotalsAscending(true), bFilterConditionSourceRange(false), + bHasHeader(true), + bByRow(false), meRangeType(ScDBCollection::GlobalNamed) { nSourceType = sheet::DataImportMode_NONE; @@ -190,12 +192,14 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, break; case XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION : { - mpQueryParam->bByRow = !IsXMLToken(sValue, XML_COLUMN); + bByRow = !IsXMLToken(sValue, XML_COLUMN); + mpQueryParam->bByRow = bByRow; } break; case XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER : { - mpQueryParam->bHasHeader = IsXMLToken(sValue, XML_TRUE); + bHasHeader = IsXMLToken(sValue, XML_TRUE); + mpQueryParam->bHasHeader = bHasHeader; } break; case XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS : @@ -303,7 +307,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName) SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<ScDBData> pData( - new ScDBData(rName, maRange.aStart.Tab(), maRange.aStart.Col(), maRange.aStart.Row(), maRange.aEnd.Col(), maRange.aEnd.Row())); + new ScDBData(rName, maRange.aStart.Tab(), maRange.aStart.Col(), maRange.aStart.Row(), maRange.aEnd.Col(), maRange.aEnd.Row(), bByRow, bHasHeader)); SAL_WNODEPRECATED_DECLARATIONS_POP pData->SetAutoFilter(bAutoFilter); diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 9fe1408041e3..ff659f8b0c2f 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -106,6 +106,8 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext bool bSubTotalsEnabledUserList; bool bSubTotalsAscending; bool bFilterConditionSourceRange; + bool bHasHeader; + bool bByRow; ScDBCollection::RangeType meRangeType; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } |