diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-14 23:43:35 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-15 15:41:13 +0100 |
commit | 9bf2d51927c3ac87b32b996a65bd30618b4ce58c (patch) | |
tree | a83e3fa81029982c5c5d311bff401eae54f52e66 /sc/source | |
parent | f03a3edf2523c208948059861e0df48567834d0d (diff) |
callcatcher: chainsaw out some unnecessary code
Change-Id: I88de7a942fbc9e0c51a3261236f5203f037d2392
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/cell.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/data/cell2.cxx | 20 | ||||
-rw-r--r-- | sc/source/core/data/column.cxx | 18 | ||||
-rw-r--r-- | sc/source/core/data/documen4.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/data/table1.cxx | 10 | ||||
-rw-r--r-- | sc/source/core/tool/typedstrdata.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/condformat/colorformat.cxx | 49 | ||||
-rw-r--r-- | sc/source/ui/condformat/condformatdlg.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/dbgui/csvcontrol.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/inc/colorformat.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/csvcontrol.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/viewfunc.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 9 | ||||
-rw-r--r-- | sc/source/ui/vba/vbafoundfiles.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/vba/vbafoundfiles.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 13 |
17 files changed, 0 insertions, 177 deletions
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index f81460c0b6af..338b0ab85aab 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -633,12 +633,6 @@ ScNoteCell::~ScNoteCell() // ============================================================================ -ScValueCell::ScValueCell() : - ScBaseCell( CELLTYPE_VALUE ), - mfValue( 0.0 ) -{ -} - ScValueCell::ScValueCell( double fValue ) : ScBaseCell( CELLTYPE_VALUE ), mfValue( fValue ) diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 3a0c6d805d57..fa3ac1d7d574 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -1543,26 +1543,6 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() ); } -void ScFormulaCell::ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ) -{ - for( FormulaToken* p = pCode->First(); p; p = pCode->Next() ) - { - if( p->GetOpCode() == ocName ) - { - sal_uInt16 nIndex = p->GetIndex(); - ScRangeData::IndexMap::const_iterator itr = rMap.find(nIndex); - sal_uInt16 nNewIndex = itr == rMap.end() ? nIndex : itr->second; - if ( nIndex != nNewIndex ) - { - p->SetIndex( nNewIndex ); - bCompile = true; - } - } - } - if( bCompile ) - CompileTokenArray(); -} - bool ScFormulaCell::IsChanged() const { return bChanged; diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 272a64647a0a..db994622f3cb 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1856,24 +1856,6 @@ void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16 ((ScFormulaCell*)maItems[i].pCell)->FindRangeNamesInUse(rIndexes); } -void ScColumn::ReplaceRangeNamesInUse(SCROW nRow1, SCROW nRow2, - const ScRangeData::IndexMap& rMap ) -{ - if ( !maItems.empty() ) - for (SCSIZE i = 0; i < maItems.size(); i++) - { - if ((maItems[i].nRow >= nRow1) && - (maItems[i].nRow <= nRow2) && - (maItems[i].pCell->GetCellType() == CELLTYPE_FORMULA)) - { - SCROW nRow = maItems[i].nRow; - ((ScFormulaCell*)maItems[i].pCell)->ReplaceRangeNamesInUse( rMap ); - if ( nRow != maItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? - } - } -} - void ScColumn::SetDirtyVar() { for (SCSIZE i=0; i<maItems.size(); i++) diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index a757d0456e95..8eca48528ea9 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -727,12 +727,6 @@ const ScValidationData* ScDocument::GetValidationEntry( sal_uLong nIndex ) const return NULL; } -void ScDocument::FindConditionalFormat( sal_uLong nKey, SCTAB nTab, ScRangeList& rRanges ) -{ - if(VALIDTAB(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) - maTabs[nTab]->FindConditionalFormat( nKey, rRanges ); -} - void ScDocument::FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab ) { if(VALIDTAB(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index bdf78328edbd..090345a66807 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -1586,16 +1586,6 @@ void ScTable::FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n aCol[i].FindRangeNamesInUse(nRow1, nRow2, rIndexes); } -void ScTable::ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, - SCCOL nCol2, SCROW nRow2, - const ScRangeData::IndexMap& rMap ) -{ - for (SCCOL i = nCol1; i <= nCol2 && (ValidCol(i)); i++) - { - aCol[i].ReplaceRangeNamesInUse( nRow1, nRow2, rMap ); - } -} - void ScTable::ExtendPrintArea( OutputDevice* pDev, SCCOL /* nStartCol */, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow ) { diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index 8faaace4fab8..811c5d82a2c1 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -114,11 +114,6 @@ const rtl::OUString& ScTypedStrData::GetString() const return maStrValue; } -double ScTypedStrData::GetValue() const -{ - return mfValue; -} - ScTypedStrData::StringType ScTypedStrData::GetStringType() const { return meStrType; diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index ba54db22c292..d8d15a96b9c8 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -177,55 +177,6 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const ScDataBarForma TypeSelectHdl(NULL); } -ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, ScDataBarFormat* pFormat): - ModalDialog( pWindow, ScResId( RID_SCDLG_DATABAR ) ), - maBtnOk( this, ScResId( BTN_OK ) ), - maBtnCancel( this, ScResId( BTN_CANCEL ) ), - maFlBarColors( this, ScResId( FL_BAR_COLORS ) ), - maFlAxes( this, ScResId( FL_AXIS ) ), - maFlValues( this, ScResId( FL_VALUES ) ), - maFtMin( this, ScResId( FT_MINIMUM ) ), - maFtMax( this, ScResId( FT_MAXIMUM ) ), - maFtPositive( this, ScResId( FT_POSITIVE ) ), - maFtNegative( this, ScResId( FT_NEGATIVE ) ), - maFtPosition( this, ScResId( FT_POSITION ) ), - maFtAxisColor( this, ScResId( FT_COLOR_AXIS ) ), - maLbPos( this, ScResId( LB_POS ) ), - maLbNeg( this, ScResId( LB_NEG ) ), - maLbAxisCol( this, ScResId( LB_COL_AXIS ) ), - maLbTypeMin( this, ScResId( LB_TYPE ) ), - maLbTypeMax( this, ScResId( LB_TYPE ) ), - maLbAxisPos( this, ScResId( LB_AXIS_POSITION ) ), - maEdMin( this, ScResId( ED_MIN ) ), - maEdMax( this, ScResId( ED_MAX ) ), - maStrWarnSameValue( SC_RESSTR( STR_WARN_SAME_VALUE ) ) -{ - Init(); - FreeResource(); - - const ScDataBarFormatData* pData = pFormat->GetDataBarData(); - maLbPos.SelectEntry( pData->maPositiveColor ); - if(pData->mpNegativeColor) - maLbNeg.SelectEntry( *pData->mpNegativeColor ); - - switch (pData->meAxisPosition) - { - case databar::NONE: - maLbAxisPos.SelectEntryPos(2); - break; - case databar::AUTOMATIC: - maLbAxisPos.SelectEntryPos(0); - break; - case databar::MIDDLE: - maLbAxisPos.SelectEntryPos(1); - break; - } - ::SetType(pData->mpLowerLimit.get(), maLbTypeMin); - ::SetType(pData->mpUpperLimit.get(), maLbTypeMax); - SetValue(pData->mpLowerLimit.get(), maEdMin); - SetValue(pData->mpUpperLimit.get(), maEdMax); -} - void ScDataBarSettingsDlg::Init() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 25ff9a57e63f..aa834ae66404 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -921,20 +921,6 @@ IMPL_LINK_NOARG( ScCondFrmtEntry, ConditionTypeSelectHdl ) return 0; } -ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc): - Control(pParent, rResId), - mbHasScrollBar(false), - mpScrollBar(new ScrollBar(this, WB_VERT )), - mnTopIndex(0), - mpDoc(pDoc) -{ - mpScrollBar->SetScrollHdl( LINK( this, ScCondFormatList, ScrollHdl ) ); - mpScrollBar->EnableDrag(); - - RecalcAll(); - FreeResource(); -} - ScCondFormatList::ScCondFormatList(Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos): Control(pParent, rResId), mbHasScrollBar(false), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 00fc0a76231e..5ebb4d0dd56d 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -78,14 +78,6 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : { } -ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nStyle ) : - Control( pParent, nStyle ), - mrData( rData ), - mpAccessible( NULL ), - mbValidGfx( false ) -{ -} - ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId ) : Control( pParent, rResId ), mrData( rData ), diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index fffbb34bc2fb..c78321f6087d 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -74,7 +74,6 @@ private: public: ScDataBarSettingsDlg(Window* pParent); ScDataBarSettingsDlg(Window* pParent, const ScDataBarFormatData& rData); - ScDataBarSettingsDlg(Window* pParent, ScDataBarFormat* pFormat); ScDataBarFormatData* GetData(); }; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 8b03c29e5661..d7fb6998a2f1 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -164,7 +164,6 @@ private: void RecalcAll(); void DoScroll(long nDiff); public: - ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc ); ScCondFormatList( Window* pParent, const ResId& rResId, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos); ScConditionalFormat* GetConditionalFormat() const; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 6a47b677ba14..692c93ffd7f2 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -276,7 +276,6 @@ private: // ------------------------------------------------------------------------ public: explicit ScCsvControl( ScCsvControl& rParent ); - explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nStyle = 0 ); explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, const ResId& rResId ); virtual ~ScCsvControl(); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index e6be63c71bfe..ff0cea53d380 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -188,7 +188,6 @@ public: void SetNumFmtByStr( const String& rCode ); void ChangeNumFmtDecimals( sal_Bool bIncrement ); - void SetConditionalFormat( const ScConditionalFormat& rNew ); void SetValidation( const ScValidationData& rNew ); void ChangeIndent( sal_Bool bIncrement ); diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 88f999a937c7..0990261392ef 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -482,15 +482,6 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() return theScNamedRangeObjUnoTunnelId::get().getSeq(); } -ScNamedRangeObj* ScNamedRangeObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) -{ - ScNamedRangeObj* pRet = NULL; - uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY ); - if (xUT.is()) - pRet = reinterpret_cast<ScNamedRangeObj*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId()))); - return pRet; -} - //------------------------------------------------------------------------ ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) : diff --git a/sc/source/ui/vba/vbafoundfiles.cxx b/sc/source/ui/vba/vbafoundfiles.cxx index b4229bcecec9..33933f29fbfc 100644 --- a/sc/source/ui/vba/vbafoundfiles.cxx +++ b/sc/source/ui/vba/vbafoundfiles.cxx @@ -29,12 +29,6 @@ #include "vbafoundfiles.hxx" -////////////////////////////////VbaFoundFilesEnum////////////////////////////////////////// -VbaFoundFilesEnum::VbaFoundFilesEnum() : m_nIndex(0) -{ - -} - VbaFoundFilesEnum::VbaFoundFilesEnum( css::uno::Sequence<rtl::OUString>& sFileList ) : m_nIndex(0), m_sFileList(sFileList) { @@ -45,12 +39,6 @@ VbaFoundFilesEnum::~VbaFoundFilesEnum() } -void VbaFoundFilesEnum::SetFileList( css::uno::Sequence<rtl::OUString>& sFileList ) -{ - m_nIndex = 0; - m_sFileList = sFileList; -} - sal_Int32 SAL_CALL VbaFoundFilesEnum::getCount() throw (css::uno::RuntimeException) { return m_sFileList.getLength(); diff --git a/sc/source/ui/vba/vbafoundfiles.hxx b/sc/source/ui/vba/vbafoundfiles.hxx index 79fd52604598..f3570fe048f1 100644 --- a/sc/source/ui/vba/vbafoundfiles.hxx +++ b/sc/source/ui/vba/vbafoundfiles.hxx @@ -46,12 +46,9 @@ private: css::uno::Sequence< rtl::OUString > m_sFileList; public: - VbaFoundFilesEnum(); VbaFoundFilesEnum( css::uno::Sequence< rtl::OUString >& sFileList ); ~VbaFoundFilesEnum(); - void SetFileList( css::uno::Sequence< rtl::OUString >& sFileList ); - // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 8f83dbeafa30..9b3efb6e8e08 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -3071,19 +3071,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, #undef SET_LINE_ATTRIBUTES - -//---------------------------------------------------------------------------- - -void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew ) -{ - ScDocument* pDoc = GetViewData()->GetDocument(); - sal_uLong nIndex = pDoc->AddCondFormat(rNew.Clone(), GetViewData()->GetTabNo()); // for it there is no Undo - SfxUInt32Item aItem( ATTR_CONDITIONAL, nIndex ); - - ApplyAttr( aItem ); // with Paint and Undo... -} - - //---------------------------------------------------------------------------- void ScViewFunc::SetValidation( const ScValidationData& rNew ) |