Kaydet (Commit) b99893b4 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

remove unneeded variable

Change-Id: Ic422a31252d60ddbafdfc05104b704ff9ffc4274
üst b02c52b4
...@@ -51,7 +51,7 @@ ScMyStyleRanges::~ScMyStyleRanges() ...@@ -51,7 +51,7 @@ ScMyStyleRanges::~ScMyStyleRanges()
void ScMyStyleRanges::AddRange(const ScRange& rRange, void ScMyStyleRanges::AddRange(const ScRange& rRange,
const rtl::OUString* /*pStyleName*/, const sal_Int16 nType, const rtl::OUString* /*pStyleName*/, const sal_Int16 nType,
ScXMLImport& /*rImport*/, const sal_uInt32 /*nMaxRanges*/) ScXMLImport& /*rImport*/)
{ {
switch (nType) switch (nType)
{ {
...@@ -114,7 +114,7 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange, ...@@ -114,7 +114,7 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange,
void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange, void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange,
const rtl::OUString* /*pStyleName*/, const rtl::OUString* pCurrency, const rtl::OUString* /*pStyleName*/, const rtl::OUString* pCurrency,
ScXMLImport& /*rImport*/, const sal_uInt32 /*nMaxRanges*/) ScXMLImport& /*rImport*/)
{ {
if (!pCurrencyList) if (!pCurrencyList)
pCurrencyList = new ScMyCurrencyStylesSet(); pCurrencyList = new ScMyCurrencyStylesSet();
...@@ -248,7 +248,6 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) ...@@ -248,7 +248,6 @@ ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport)
pPrevStyleName(NULL), pPrevStyleName(NULL),
pCurrency(NULL), pCurrency(NULL),
pPrevCurrency(NULL), pPrevCurrency(NULL),
nMaxRanges(0),
bPrevRangeAdded(true) bPrevRangeAdded(true)
{ {
} }
...@@ -351,17 +350,15 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange) ...@@ -351,17 +350,15 @@ void ScMyStylesImportHelper::AddDefaultRange(const ScRange& rRange)
void ScMyStylesImportHelper::AddSingleRange(const ScRange& rRange) void ScMyStylesImportHelper::AddSingleRange(const ScRange& rRange)
{ {
if (nMaxRanges == 0)
nMaxRanges = aColDefaultStyles.size();
ScMyStylesSet::iterator aItr(GetIterator(pPrevStyleName)); ScMyStylesSet::iterator aItr(GetIterator(pPrevStyleName));
if (aItr != aCellStyles.end()) if (aItr != aCellStyles.end())
{ {
if (nPrevCellType != util::NumberFormat::CURRENCY) if (nPrevCellType != util::NumberFormat::CURRENCY)
aItr->xRanges->AddRange(rRange, pPrevStyleName, nPrevCellType, aItr->xRanges->AddRange(rRange, pPrevStyleName, nPrevCellType,
rImport, nMaxRanges); rImport);
else else
aItr->xRanges->AddCurrencyRange(rRange, pPrevStyleName, pPrevCurrency, aItr->xRanges->AddCurrencyRange(rRange, pPrevStyleName, pPrevCurrency,
rImport, nMaxRanges); rImport);
} }
} }
...@@ -472,7 +469,6 @@ void ScMyStylesImportHelper::EndTable() ...@@ -472,7 +469,6 @@ void ScMyStylesImportHelper::EndTable()
AddRange(); AddRange();
bPrevRangeAdded = true; bPrevRangeAdded = true;
} }
nMaxRanges = 0;
} }
void ScMyStylesImportHelper::SetStylesToRanges() void ScMyStylesImportHelper::SetStylesToRanges()
...@@ -486,7 +482,6 @@ void ScMyStylesImportHelper::SetStylesToRanges() ...@@ -486,7 +482,6 @@ void ScMyStylesImportHelper::SetStylesToRanges()
} }
aColDefaultStyles.clear(); aColDefaultStyles.clear();
aCellStyles.clear(); aCellStyles.clear();
nMaxRanges = 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -102,10 +102,10 @@ public: ...@@ -102,10 +102,10 @@ public:
~ScMyStyleRanges(); ~ScMyStyleRanges();
void AddRange(const ScRange& rRange, void AddRange(const ScRange& rRange,
const rtl::OUString* pStyleName, const sal_Int16 nType, const rtl::OUString* pStyleName, const sal_Int16 nType,
ScXMLImport& rImport, const sal_uInt32 nMaxRanges); ScXMLImport& rImport);
void AddCurrencyRange(const ScRange& rRange, void AddCurrencyRange(const ScRange& rRange,
const rtl::OUString* pStyleName, const rtl::OUString* pCurrency, const rtl::OUString* pStyleName, const rtl::OUString* pCurrency,
ScXMLImport& rImport, const sal_uInt32 nMaxRanges); ScXMLImport& rImport);
void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc); void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc);
void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport); void SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLImport& rImport);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment