diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-25 13:53:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-26 08:51:32 +0200 |
| commit | 925ed7003b827cd4678547fb762aa002c3a10421 (patch) | |
| tree | 1deb929f0db9f6bffc8ba7e72b5eb14de16f23a4 /svx/source/svdraw/svdotxed.cxx | |
| parent | c70d49c7c888da8cfd73db8585e7be1f37fc398a (diff) | |
remove dead "chained editeng recursive overflow" code
been this way since original commit in
commit 5b04c453cc03c0d2c6067625242f07deb8f78ba0
Author: matteocam <matteo.campanelli@gmail.com>
Date: Mon Sep 7 12:44:37 2015 +0200
chained editeng: Change EndTextEdit behavior to support recursive overflow
Change-Id: Id71db878b80457683f49349170e85bbabbd753f6
Reviewed-on: https://gerrit.libreoffice.org/36940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdotxed.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxed.cxx | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 35b34a36c1de..ff7d7310d76e 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -129,19 +129,6 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) return true; } -void ImpUpdateOutlParamsForOverflow(SdrOutliner *pOutl, SdrTextObj *pTextObj) -{ - // Code from ImpSetTextEditParams - Size aPaperMin; - Size aPaperMax; - tools::Rectangle aEditArea; - pTextObj->TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,nullptr); - - pOutl->SetMinAutoPaperSize(aPaperMin); - pOutl->SetMaxAutoPaperSize(aPaperMax); - pOutl->SetPaperSize(Size()); -} - void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const { bool bFitToSize(IsFitToSize()); @@ -313,26 +300,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) /* Beginning Chaining-related code */ rOutl.ClearOverflowingParaNum(); - /* Flush overflow for next textbox - Necessary for recursive chaining */ - if (false && - IsChainable() && - GetNextLinkInChain() && - GetTextChain()->GetPendingOverflowCheck(GetNextLinkInChain()) ) - { - GetTextChain()->SetPendingOverflowCheck(GetNextLinkInChain(), false); - - SdrOutliner rDrawOutl = GetNextLinkInChain()->ImpGetDrawOutliner(); - // Prepare Outliner for overflow check - ImpUpdateOutlParamsForOverflow(&rDrawOutl, GetNextLinkInChain()); - const OutlinerParaObject *pObj = GetNextLinkInChain()->GetOutlinerParaObject(); - rDrawOutl.SetText(*pObj); - - rDrawOutl.SetUpdateMode(true); - // XXX: Change name of method below to impHandleChainingEventsNonEditMode - GetNextLinkInChain()->impHandleChainingEventsDuringDecomposition(rDrawOutl); - } - /* End Chaining-related code */ - pEdtOutl = nullptr; rOutl.Clear(); EEControlBits nStat = rOutl.GetControlWord(); |