diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-01-17 15:28:11 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-01-17 17:01:26 +0100 |
commit | 804e86170ff2570fd3826b4ac26d1c927e751ac3 (patch) | |
tree | 0c24d6df02314b38dc17650030da80419a94b6b2 /sc | |
parent | 3c8478e26bde41c35c75557d985f5734d8d1a2bd (diff) |
remove unused methods
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/cell.hxx | 1 | ||||
-rw-r--r-- | sc/inc/document.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/data/cell2.cxx | 26 | ||||
-rw-r--r-- | sc/source/core/data/document.cxx | 23 | ||||
-rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 11 | ||||
-rw-r--r-- | sc/source/ui/inc/namedlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/namedlg/namedlg.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/vba/vbachart.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/vba/vbachart.hxx | 1 |
9 files changed, 0 insertions, 90 deletions
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index fa1b7195e1a2..52244f6dca93 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -454,7 +454,6 @@ public: void UpdateRenameTab(SCTAB nTable, const String& rName); bool TestTabRefAbs(SCTAB nTable); void UpdateCompile( bool bForceIfNameInUse = false ); - bool IsRangeNameInUse(sal_uInt16 nIndex) const; void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const; void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ); bool IsSubTotal() const { return bSubTotal; } diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 2d232e7a0d66..4a0c1869f5b2 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -576,7 +576,6 @@ public: static SC_DLLPUBLIC bool ValidTabName( const rtl::OUString& rName ); SC_DLLPUBLIC bool ValidNewTabName( const rtl::OUString& rName ) const; - SC_DLLPUBLIC bool ValidNewTabName( const std::vector<rtl::OUString>& rName ) const; SC_DLLPUBLIC void CreateValidTabName(rtl::OUString& rName) const; SC_DLLPUBLIC void CreateValidTabNames(std::vector<rtl::OUString>& aNames, SCTAB nCount) const; diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 95e9bc788822..e06d466fb270 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -1534,32 +1534,6 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY StartListeningTo( pDocument ); // Listener wie vorher } -bool lcl_IsRangeNameInUse(size_t nIndex, ScTokenArray* pCode, ScRangeName* pNames) -{ - for (FormulaToken* p = pCode->First(); p; p = pCode->Next()) - { - if (p->GetOpCode() == ocName) - { - if (p->GetIndex() == static_cast<sal_uInt16>(nIndex)) - return true; - else - { - // RangeData kann Null sein in bestimmten Excel-Dateien - ScRangeData* pSubName = pNames->findByIndex(p->GetIndex()); - if (pSubName && lcl_IsRangeNameInUse(nIndex, - pSubName->GetCode(), pNames)) - return true; - } - } - } - return false; -} - -bool ScFormulaCell::IsRangeNameInUse(sal_uInt16 nIndex) const -{ - return lcl_IsRangeNameInUse( nIndex, pCode, pDocument->GetRangeName() ); -} - void lcl_FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes, ScTokenArray* pCode, ScRangeName* pNames) { for (FormulaToken* p = pCode->First(); p; p = pCode->Next()) diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index dbc4cecc5087..e5420cb5403e 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -302,29 +302,6 @@ bool ScDocument::ValidNewTabName( const rtl::OUString& rName ) const } -bool ScDocument::ValidNewTabName( const std::vector<rtl::OUString>& rNames ) const//TODO:FIXME what is if there are duplicates in rNames -{ - bool bValid = true; - std::vector<rtl::OUString>::const_iterator nameIter = rNames.begin(); - for (;nameIter != rNames.end() && bValid; ++nameIter) - { - bValid = ValidTabName(*nameIter); - } - TableContainer::const_iterator it = maTabs.begin(); - for (; it != maTabs.end() && bValid; ++it) - if ( *it ) - { - for (nameIter = rNames.begin(); nameIter != rNames.end(); ++nameIter) - { - rtl::OUString aOldName; - (*it)->GetName(aOldName); - bValid = !ScGlobal::GetpTransliteration()->isEqual( *nameIter, aOldName ); - } - } - return bValid; -} - - void ScDocument::CreateValidTabName(rtl::OUString& rName) const { if ( !ValidTabName(rName) ) diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 71d811491fa7..5256e9ad623e 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -188,7 +188,6 @@ public: void GetDimensions( SCSIZE& rC, SCSIZE& rR) const; SCSIZE GetElementCount() const; bool ValidColRow( SCSIZE nC, SCSIZE nR) const; - SCSIZE CalcOffset( SCSIZE nC, SCSIZE nR) const; bool ValidColRowReplicated( SCSIZE & rC, SCSIZE & rR ) const; bool ValidColRowOrReplicated( SCSIZE & rC, SCSIZE & rR ) const; void SetErrorAtInterpreter( sal_uInt16 nError ) const; @@ -300,11 +299,6 @@ bool ScMatrixImpl::ValidColRow( SCSIZE nC, SCSIZE nR) const return nR < aDims.first && nC < aDims.second; } -SCSIZE ScMatrixImpl::CalcOffset( SCSIZE nC, SCSIZE nR) const -{ - return nC * maMat.size().first + nR; -} - bool ScMatrixImpl::ValidColRowReplicated( SCSIZE & rC, SCSIZE & rR ) const { pair<size_t, size_t> aDims = maMat.size(); @@ -997,11 +991,6 @@ bool ScMatrix::ValidColRow( SCSIZE nC, SCSIZE nR) const return pImpl->ValidColRow(nC, nR); } -SCSIZE ScMatrix::CalcOffset( SCSIZE nC, SCSIZE nR) const -{ - return pImpl->CalcOffset(nC, nR); -} - bool ScMatrix::ValidColRowReplicated( SCSIZE & rC, SCSIZE & rR ) const { return pImpl->ValidColRowReplicated(rC, rR); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index cd2af4cf8e5f..6160be404325 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -106,7 +106,6 @@ private: void UpdateChecks(ScRangeData* pData); void ShowOptions(const ScRangeNameLine& rLine); void UpdateNames(); - void CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData ); bool IsNameValid(); bool IsFormulaValid(); diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index e6362feb283a..72469f7fe9ff 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -328,20 +328,6 @@ ScRangeName* ScNameDlg::GetRangeName(const rtl::OUString& rScope) return maRangeMap.find(rScope)->second; } -void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData ) -{ - if ( pRangeData ) - { - rtl::OUStringBuffer sBuffer; - pRangeData->UpdateSymbol( sBuffer, maCursorPos ); - aAssign = sBuffer.makeStringAndClear(); - } - else - { - aAssign.Erase(); - } -} - void ScNameDlg::ShowOptions(const ScRangeNameLine& rLine) { ScRangeName* pRangeName = GetRangeName(rLine.aScope); diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index beaa45702743..94d290057fe3 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -1061,18 +1061,6 @@ ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( script::BasicError return bret; } -bool -ScVbaChart::areIndicesValid( sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( css::script::BasicErrorException ) -{ - if (isSeriesIndexValid(_seriesindex)) - { - uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(), uno::UNO_QUERY_THROW ); - dblValues = xChartDataArray->getData(); - return (_valindex < dblValues[_seriesindex].getLength() ); - } - return false; -} - uno::Reference< beans::XPropertySet > ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException ) diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index f87ca4a04b9e..104cc55fcfd9 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -75,7 +75,6 @@ public: // Non-interface css::uno::Reference< css::beans::XPropertySet > xDiagramPropertySet() const { return mxDiagramPropertySet; } bool isSeriesIndexValid(sal_Int32 _seriesindex) throw( css::script::BasicErrorException ); - bool areIndicesValid(sal_Int32 _seriesindex, sal_Int32 _valindex) throw ( css::script::BasicErrorException ); bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); // Methods |