summaryrefslogtreecommitdiff
path: root/sc/source/filter/xml
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-03-18 17:44:00 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-03-18 18:38:13 +0100
commited88b144ce24b9a733d4a9ab6614307c96537baa (patch)
treef15a0de60eecb85eb563c50fafcbd4bd8d6d1c5c /sc/source/filter/xml
parentc8ef98c5ad22ba585a28d81360e15fe2dcefc3ad (diff)
add all imported properties to ScDBData, fdo#40426
Diffstat (limited to 'sc/source/filter/xml')
-rw-r--r--sc/source/filter/xml/xmldrani.cxx10
-rw-r--r--sc/source/filter/xml/xmldrani.hxx2
2 files changed, 9 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 3ac0fe22f218..37c4471d8697 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(); }