[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
Tor Lillqvist
tml at collabora.com
Sat Nov 25 23:04:13 UTC 2017
sc/inc/colorscale.hxx | 6 ++---
sc/inc/conditio.hxx | 29 +++++++++++----------------
sc/qa/unit/helper/shared_test_impl.hxx | 6 ++---
sc/qa/unit/subsequent_filters-test.cxx | 16 +++++++-------
sc/source/core/data/colorscale.cxx | 12 +++++------
sc/source/core/data/conditio.cxx | 24 +++++++++++-----------
sc/source/core/data/table2.cxx | 6 ++---
sc/source/filter/excel/xecontent.cxx | 10 ++++-----
sc/source/filter/excel/xeextlst.cxx | 8 +++----
sc/source/filter/excel/xestyle.cxx | 6 ++---
sc/source/filter/inc/orcusinterface.hxx | 2 -
sc/source/filter/oox/extlstcontext.cxx | 2 -
sc/source/filter/orcus/interface.cxx | 24 +++++++++++-----------
sc/source/filter/xml/xmlexprt.cxx | 10 ++++-----
sc/source/ui/condformat/condformatdlg.cxx | 10 ++++-----
sc/source/ui/condformat/condformathelper.cxx | 10 ++++-----
sc/source/ui/unoobj/condformatuno.cxx | 10 ++++-----
sc/source/ui/unoobj/fmtuno.cxx | 2 -
18 files changed, 94 insertions(+), 99 deletions(-)
New commits:
commit 2618e4a13d719122e6358d9d96864d1691e56a02
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Nov 23 18:21:42 2017 +0200
Convert ScFormatEntryType to scoped enum
Change-Id: I9a6b3fb05255630852a96ebf74d901b869a581f4
Reviewed-on: https://gerrit.libreoffice.org/45276
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 0d33f1bb7146..19f00d7087e8 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -275,7 +275,7 @@ public:
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override;
virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override;
- virtual condformat::ScFormatEntryType GetType() const override;
+ virtual Type GetType() const override;
ScColorScaleEntries::iterator begin();
ScColorScaleEntries::const_iterator begin() const;
ScColorScaleEntries::iterator end();
@@ -313,7 +313,7 @@ public:
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override;
virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override;
- virtual condformat::ScFormatEntryType GetType() const override;
+ virtual Type GetType() const override;
/**
* Makes sure that the mpFormatData does not contain valid entries.
@@ -375,7 +375,7 @@ public:
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) override;
virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) override;
- virtual condformat::ScFormatEntryType GetType() const override;
+ virtual Type GetType() const override;
static const ScIconSetMap g_IconSetMap[];
static BitmapEx& getBitmap(sc::IconSetBitmapMap& rBitmapMap, ScIconSetType eType, sal_Int32 nIndex);
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 9094add488ab..bad7b3dba18c 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -113,20 +113,6 @@ class ScConditionalFormat;
struct ScDataBarInfo;
struct ScIconSetInfo;
-namespace condformat
-{
-
-enum ScFormatEntryType
-{
- CONDITION,
- COLORSCALE,
- DATABAR,
- ICONSET,
- DATE
-};
-
-}
-
struct ScCondFormatData
{
ScCondFormatData():
@@ -146,7 +132,16 @@ public:
ScFormatEntry(ScDocument* pDoc);
virtual ~ScFormatEntry() {}
- virtual condformat::ScFormatEntryType GetType() const = 0;
+ enum class Type
+ {
+ Condition,
+ Colorscale,
+ Databar,
+ Iconset,
+ Date
+ };
+
+ virtual Type GetType() const = 0;
virtual void UpdateReference( sc::RefUpdateContext& rCxt ) = 0;
virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) = 0;
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) = 0;
@@ -266,7 +261,7 @@ public:
bool MarkUsedExternalReferences() const;
- virtual condformat::ScFormatEntryType GetType() const override { return condformat::CONDITION; }
+ virtual Type GetType() const override { return Type::Condition; }
virtual ScFormatEntry* Clone(ScDocument* pDoc) const override;
@@ -382,7 +377,7 @@ public:
const OUString& GetStyleName() const { return maStyleName;}
void SetStyleName( const OUString& rStyleName );
- virtual condformat::ScFormatEntryType GetType() const override { return condformat::DATE; }
+ virtual Type GetType() const override { return Type::Date; }
virtual void UpdateReference( sc::RefUpdateContext& ) override {}
virtual void UpdateInsertTab( sc::RefUpdateInsertTabContext& ) override {}
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& ) override {}
diff --git a/sc/qa/unit/helper/shared_test_impl.hxx b/sc/qa/unit/helper/shared_test_impl.hxx
index 4774fb7ec880..e978191ba337 100644
--- a/sc/qa/unit/helper/shared_test_impl.hxx
+++ b/sc/qa/unit/helper/shared_test_impl.hxx
@@ -64,7 +64,7 @@ void testDataBar_Impl(const ScDocument& rDoc)
CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size());
const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0);
- CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), condformat::DATABAR);
+ CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), ScFormatEntry::Type::Databar);
const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pFormatEntry);
CPPUNIT_ASSERT(pDataBar);
const ScDataBarFormatData* pDataBarData = pDataBar->GetDataBarData();
@@ -101,7 +101,7 @@ void testColorScale2Entry_Impl(const ScDocument& rDoc)
CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size());
const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0);
- CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), condformat::COLORSCALE);
+ CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), ScFormatEntry::Type::Colorscale);
const ScColorScaleFormat* pColFormat = static_cast<const ScColorScaleFormat*>(pFormatEntry);
CPPUNIT_ASSERT_EQUAL(size_t(2), pColFormat->size());
@@ -140,7 +140,7 @@ void testColorScale3Entry_Impl(const ScDocument& rDoc)
CPPUNIT_ASSERT_EQUAL(size_t(1), (*itr)->size());
const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(0);
- CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), condformat::COLORSCALE);
+ CPPUNIT_ASSERT_EQUAL(pFormatEntry->GetType(), ScFormatEntry::Type::Colorscale);
const ScColorScaleFormat* pColFormat = static_cast<const ScColorScaleFormat*>(pFormatEntry);
CPPUNIT_ASSERT_EQUAL(size_t(3), pColFormat->size());
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 1a1ff8fa6452..5f1433c8a989 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2157,7 +2157,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX()
ScConditionalFormat* pFormat = rDoc.GetCondFormat(0, 0, 0);
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), condformat::DATABAR);
+ CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Databar);
const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pEntry);
const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData();
@@ -2171,7 +2171,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX()
CPPUNIT_ASSERT_EQUAL(size_t(1), pFormat->size());
pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), condformat::COLORSCALE);
+ CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Colorscale);
const ScColorScaleFormat* pColorScale = static_cast<const ScColorScaleFormat*>(pEntry);
CPPUNIT_ASSERT_EQUAL(size_t(2), pColorScale->size());
const ScColorScaleEntry* pColorScaleEntry = pColorScale->GetEntry(0);
@@ -2196,7 +2196,7 @@ void ScFiltersTest::testCondFormatThemeColor2XLSX()
CPPUNIT_ASSERT(pFormat);
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), condformat::DATABAR);
+ CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Databar);
const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pEntry);
const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData();
@@ -2215,7 +2215,7 @@ void checkDatabarPositiveColor(const ScConditionalFormat* pFormat, const Color&
CPPUNIT_ASSERT(pFormat);
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), condformat::DATABAR);
+ CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Databar);
const ScDataBarFormat* pDataBar = static_cast<const ScDataBarFormat*>(pEntry);
const ScDataBarFormatData* pDataBarFormatData = pDataBar->GetDataBarData();
@@ -2235,7 +2235,7 @@ void ScFiltersTest::testCondFormatThemeColor3XLSX()
CPPUNIT_ASSERT(pFormat);
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), condformat::COLORSCALE);
+ CPPUNIT_ASSERT_EQUAL(pEntry->GetType(), ScFormatEntry::Type::Colorscale);
const ScColorScaleFormat* pColorScale = static_cast<const ScColorScaleFormat*>(pEntry);
CPPUNIT_ASSERT_EQUAL(size_t(2), pColorScale->size());
@@ -2271,7 +2271,7 @@ void testComplexIconSetsXLSX_Impl(const ScDocument& rDoc, SCCOL nCol, ScIconSetT
CPPUNIT_ASSERT_EQUAL(size_t(1), pFormat->size());
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(condformat::ICONSET, pEntry->GetType());
+ CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Iconset, pEntry->GetType());
const ScIconSetFormat* pIconSet = static_cast<const ScIconSetFormat*>(pEntry);
CPPUNIT_ASSERT_EQUAL(eType, pIconSet->GetIconSetData()->eIconSetType);
}
@@ -2283,7 +2283,7 @@ void testCustomIconSetsXLSX_Impl(const ScDocument& rDoc, SCCOL nCol, SCROW nRow,
CPPUNIT_ASSERT_EQUAL(size_t(1), pFormat->size());
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(condformat::ICONSET, pEntry->GetType());
+ CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Iconset, pEntry->GetType());
const ScIconSetFormat* pIconSet = static_cast<const ScIconSetFormat*>(pEntry);
std::unique_ptr<ScIconSetInfo> pInfo(pIconSet->GetIconSetInfo(ScAddress(nCol, nRow, 1)));
if (nIndex == -1)
@@ -2359,7 +2359,7 @@ void ScFiltersTest::testColorScaleNumWithRefXLSX()
const ScFormatEntry* pEntry = pFormat->GetEntry(0);
CPPUNIT_ASSERT(pEntry);
- CPPUNIT_ASSERT_EQUAL(condformat::COLORSCALE, pEntry->GetType());
+ CPPUNIT_ASSERT_EQUAL(ScFormatEntry::Type::Colorscale, pEntry->GetType());
const ScColorScaleFormat* pColorScale= dynamic_cast<const ScColorScaleFormat*>(pEntry);
CPPUNIT_ASSERT(pColorScale);
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 40efc90dfebe..df484f328c58 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -594,9 +594,9 @@ void ScColorScaleFormat::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt )
(*it)->UpdateMoveTab(rCxt);
}
-condformat::ScFormatEntryType ScColorScaleFormat::GetType() const
+ScFormatEntry::Type ScColorScaleFormat::GetType() const
{
- return condformat::COLORSCALE;
+ return Type::Colorscale;
}
ScColorScaleEntries::iterator ScColorScaleFormat::begin()
@@ -695,9 +695,9 @@ void ScDataBarFormat::SetParent(ScConditionalFormat* pFormat)
ScColorFormat::SetParent(pFormat);
}
-condformat::ScFormatEntryType ScDataBarFormat::GetType() const
+ScFormatEntry::Type ScDataBarFormat::GetType() const
{
- return condformat::DATABAR;
+ return Type::Databar;
}
void ScDataBarFormat::UpdateReference( sc::RefUpdateContext& rCxt )
@@ -1028,9 +1028,9 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const ScAddress& rAddr) const
return pInfo;
}
-condformat::ScFormatEntryType ScIconSetFormat::GetType() const
+ScFormatEntry::Type ScIconSetFormat::GetType() const
{
- return condformat::ICONSET;
+ return Type::Iconset;
}
void ScIconSetFormat::UpdateReference( sc::RefUpdateContext& rCxt )
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 8170d1fcec6f..cd3f8564b54d 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -62,7 +62,7 @@ bool ScFormatEntry::operator==( const ScFormatEntry& r ) const
switch(GetType())
{
- case condformat::CONDITION:
+ case Type::Condition:
return static_cast<const ScCondFormatEntry&>(*this) == static_cast<const ScCondFormatEntry&>(r);
default:
// TODO: implement also this case
@@ -1851,13 +1851,13 @@ const OUString& ScConditionalFormat::GetCellStyle( ScRefCellValue& rCell, const
{
for (auto itr = maEntries.cbegin(); itr != maEntries.cend(); ++itr)
{
- if((*itr)->GetType() == condformat::CONDITION)
+ if((*itr)->GetType() == ScFormatEntry::Type::Condition)
{
const ScCondFormatEntry& rEntry = static_cast<const ScCondFormatEntry&>(**itr);
if (rEntry.IsCellValid(rCell, rPos))
return rEntry.GetStyle();
}
- else if((*itr)->GetType() == condformat::DATE)
+ else if((*itr)->GetType() == ScFormatEntry::Type::Date)
{
const ScCondDateFormatEntry& rEntry = static_cast<const ScCondDateFormatEntry&>(**itr);
if (rEntry.IsValid( rPos ))
@@ -1873,28 +1873,28 @@ ScCondFormatData ScConditionalFormat::GetData( ScRefCellValue& rCell, const ScAd
ScCondFormatData aData;
for(auto itr = maEntries.cbegin(); itr != maEntries.cend(); ++itr)
{
- if((*itr)->GetType() == condformat::CONDITION && aData.aStyleName.isEmpty())
+ if((*itr)->GetType() == ScFormatEntry::Type::Condition && aData.aStyleName.isEmpty())
{
const ScCondFormatEntry& rEntry = static_cast<const ScCondFormatEntry&>(**itr);
if (rEntry.IsCellValid(rCell, rPos))
aData.aStyleName = rEntry.GetStyle();
}
- else if((*itr)->GetType() == condformat::COLORSCALE && !aData.pColorScale)
+ else if((*itr)->GetType() == ScFormatEntry::Type::Colorscale && !aData.pColorScale)
{
const ScColorScaleFormat& rEntry = static_cast<const ScColorScaleFormat&>(**itr);
aData.pColorScale = rEntry.GetColor(rPos);
}
- else if((*itr)->GetType() == condformat::DATABAR && !aData.pDataBar)
+ else if((*itr)->GetType() == ScFormatEntry::Type::Databar && !aData.pDataBar)
{
const ScDataBarFormat& rEntry = static_cast<const ScDataBarFormat&>(**itr);
aData.pDataBar = rEntry.GetDataBarInfo(rPos);
}
- else if((*itr)->GetType() == condformat::ICONSET && !aData.pIconSet)
+ else if((*itr)->GetType() == ScFormatEntry::Type::Iconset && !aData.pIconSet)
{
const ScIconSetFormat& rEntry = static_cast<const ScIconSetFormat&>(**itr);
aData.pIconSet = rEntry.GetIconSetInfo(rPos);
}
- else if((*itr)->GetType() == condformat::DATE && aData.aStyleName.isEmpty())
+ else if((*itr)->GetType() == ScFormatEntry::Type::Date && aData.aStyleName.isEmpty())
{
const ScCondDateFormatEntry& rEntry = static_cast<const ScCondDateFormatEntry&>(**itr);
if ( rEntry.IsValid( rPos ) )
@@ -1913,14 +1913,14 @@ void ScConditionalFormat::DoRepaint()
void ScConditionalFormat::CompileAll()
{
for(auto itr = maEntries.cbegin(); itr != maEntries.cend(); ++itr)
- if((*itr)->GetType() == condformat::CONDITION)
+ if((*itr)->GetType() == ScFormatEntry::Type::Condition)
static_cast<ScCondFormatEntry&>(**itr).CompileAll();
}
void ScConditionalFormat::CompileXML()
{
for(auto itr = maEntries.cbegin(); itr != maEntries.cend(); ++itr)
- if((*itr)->GetType() == condformat::CONDITION)
+ if((*itr)->GetType() == ScFormatEntry::Type::Condition)
static_cast<ScCondFormatEntry&>(**itr).CompileXML();
}
@@ -2043,7 +2043,7 @@ void ScConditionalFormat::DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR
void ScConditionalFormat::RenameCellStyle(const OUString& rOld, const OUString& rNew)
{
for(auto itr = maEntries.cbegin(); itr != maEntries.cend(); ++itr)
- if((*itr)->GetType() == condformat::CONDITION)
+ if((*itr)->GetType() == ScFormatEntry::Type::Condition)
{
ScCondFormatEntry& rFormat = static_cast<ScCondFormatEntry&>(**itr);
if(rFormat.GetStyle() == rOld)
@@ -2055,7 +2055,7 @@ bool ScConditionalFormat::MarkUsedExternalReferences() const
{
bool bAllMarked = false;
for(auto itr = maEntries.cbegin(); itr != maEntries.cend() && !bAllMarked; ++itr)
- if((*itr)->GetType() == condformat::CONDITION)
+ if((*itr)->GetType() == ScFormatEntry::Type::Condition)
{
const ScCondFormatEntry& rFormat = static_cast<const ScCondFormatEntry&>(**itr);
bAllMarked = rFormat.MarkUsedExternalReferences();
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a45d7af408c2..0fbd4abd6942 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -608,9 +608,9 @@ void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO
{
OUString aStyleName;
const ScFormatEntry* pEntry = pNewFormat->GetEntry(i);
- if(pEntry->GetType() == condformat::CONDITION)
+ if(pEntry->GetType() == ScFormatEntry::Type::Condition)
aStyleName = static_cast<const ScCondFormatEntry*>(pEntry)->GetStyle();
- else if(pEntry->GetType() == condformat::DATE)
+ else if(pEntry->GetType() == ScFormatEntry::Type::Date)
aStyleName = static_cast<const ScCondDateFormatEntry*>(pEntry)->GetStyleName();
if(!aStyleName.isEmpty())
@@ -2132,7 +2132,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
for (size_t nEntry=0; nEntry<nEntryCount; nEntry++)
{
const ScFormatEntry* pEntry = pFormat->GetEntry(nEntry);
- if(pEntry->GetType() != condformat::CONDITION)
+ if(pEntry->GetType() != ScFormatEntry::Type::Condition)
continue;
OUString aStyleName = static_cast<const ScCondFormatEntry*>(pEntry)->GetStyle();
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 3164164c2cef..7d69eae7cbe0 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1218,11 +1218,11 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat
for( size_t nIndex = 0, nCount = rCondFormat.size(); nIndex < nCount; ++nIndex )
if( const ScFormatEntry* pFormatEntry = rCondFormat.GetEntry( nIndex ) )
{
- if(pFormatEntry->GetType() == condformat::CONDITION)
+ if(pFormatEntry->GetType() == ScFormatEntry::Type::Condition)
maCFList.AppendNewRecord( new XclExpCF( GetRoot(), static_cast<const ScCondFormatEntry&>(*pFormatEntry), ++rIndex ) );
- else if(pFormatEntry->GetType() == condformat::COLORSCALE)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Colorscale)
maCFList.AppendNewRecord( new XclExpColorScale( GetRoot(), static_cast<const ScColorScaleFormat&>(*pFormatEntry), ++rIndex ) );
- else if(pFormatEntry->GetType() == condformat::DATABAR)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Databar)
{
const ScDataBarFormat& rFormat = static_cast<const ScDataBarFormat&>(*pFormatEntry);
XclExpExtCondFormatData aExtEntry;
@@ -1233,7 +1233,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat
maCFList.AppendNewRecord( new XclExpDataBar( GetRoot(), rFormat, ++rIndex, aExtEntry.aGUID));
}
- else if(pFormatEntry->GetType() == condformat::ICONSET)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Iconset)
{
// don't export iconSet entries that are not in OOXML
const ScIconSetFormat& rIconSet = static_cast<const ScIconSetFormat&>(*pFormatEntry);
@@ -1266,7 +1266,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat
else
maCFList.AppendNewRecord( new XclExpIconSet( GetRoot(), rIconSet, ++rIndex ) );
}
- else if(pFormatEntry->GetType() == condformat::DATE)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Date)
maCFList.AppendNewRecord( new XclExpDateFormat( GetRoot(), static_cast<const ScCondDateFormatEntry&>(*pFormatEntry), ++rIndex ) );
}
aScRanges.Format( msSeqRef, ScRefFlags::VALID, nullptr, formula::FormulaGrammar::CONV_XL_OOX, ' ' );
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index 64c5bb862e6b..52d90b14867e 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -266,14 +266,14 @@ XclExpExtCfRule::XclExpExtCfRule( const XclExpRoot& rRoot, const ScFormatEntry&
{
switch (rFormat.GetType())
{
- case condformat::DATABAR:
+ case ScFormatEntry::Type::Databar:
{
const ScDataBarFormat& rDataBar = static_cast<const ScDataBarFormat&>(rFormat);
mxEntry.reset( new XclExpExtDataBar( *this, rDataBar, rPos ) );
pType = "dataBar";
}
break;
- case condformat::ICONSET:
+ case ScFormatEntry::Type::Iconset:
{
const ScIconSetFormat& rIconSet = static_cast<const ScIconSetFormat&>(rFormat);
mxEntry.reset(new XclExpExtIconSet(*this, rIconSet, rPos));
@@ -314,7 +314,7 @@ XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot
const ScFormatEntry* pEntry = itr->pEntry;
switch (pEntry->GetType())
{
- case condformat::ICONSET:
+ case ScFormatEntry::Type::Iconset:
{
const ScIconSetFormat& rIconSet = static_cast<const ScIconSetFormat&>(*pEntry);
bool bNeedsExt = false;
@@ -340,7 +340,7 @@ XclExpExtConditionalFormatting::XclExpExtConditionalFormatting( const XclExpRoot
}
}
break;
- case condformat::DATABAR:
+ case ScFormatEntry::Type::Databar:
maCfRules.AppendNewRecord(new XclExpExtCfRule( *this, *pEntry, aAddr, itr->aGUID, itr->nPriority));
break;
default:
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 163a12aff31f..25cda7d56db7 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -2991,12 +2991,12 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
for (size_t nFormatEntry = 0; nFormatEntry < nEntryCount; ++nFormatEntry)
{
const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(nFormatEntry);
- if (!pFormatEntry || (pFormatEntry->GetType() != condformat::CONDITION &&
- pFormatEntry->GetType() != condformat::DATE))
+ if (!pFormatEntry || (pFormatEntry->GetType() != ScFormatEntry::Type::Condition &&
+ pFormatEntry->GetType() != ScFormatEntry::Type::Date))
continue;
OUString aStyleName;
- if(pFormatEntry->GetType() == condformat::CONDITION)
+ if(pFormatEntry->GetType() == ScFormatEntry::Type::Condition)
{
const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry);
aStyleName= pEntry->GetStyle();
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 9938cf10d5fd..c19cf038ee7b 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -142,7 +142,7 @@ private:
std::unique_ptr<ScConditionalFormat> mpCurrentFormat;
- condformat::ScFormatEntryType meEntryType;
+ ScFormatEntry::Type meEntryType;
};
class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 3a250c787679..3f29d5256688 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -85,7 +85,7 @@ ContextHandlerRef ExtConditionalFormattingContext::onCreateContext(sal_Int32 nEl
if (mpCurrentRule)
{
ScFormatEntry& rFormat = *maEntries.rbegin()->get();
- assert(rFormat.GetType() == condformat::ICONSET);
+ assert(rFormat.GetType() == ScFormatEntry::Type::Iconset);
ScIconSetFormat& rIconSet = static_cast<ScIconSetFormat&>(rFormat);
ScDocument* pDoc = &getScDocument();
SCTAB nTab = getSheetIndex();
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index de52b861e5fc..50b009cae3b9 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -305,7 +305,7 @@ ScOrcusConditionalFormat::ScOrcusConditionalFormat(SCTAB nTab, ScDocument& rDoc)
mnTab(nTab),
mrDoc(rDoc),
mpCurrentFormat(new ScConditionalFormat(0, &mrDoc)),
- meEntryType(condformat::CONDITION)
+ meEntryType(ScFormatEntry::Type::Condition)
{
}
@@ -321,7 +321,7 @@ void ScOrcusConditionalFormat::set_color(os::color_elem_t /*alpha*/, os::color_e
void ScOrcusConditionalFormat::set_condition_type(os::condition_type_t /*type*/)
{
- assert(meEntryType == condformat::CONDITION);
+ assert(meEntryType == ScFormatEntry::Type::Condition);
SAL_INFO("sc.orcus.condformat", "set_condition_type");
}
@@ -332,7 +332,7 @@ void ScOrcusConditionalFormat::set_formula(const char* /*p*/, size_t /*n*/)
void ScOrcusConditionalFormat::set_date(os::condition_date_t /*date*/)
{
- assert(meEntryType == condformat::DATE);
+ assert(meEntryType == ScFormatEntry::Type::Date);
SAL_INFO("sc.orcus.condformat", "set_date");
}
@@ -343,45 +343,45 @@ void ScOrcusConditionalFormat::commit_condition()
void ScOrcusConditionalFormat::set_icon_name(const char* /*p*/, size_t /*n*/)
{
- assert(meEntryType == condformat::ICONSET);
+ assert(meEntryType == ScFormatEntry::Type::Iconset);
SAL_INFO("sc.orcus.condformat", "set_icon_name");
}
void ScOrcusConditionalFormat::set_databar_gradient(bool /*gradient*/)
{
- assert(meEntryType == condformat::DATABAR);
+ assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_databar_gradient");
}
void ScOrcusConditionalFormat::set_databar_axis(os::databar_axis_t /*axis*/)
{
- assert(meEntryType == condformat::DATABAR);
+ assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_databar_axis");
}
void ScOrcusConditionalFormat::set_databar_color_positive(os::color_elem_t /*alpha*/, os::color_elem_t /*red*/,
os::color_elem_t /*green*/, os::color_elem_t /*blue*/)
{
- assert(meEntryType == condformat::DATABAR);
+ assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_databar_color_positive");
}
void ScOrcusConditionalFormat::set_databar_color_negative(os::color_elem_t /*alpha*/, os::color_elem_t /*red*/,
os::color_elem_t /*green*/, os::color_elem_t /*blue*/)
{
- assert(meEntryType == condformat::DATABAR);
+ assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_databar_color_negative");
}
void ScOrcusConditionalFormat::set_min_databar_length(double /*length*/)
{
- assert(meEntryType == condformat::DATABAR);
+ assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_min_databar_length");
}
void ScOrcusConditionalFormat::set_max_databar_length(double /*length*/)
{
- assert(meEntryType == condformat::DATABAR);
+ assert(meEntryType == ScFormatEntry::Type::Databar);
SAL_INFO("sc.orcus.condformat", "set_max_databar_length");
}
@@ -392,7 +392,7 @@ void ScOrcusConditionalFormat::set_show_value(bool /*show*/)
void ScOrcusConditionalFormat::set_iconset_reverse(bool /*reverse*/)
{
- assert(meEntryType == condformat::ICONSET);
+ assert(meEntryType == ScFormatEntry::Type::Iconset);
SAL_INFO("sc.orcus.condformat", "set_iconset_reverse");
}
@@ -412,7 +412,7 @@ void ScOrcusConditionalFormat::set_type(os::conditional_format_t type)
{
case os::conditional_format_t::condition:
case os::conditional_format_t::formula:
- meEntryType = condformat::CONDITION;
+ meEntryType = ScFormatEntry::Type::Condition;
// mpCurrentEntry.reset(new ScCondFormatEntry());
break;
case os::conditional_format_t::date:
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 5db0920c020d..294956f91daf 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4255,7 +4255,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
for(size_t i = 0; i < nEntries; ++i)
{
const ScFormatEntry* pFormatEntry = (*itr)->GetEntry(i);
- if(pFormatEntry->GetType()==condformat::CONDITION)
+ if(pFormatEntry->GetType()==ScFormatEntry::Type::Condition)
{
const ScCondFormatEntry* pEntry = static_cast<const ScCondFormatEntry*>(pFormatEntry);
OUStringBuffer aCond;
@@ -4383,7 +4383,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
AddAttribute(XML_NAMESPACE_CALC_EXT, XML_BASE_CELL_ADDRESS, sBaseAddress);
SvXMLElementExport aElementCondEntry(*this, XML_NAMESPACE_CALC_EXT, XML_CONDITION, true, true);
}
- else if(pFormatEntry->GetType() == condformat::COLORSCALE)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Colorscale)
{
SvXMLElementExport aElementColorScale(*this, XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE, true, true);
const ScColorScaleFormat& rColorScale = static_cast<const ScColorScaleFormat&>(*pFormatEntry);
@@ -4405,7 +4405,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_COLOR_SCALE_ENTRY, true, true);
}
}
- else if(pFormatEntry->GetType() == condformat::DATABAR)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Databar)
{
const ScDataBarFormatData* pFormatData = static_cast<const ScDataBarFormat&>(*pFormatEntry).GetDataBarData();
if(!pFormatData->mbGradient)
@@ -4480,7 +4480,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true);
}
}
- else if(pFormatEntry->GetType() == condformat::ICONSET)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Iconset)
{
const ScIconSetFormat& rIconSet = static_cast<const ScIconSetFormat&>(*pFormatEntry);
OUString aIconSetName = getIconSetName(rIconSet.GetIconSetData()->eIconSetType);
@@ -4519,7 +4519,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true);
}
}
- else if(pFormatEntry->GetType() == condformat::DATE)
+ else if(pFormatEntry->GetType() == ScFormatEntry::Type::Date)
{
const ScCondDateFormatEntry& rDateFormat = static_cast<const ScCondDateFormatEntry&>(*pFormatEntry);
OUString aDateType = getDateStringForType(rDateFormat.GetDateType());
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index b7b0c40a73d8..1a5ccb659943 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -85,7 +85,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
const ScFormatEntry* pEntry = pFormat->GetEntry(nIndex);
switch(pEntry->GetType())
{
- case condformat::CONDITION:
+ case ScFormatEntry::Type::Condition:
{
const ScCondFormatEntry* pConditionEntry = static_cast<const ScCondFormatEntry*>( pEntry );
if(pConditionEntry->GetOperation() != ScConditionMode::Direct)
@@ -95,7 +95,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
}
break;
- case condformat::COLORSCALE:
+ case ScFormatEntry::Type::Colorscale:
{
const ScColorScaleFormat* pColorScale = static_cast<const ScColorScaleFormat*>( pEntry );
if( pColorScale->size() == 2 )
@@ -104,13 +104,13 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
maEntries.push_back(VclPtr<ScColorScale3FrmtEntry>::Create( this, mpDoc, maPos, pColorScale ) );
}
break;
- case condformat::DATABAR:
+ case ScFormatEntry::Type::Databar:
maEntries.push_back(VclPtr<ScDataBarFrmtEntry>::Create( this, mpDoc, maPos, static_cast<const ScDataBarFormat*>( pEntry ) ) );
break;
- case condformat::ICONSET:
+ case ScFormatEntry::Type::Iconset:
maEntries.push_back(VclPtr<ScIconSetFrmtEntry>::Create( this, mpDoc, maPos, static_cast<const ScIconSetFormat*>( pEntry ) ) );
break;
- case condformat::DATE:
+ case ScFormatEntry::Type::Date:
maEntries.push_back(VclPtr<ScDateFrmtEntry>::Create( this, mpDoc, static_cast<const ScCondDateFormatEntry*>( pEntry ) ) );
break;
}
diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx
index 254be980b726..804811b0a925 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -130,7 +130,7 @@ OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, c
{
switch(rFormat.GetEntry(0)->GetType())
{
- case condformat::CONDITION:
+ case ScFormatEntry::Type::Condition:
{
const ScConditionEntry* pEntry = static_cast<const ScConditionEntry*>(rFormat.GetEntry(0));
ScConditionMode eMode = pEntry->GetOperation();
@@ -162,16 +162,16 @@ OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat& rFormat, c
}
break;
- case condformat::DATABAR:
+ case ScFormatEntry::Type::Databar:
aBuffer.append(getTextForType(DATABAR));
break;
- case condformat::COLORSCALE:
+ case ScFormatEntry::Type::Colorscale:
aBuffer.append(getTextForType(COLORSCALE));
break;
- case condformat::ICONSET:
+ case ScFormatEntry::Type::Iconset:
aBuffer.append(getTextForType(ICONSET));
break;
- case condformat::DATE:
+ case ScFormatEntry::Type::Date:
{
aBuffer.append(getTextForType(DATE));
aBuffer.append(" ");
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index b9a1ab0bde82..f841f075790e 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -409,23 +409,23 @@ uno::Reference<beans::XPropertySet> createConditionEntry(const ScFormatEntry* pE
{
switch (pEntry->GetType())
{
- case condformat::CONDITION:
+ case ScFormatEntry::Type::Condition:
return new ScConditionEntryObj(xParent,
static_cast<const ScCondFormatEntry*>(pEntry));
break;
- case condformat::COLORSCALE:
+ case ScFormatEntry::Type::Colorscale:
return new ScColorScaleFormatObj(xParent,
static_cast<const ScColorScaleFormat*>(pEntry));
break;
- case condformat::DATABAR:
+ case ScFormatEntry::Type::Databar:
return new ScDataBarFormatObj(xParent,
static_cast<const ScDataBarFormat*>(pEntry));
break;
- case condformat::ICONSET:
+ case ScFormatEntry::Type::Iconset:
return new ScIconSetFormatObj(xParent,
static_cast<const ScIconSetFormat*>(pEntry));
break;
- case condformat::DATE:
+ case ScFormatEntry::Type::Date:
return new ScCondDateFormatObj(xParent,
static_cast<const ScCondDateFormatEntry*>(pEntry));
break;
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 365b0d036ca1..731154e4e13e 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -159,7 +159,7 @@ ScTableConditionalFormat::ScTableConditionalFormat(
{
ScCondFormatEntryItem aItem;
const ScFormatEntry* pFrmtEntry = pFormat->GetEntry(i);
- if(pFrmtEntry->GetType() != condformat::CONDITION)
+ if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition)
continue;
const ScCondFormatEntry* pFormatEntry = static_cast<const ScCondFormatEntry*>(pFrmtEntry);
More information about the Libreoffice-commits
mailing list