diff options
| author | Daniel Bankston <daniel.e.bankston@gmail.com> | 2012-07-11 17:48:00 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-11 20:37:44 -0400 |
| commit | 59b32886a48954f9dad96b3329d172ac73aaa065 (patch) | |
| tree | 48bdfa69ded7b490e4bb73d92b51152b5f720e03 | |
| parent | 371cb44c52e11af8f9a3ec66827ec057c521804f (diff) | |
Fix cause of osl warning
Change-Id: Idfeaab29da60f323fdf8528599459cc38ab9f27c
| -rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.cxx | 16 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLStylesImportHelper.hxx | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 438ac0e5a607..2f54d6b06a1d 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -85,6 +85,13 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange, mpTimeList->addRange(rRange); } break; + case util::NumberFormat::DATE: + { + if (!mpDateList) + mpDateList.reset(new ScSimpleRangeList); + mpDateList->addRange(rRange); + } + break; case util::NumberFormat::DATETIME: { if (!mpDateTimeList) @@ -152,6 +159,8 @@ void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDo mpNumberList->insertCol(static_cast<SCCOL>(nCol), static_cast<SCTAB>(nTab)); if (mpTimeList) mpTimeList->insertCol(static_cast<SCCOL>(nCol), static_cast<SCTAB>(nTab)); + if (mpDateList) + mpDateList->insertCol(static_cast<SCCOL>(nCol), static_cast<SCTAB>(nTab)); if (mpDateTimeList) mpDateTimeList->insertCol(static_cast<SCCOL>(nCol), static_cast<SCTAB>(nTab)); if (mpPercentList) @@ -205,6 +214,13 @@ void ScMyStyleRanges::SetStylesToRanges(const rtl::OUString* pStyleName, ScXMLIm SetStylesToRanges(aList, pStyleName, util::NumberFormat::TIME, NULL, rImport); mpTimeList->clear(); } + if (mpDateList) + { + list<ScRange> aList; + mpDateList->getRangeList(aList); + SetStylesToRanges(aList, pStyleName, util::NumberFormat::DATE, NULL, rImport); + mpDateList->clear(); + } if (mpDateTimeList) { list<ScRange> aList; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 6a988d061fae..87765f342f5f 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -97,6 +97,7 @@ class ScMyStyleRanges : public SvRefBase ::boost::shared_ptr<ScSimpleRangeList> mpTextList; ::boost::shared_ptr<ScSimpleRangeList> mpNumberList; ::boost::shared_ptr<ScSimpleRangeList> mpTimeList; + ::boost::shared_ptr<ScSimpleRangeList> mpDateList; ::boost::shared_ptr<ScSimpleRangeList> mpDateTimeList; ::boost::shared_ptr<ScSimpleRangeList> mpPercentList; ::boost::shared_ptr<ScSimpleRangeList> mpLogicalList; |