diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-09-01 10:56:29 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-09-01 14:48:49 -0400 |
commit | a50fe4298d6761567230a1570a544398cca850c6 (patch) | |
tree | af9b0f9ea34f7cc6ed9423d3f6f5b7948a79e426 | |
parent | b54c1a53b4d400b1c2d282c186af1fa8f151894e (diff) |
These pieces of code are no longer needed.
Change-Id: I93a4abc84856a43d9d3a27ebadf111e589c62604
-rw-r--r-- | sc/inc/column.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dociter.hxx | 7 | ||||
-rw-r--r-- | sc/inc/document.hxx | 6 | ||||
-rw-r--r-- | sc/inc/table.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/column2.cxx | 46 | ||||
-rw-r--r-- | sc/source/core/data/dociter.cxx | 11 | ||||
-rw-r--r-- | sc/source/core/data/documen8.cxx | 38 | ||||
-rw-r--r-- | sc/source/core/data/table4.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 8 |
9 files changed, 0 insertions, 126 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 4322c247ff81..7308d221d066 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -431,8 +431,6 @@ public: bool TestTabRefAbs(SCTAB nTable) const; bool GetNextSpellingCell(SCROW& nRow, bool bInSel, const ScMarkData& rData) const; - void RemoveAutoSpellObj(); - void StartListening( SvtListener& rLst, SCROW nRow ); void EndListening( SvtListener& rLst, SCROW nRow ); void StartListening( sc::StartListeningContext& rCxt, SCROW nRow, SvtListener& rListener ); diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 23e310dc6a65..8a57ef3bd3e9 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -440,13 +440,6 @@ public: /// Set a(nother) sheet and (re)init. void SetTab( SCTAB nTab ); - /** - * When modifying a cell while still in iteration, call this to re-fetch - * the column iterators used internally because the old iterators have - * been invalidated. - */ - void RehashCol( SCCOL nCol ); - private: void Advance(); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index e8aa17d88454..b91e8d3f5294 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -315,9 +315,6 @@ private: ScRange aEmbedRange; ScAddress aCurTextWidthCalcPos; - ScAddress aOnlineSpellPos; // within whole document - ScRange aVisSpellRange; - ScAddress aVisSpellPos; // within aVisSpellRange (see nVisSpellState) Timer aTrackTimer; @@ -1658,9 +1655,6 @@ public: bool IsDetectiveDirty() const { return bDetectiveDirty; } void SetDetectiveDirty(bool bSet) { bDetectiveDirty = bSet; } - void RemoveAutoSpellObj(); - void SetOnlineSpellPos( const ScAddress& rPos ); - sal_uInt8 GetMacroCallMode() const { return nMacroCallMode; } void SetMacroCallMode(sal_uInt8 nNew) { nMacroCallMode = nNew; } diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 99c506bec405..69d25205fe8b 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -308,8 +308,6 @@ public: void SetPageSize( const Size& rSize ); void SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); - void RemoveAutoSpellObj(); - void LockTable(); void UnlockTable(); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 9edca5f0dafb..855be2e79f11 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -1019,45 +1019,6 @@ public: } }; -class RemoveAutoSpellObjHandler : public StrEntries -{ - ScDocument* mpDoc; - boost::scoped_ptr<ScTabEditEngine> mpEngine; - -public: - RemoveAutoSpellObjHandler(sc::CellStoreType& rCells, ScDocument* pDoc) : StrEntries(rCells), mpDoc(pDoc) {} - - void operator() (size_t nRow, EditTextObject*& pObj) - { - // no query on HasOnlineSpellErrors, this makes it also work after loading - - // For the test on hard formatting (ScEditAttrTester), are the defaults in the - // EditEngine of no importance. When the tester would later recognise the same - // attributes in default and hard formatting and has to remove them, the correct - // defaults must be set in the EditEngine for each cell. - - // test for attributes - if (!mpEngine) - mpEngine.reset(new ScTabEditEngine(mpDoc)); - - mpEngine->SetText(*pObj); - - ScEditAttrTester aTester(mpEngine.get()); - if (aTester.NeedsObject()) // only remove spelling errors - { - // Overwrite the existing object. - delete pObj; - pObj = mpEngine->CreateTextObject(); - } - else - { - // Store the string replacement for later commits. - OUString aText = ScEditUtil::GetSpaceDelimitedString(*mpEngine); - maStrEntries.push_back(StrEntry(nRow, aText)); - } - } -}; - class RemoveEditAttribsHandler : public StrEntries { ScDocument* mpDoc; @@ -1138,13 +1099,6 @@ public: } -void ScColumn::RemoveAutoSpellObj() -{ - RemoveAutoSpellObjHandler aFunc(maCells, pDocument); - sc::ProcessEditText(maCells, aFunc); - aFunc.commitStrings(); -} - void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) { RemoveEditAttribsHandler aFunc(maCells, pDocument); diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index a31b7aa03fad..f951ea33b4f6 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1724,17 +1724,6 @@ void ScHorizontalCellIterator::SetTab( SCTAB nTabP ) Advance(); } -void ScHorizontalCellIterator::RehashCol( SCCOL nCol ) -{ - if (nCol < nStartCol || nEndCol < nCol) - return; - - ColParam& rParam = maColPositions[nCol-nStartCol]; - ScColumn& rCol = pDoc->maTabs[mnTab]->aCol[nCol]; - rParam.maPos = rCol.maCells.position(mnRow).first; - rParam.maEnd = rCol.maCells.end(); -} - ScRefCellValue* ScHorizontalCellIterator::GetNext( SCCOL& rCol, SCROW& rRow ) { if (!bMore) diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 67fb76a46b80..db94928c20e7 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -721,44 +721,6 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers return aScope.getNeedMore(); } -//------------------------------------------------------------------------ - -class ScSpellStatus -{ -public: - bool bModified; - - ScSpellStatus() : bModified(false) {}; - - DECL_LINK (EventHdl, EditStatus*); -}; - -IMPL_LINK( ScSpellStatus, EventHdl, EditStatus *, pStatus ) -{ - sal_uLong nStatus = pStatus->GetStatusWord(); - if ( nStatus & EE_STAT_WRONGWORDCHANGED ) - bModified = true; - - return 0; -} - -void ScDocument::SetOnlineSpellPos( const ScAddress& rPos ) -{ - aOnlineSpellPos = rPos; - - // skip visible area for aOnlineSpellPos - if ( aVisSpellRange.In( aOnlineSpellPos ) ) - aOnlineSpellPos = aVisSpellRange.aEnd; -} - -void ScDocument::RemoveAutoSpellObj() -{ - // alle Spelling-Informationen entfernen - - for (SCTAB nTab=0; nTab< static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]; nTab++) - maTabs[nTab]->RemoveAutoSpellObj(); -} - void ScDocument::RepaintRange( const ScRange& rRange ) { if ( bIsVisible && pShell ) diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 3797a907e8b3..339ae4a1e848 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -2055,12 +2055,6 @@ bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, bool bInSel, return false; } -void ScTable::RemoveAutoSpellObj() -{ - for (SCCOL i=0; i <= MAXCOL; i++) - aCol[i].RemoveAutoSpellObj(); -} - bool ScTable::TestTabRefAbs(SCTAB nTable) const { for (SCCOL i=0; i <= MAXCOL; i++) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 20c216890808..2fe4540a2469 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1218,14 +1218,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) aNewOpt.SetAutoSpell( bDoAutoSpell ); pDoc->SetDocOptions( aNewOpt ); - if (bDoAutoSpell) - pDoc->SetOnlineSpellPos( ScAddress(0,0,0) ); // vorne anfangen - else - { - WaitObject aWait( pDocSh->GetActiveDialogParent() ); - pDoc->RemoveAutoSpellObj(); // Edit-Text-Objekte wieder zurueckwandeln - } - if (pViewSh) pViewSh->EnableAutoSpell(bDoAutoSpell); |