diff options
-rw-r--r-- | sc/inc/colorscale.hxx | 13 | ||||
-rw-r--r-- | sc/inc/conditio.hxx | 18 | ||||
-rw-r--r-- | sc/source/core/data/colorscale.cxx | 100 | ||||
-rw-r--r-- | sc/source/core/data/conditio.cxx | 16 |
4 files changed, 0 insertions, 147 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index b63c7212aa43..d957ee149a02 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -90,9 +90,6 @@ public: ScColorScaleEntryType GetType() const; void SetType( ScColorScaleEntryType eType ); -#if DUMP_FORMAT_INFO - void dumpInfo(rtl::OUStringBuffer& rBuf) const; -#endif }; namespace databar @@ -274,10 +271,6 @@ public: const_iterator end() const; size_t size() const; - -#if DUMP_FORMAT_INFO - virtual void dumpInfo(rtl::OUStringBuffer& rBuf) const; -#endif }; class SC_DLLPUBLIC ScDataBarFormat : public ScColorFormat @@ -299,9 +292,6 @@ public: virtual condformat::ScFormatEntryType GetType() const; -#if DUMP_FORMAT_INFO - virtual void dumpInfo(rtl::OUStringBuffer& rBuf) const; -#endif private: double getMin(double nMin, double nMax) const; double getMax(double nMin, double nMax) const; @@ -355,9 +345,6 @@ public: iterator end(); const_iterator end() const; -#if DUMP_FORMAT_INFO - virtual void dumpInfo(rtl::OUStringBuffer& rBuf) const; -#endif private: double GetMinValue() const; diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index cb4331318df8..dba96735c43d 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -43,8 +43,6 @@ class ScTokenArray; // nOptions Flags #define SC_COND_NOBLANKS 1 -#define DUMP_FORMAT_INFO 1 - enum ScConditionMode { SC_COND_EQUAL, @@ -121,10 +119,6 @@ public: bool operator==( const ScFormatEntry& ) const; -#if DUMP_FORMAT_INFO - virtual void dumpInfo(rtl::OUStringBuffer& rBuf) const = 0; -#endif - virtual void startRendering(); virtual void endRendering(); protected: @@ -235,10 +229,6 @@ public: static ScConditionMode GetModeFromApi(sal_Int32 nOperator); -#if DUMP_FORMAT_INFO - virtual void dumpInfo(rtl::OUStringBuffer& ) const {} -#endif - virtual void endRendering(); virtual void startRendering(); @@ -361,10 +351,6 @@ public: bool operator==( const ScFormatEntry& ) const; -#if DUMP_FORMAT_INFO - virtual void dumpInfo(rtl::OUStringBuffer& rBuf) const; -#endif - virtual void startRendering(); virtual void endRendering(); @@ -431,10 +417,6 @@ public: bool MarkUsedExternalReferences() const; -#if DUMP_FORMAT_INFO - void dumpInfo(rtl::OUStringBuffer& rBuf) const; -#endif - // sorted (via PTRARR) by Index // operator== only for sorting bool operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 16a8575d023e..b4f58bcf326d 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -32,9 +32,6 @@ #include "fillinfo.hxx" #include "iconsets.hrc" #include "scresid.hxx" -#if DUMP_FORMAT_INFO -#include <iostream> -#endif #include <algorithm> @@ -158,44 +155,6 @@ void ScColorScaleEntry::SetColor(const Color& rColor) maColor = rColor; } -#if DUMP_FORMAT_INFO - -void ScColorScaleEntry::dumpInfo(rtl::OUStringBuffer& rBuf) const -{ - rBuf.append("Color Scale Entry\n"); - rBuf.append("Type: "); - switch(meType) - { - case COLORSCALE_VALUE: - rBuf.append( "Value\n" ); - break; - case COLORSCALE_MIN: - rBuf.append( "Min\n" ); - break; - case COLORSCALE_MAX: - rBuf.append( "Max\n" ); - break; - case COLORSCALE_PERCENT: - rBuf.append( "Percent\n" ); - break; - case COLORSCALE_PERCENTILE: - rBuf.append( "Percentile\n" ); - break; - case COLORSCALE_FORMULA: - rBuf.append( "Formual\n" ); - break; - default: - rBuf.append( "Unsupported Type\n" ); - } - rBuf.append( "Color: " ).append( (sal_Int32)maColor.GetRed() ).append( "," ).append( (sal_Int32)maColor.GetGreen() ).append( "," ).append( (sal_Int32)maColor.GetBlue() ).append( "\n" ); - if(meType == COLORSCALE_FORMULA) - rBuf.append( "Formula: " ).append( GetFormula( formula::FormulaGrammar::GRAM_DEFAULT ) ).append("\n"); - else if( meType != COLORSCALE_MIN && meType != COLORSCALE_MAX ) - rBuf.append( "Value: " ).append( mnVal ).append( "\n" ); -} - -#endif - ScColorFormat::ScColorFormat(ScDocument* pDoc): ScFormatEntry(pDoc) { @@ -487,34 +446,6 @@ Color* ScColorScaleFormat::GetColor( const ScAddress& rAddr ) const return new Color(aColor); } -#if DUMP_FORMAT_INFO -void ScColorScaleFormat::dumpInfo(rtl::OUStringBuffer& rBuf) const -{ - rBuf.append("Color Scale with ").append(static_cast<sal_Int32>(size())).append(" entries\n"); - for(const_iterator itr = begin(); itr != end(); ++itr) - { - itr->dumpInfo(rBuf); - } - - const ScRangeList& rRange = GetRange(); - size_t n = rRange.size(); - for(size_t i = 0; i < n; ++i) - { - const ScRange* pRange = rRange[i]; - SCTAB nTab = pRange->aStart.Tab(); - for( SCCOL nCol = pRange->aStart.Col(), nEndCol = pRange->aEnd.Col(); nCol <= nEndCol; ++nCol) - { - for( SCROW nRow = pRange->aStart.Row(), nEndRow = pRange->aEnd.Row(); nRow <= nEndRow; ++nRow) - { - boost::scoped_ptr<Color> pColor( GetColor(ScAddress(nCol, nRow, nTab)) ); - rBuf.append((sal_Int32)nCol).append(",").append(nRow).append(",").append((sal_Int32)nTab).append(","); - rBuf.append(((sal_Int32)pColor->GetRed())).append(",").append(((sal_Int32)pColor->GetGreen())).append(",").append(((sal_Int32)pColor->GetBlue())).append("\n"); - } - } - } -} -#endif - void ScColorScaleFormat::UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab) { SCTAB nThisTab = GetRange().front()->aStart.Tab(); @@ -835,28 +766,6 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const return pInfo; } -#if DUMP_FORMAT_INFO -void ScDataBarFormat::dumpInfo(rtl::OUStringBuffer& rBuf) const -{ - const ScRangeList& rRange = GetRange(); - size_t n = rRange.size(); - for(size_t i = 0; i < n; ++i) - { - const ScRange* pRange = rRange[i]; - SCTAB nTab = pRange->aStart.Tab(); - for( SCCOL nCol = pRange->aStart.Col(), nEndCol = pRange->aEnd.Col(); nCol <= nEndCol; ++nCol) - { - for( SCROW nRow = pRange->aStart.Row(), nEndRow = pRange->aEnd.Row(); nRow <= nEndRow; ++nRow) - { - boost::scoped_ptr<ScDataBarInfo> pInfo( GetDataBarInfo(ScAddress(nCol, nRow, nTab)) ); - rBuf.append((sal_Int32) nCol).append(",").append(nRow).append(",").append((sal_Int32) nTab).append(",").append(pInfo->mnZero).append(","); - rBuf.append(pInfo->mnLength).append(",").append((sal_Bool)pInfo->mbGradient).append(",").append((sal_Bool)pInfo->mbShowValue).append("\n"); - } - } - } -} -#endif - ScIconSetFormat::ScIconSetFormat(ScDocument* pDoc): ScColorFormat(pDoc), mpFormatData(new ScIconSetFormatData) @@ -964,15 +873,6 @@ void ScIconSetFormat::UpdateReference( UpdateRefMode eUpdateRefMode, } } -void ScIconSetFormat::dumpInfo( rtl::OUStringBuffer& rBuffer ) const -{ - rBuffer.append("IconSet: \n"); - for(const_iterator itr = begin(); itr != end(); ++itr) - { - itr->dumpInfo(rBuffer); - } -} - ScIconSetFormat::iterator ScIconSetFormat::begin() { return mpFormatData->maEntries.begin(); diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index fbda30227ce2..cecb844b7f47 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1801,11 +1801,6 @@ bool ScCondDateFormatEntry::operator==( const ScFormatEntry& r ) const return rEntry.maStyleName == maStyleName; } -void ScCondDateFormatEntry::dumpInfo( rtl::OUStringBuffer& rBuffer ) const -{ - rBuffer.append("Date Format"); -} - void ScCondDateFormatEntry::startRendering() { mpCache.reset(); @@ -1954,17 +1949,6 @@ ScCondFormatData ScConditionalFormat::GetData( ScBaseCell* pCell, const ScAddres return aData; } - -#if DUMP_FORMAT_INFO -void ScConditionalFormat::dumpInfo(rtl::OUStringBuffer& rBuf) const -{ - for(CondFormatContainer::const_iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) - { - itr->dumpInfo(rBuf); - } -} -#endif - void ScConditionalFormat::DoRepaint( const ScRange* pModified ) { if(pModified) |