diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-05 10:14:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-05 10:14:49 +0100 |
commit | 1205e9e393ca12740cd6af1a51e05ea8d223c30f (patch) | |
tree | 2557e3ac6238b079452d9a30ea558c5d9035b907 /sc | |
parent | fd0ede6f5d60e69a6002bcab05ef3edb227af96a (diff) |
drop some unused code
Change-Id: I952fa56cb8cef0321688ccd117659c8603f71e16
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/colorscale.hxx | 3 | ||||
-rw-r--r-- | sc/inc/conditio.hxx | 7 | ||||
-rw-r--r-- | sc/inc/dbdata.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dociter.hxx | 1 | ||||
-rw-r--r-- | sc/inc/document.hxx | 1 | ||||
-rw-r--r-- | sc/inc/table.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/colorscale.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/data/conditio.cxx | 11 | ||||
-rw-r--r-- | sc/source/core/data/dociter.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/data/documen4.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/data/table1.cxx | 5 | ||||
-rw-r--r-- | sc/source/core/tool/dbdata.cxx | 19 | ||||
-rw-r--r-- | sc/source/filter/inc/sheetdatabuffer.hxx | 11 | ||||
-rw-r--r-- | sc/source/filter/oox/sheetdatabuffer.cxx | 20 |
14 files changed, 4 insertions, 95 deletions
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx index 562f981fbf79..d8b294c13e0b 100644 --- a/sc/inc/colorscale.hxx +++ b/sc/inc/colorscale.hxx @@ -238,8 +238,7 @@ private: typedef boost::ptr_vector<ScColorFormat> ColorFormatContainer; ColorFormatContainer maColorScaleFormats; public: - ScColorFormatList() {}; - ScColorFormatList(ScDocument* pDoc, const ScColorFormatList& rList); + ScColorFormatList() {} ScColorFormatList(const ScColorFormatList& rList); typedef ColorFormatContainer::iterator iterator; diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index f0acc9004487..6a62a2b24fda 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -269,10 +269,9 @@ private: boost::ptr_set<ScConditionalFormat> maConditionalFormats; typedef boost::ptr_set<ScConditionalFormat> ConditionalFormatContainer; public: - ScConditionalFormatList() {} - ScConditionalFormatList(const ScConditionalFormatList& rList); - ScConditionalFormatList(ScDocument* pNewDoc, const ScConditionalFormatList& rList); - ~ScConditionalFormatList() {} + ScConditionalFormatList() {} + ScConditionalFormatList(const ScConditionalFormatList& rList); + ~ScConditionalFormatList() {} void InsertNew( ScConditionalFormat* pNew ) { maConditionalFormats.insert(pNew); } diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 538ea9e2c7f8..6534ac61b03a 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -96,7 +96,6 @@ public: bool operator== (const ScDBData& rData) const; - SCTAB GetTable() const; const ::rtl::OUString& GetName() const { return aName; } const ::rtl::OUString& GetUpperName() const { return aUpper; } void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 79495e1c8e43..fe7aa547c542 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -573,7 +573,6 @@ public: SCTAB mnTab; ::boost::shared_ptr<ScFlatBoolRowSegments> mpRanges; - TabRanges(); TabRanges(SCTAB nTab); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 20b47abe25e5..5508c32c42a3 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1207,7 +1207,6 @@ public: SC_DLLPUBLIC const ScValidationData* GetValidationEntry( sal_uLong nIndex ) const; SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const; - void SetCondFormList(ScConditionalFormatList* pNew, SCTAB nTab); SC_DLLPUBLIC const ScColorFormatList* GetColorScaleList(SCTAB nTab) const; SC_DLLPUBLIC ScColorFormatList* GetColorScaleList(SCTAB nTab); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 397da579b096..c417562a2a15 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -801,7 +801,6 @@ public: ScConditionalFormatList* GetCondFormList(); const ScConditionalFormatList* GetCondFormList() const; - void SetCondFormList(ScConditionalFormatList* pNew); sal_uLong AddCondFormat( const ScConditionalFormat& rNew ); sal_uLong AddColorFormat( ScColorFormat* pNew ); diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 62b16e2d784a..f28cca8395f8 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -870,14 +870,6 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const //----------------------------------------------------------------- -ScColorFormatList::ScColorFormatList(ScDocument* pDoc, const ScColorFormatList& rList) -{ - for(const_iterator itr = rList.begin(); itr != rList.end(); ++itr) - { - maColorScaleFormats.push_back(itr->Clone(pDoc)); - } -} - void ScColorFormatList::AddFormat( ScColorFormat* pFormat ) { maColorScaleFormats.push_back( pFormat ); diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index bbf3beb64a69..fc9e13b47028 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1621,17 +1621,6 @@ ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& //! sortierte Eintraege aus rList schneller einfuegen ??? } -ScConditionalFormatList::ScConditionalFormatList(ScDocument* pNewDoc, - const ScConditionalFormatList& rList) -{ - // fuer neues Dokument - echte Kopie mit neuen Tokens! - - for(const_iterator itr = rList.begin(); itr != rList.end(); ++itr) - InsertNew( itr->Clone(pNewDoc) ); - - //! sortierte Eintraege aus rList schneller einfuegen ??? -} - bool ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const { // fuer Ref-Undo - interne Variablen werden nicht verglichen diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 009f907ef977..92c7cbd2bfef 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -2205,11 +2205,6 @@ const ScPatternAttr* ScDocAttrIterator::GetNext( SCCOL& rCol, SCROW& rRow1, SCRO // ============================================================================ -ScDocRowHeightUpdater::TabRanges::TabRanges() : - mnTab(0), mpRanges(new ScFlatBoolRowSegments) -{ -} - ScDocRowHeightUpdater::TabRanges::TabRanges(SCTAB nTab) : mnTab(nTab), mpRanges(new ScFlatBoolRowSegments) { diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index c18b993768c7..fc74ff69eac9 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -778,12 +778,6 @@ void ScDocument::ConditionalChanged( sal_uLong nKey, SCTAB nTab ) } } -void ScDocument::SetCondFormList(ScConditionalFormatList* pNew, SCTAB nTab) -{ - if(VALIDTAB(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) - maTabs[nTab]->SetCondFormList(pNew); -} - //------------------------------------------------------------------------ bool ScDocument::HasDetectiveOperations() const diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 14eaa87f1e31..c349eb440ec8 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2036,11 +2036,6 @@ const ScColorFormatList* ScTable::GetColorFormatList() const return mpColorFormatList.get(); } -void ScTable::SetCondFormList( ScConditionalFormatList* pNew ) -{ - mpCondFormatList.reset( pNew ); -} - ScConditionalFormatList* ScTable::GetCondFormList() { if(!mpCondFormatList) diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 32b15c758315..bb5475cb725d 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -168,11 +168,6 @@ ScDBData& ScDBData::operator= (const ScDBData& rData) return *this; } -SCTAB ScDBData::GetTable() const -{ - return nTable; -} - bool ScDBData::operator== (const ScDBData& rData) const { // Daten, die nicht in den Params sind @@ -668,20 +663,6 @@ public: } }; -class FindFilterDBByTable : public unary_function<ScDBData, bool> -{ - SCTAB mnTab; -public: - FindFilterDBByTable(SCTAB nTab) : mnTab(nTab) {} - bool operator() (const ScDBData& r) const - { - if (r.GetTable() != mnTab) - return false; - - return (r.HasAutoFilter() || r.HasQueryParam()); - } -}; - } ScDBCollection::NamedDBs::NamedDBs(ScDBCollection& rParent, ScDocument& rDoc) : diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index c8dc45103596..fdbfa12d3f61 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -96,17 +96,6 @@ class CellBlock : public WorksheetHelper public: explicit CellBlock( const WorksheetHelper& rHelper, const ValueRange& rColSpan, sal_Int32 nRow ); - /** Returns true, if the own colspan contains the passed column. */ - bool contains( sal_Int32 nCol ) const; - - /** Returns the specified cell from the last row in the cell buffer array. */ - ::com::sun::star::uno::Any& getCellAny( sal_Int32 nCol ); - /** Inserts a rich-string into the cell block. */ - void insertRichString( - const ::com::sun::star::table::CellAddress& rAddress, - const RichStringRef& rxString, - const Font* pFirstPortionFont ); - /** Writes all buffered cells into the Calc sheet. */ void finalizeImport(); diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 2a04f8a5d259..3f0aea4b3aae 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -137,26 +137,6 @@ CellBlock::CellBlock( const WorksheetHelper& rHelper, const ValueRange& rColSpan mpCurrCellRow = maCellArray[ 0 ].getArray(); } -bool CellBlock::contains( sal_Int32 nCol ) const -{ - return (maRange.StartColumn <= nCol) && (nCol <= maRange.EndColumn); -} - -void CellBlock::insertRichString( const CellAddress& rAddress, const RichStringRef& rxString, const Font* pFirstPortionFont ) -{ - maRichStrings.push_back( RichStringCell( rAddress, rxString, pFirstPortionFont ) ); -} - -Any& CellBlock::getCellAny( sal_Int32 nCol ) -{ - OSL_ENSURE( contains( nCol ), "CellBlock::getCellAny - invalid column" ); - // fill cells before passed column with empty strings (the placeholder for empty cells) - sal_Int32 nIndex = nCol - maRange.StartColumn; - fillUnusedCells( nIndex ); - mnFirstFreeIndex = nIndex + 1; - return mpCurrCellRow[ nIndex ]; -} - void CellBlock::finalizeImport() { // fill last cells in last row with empty strings (placeholder for empty cells) |