summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-20 09:53:29 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-20 10:16:17 +0100
commit5059984c44379d09eabf740c21db062b925394ad (patch)
tree431570359b1cf6ea640e4db9503a7afad98c2e01
parent98f2bd667c45ad8d041673c99678e2f95a749b55 (diff)
PendingOverflowCheck in TextChain is unused
Change-Id: I575865d79fc279ec017b6af461003f77e9c6073c Reviewed-on: https://gerrit.libreoffice.org/83258 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/svx/textchain.hxx14
-rw-r--r--svx/source/svdraw/textchain.cxx11
-rw-r--r--svx/source/svdraw/textchaincursor.cxx7
3 files changed, 0 insertions, 32 deletions
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index cfb69f6fe85c..cba226c98ff2 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -52,7 +52,6 @@ protected:
aPreChainingSel = ESelection(0,0,0,0);
aPostChainingSel = ESelection(0,0,0,0);
aIsPartOfLastParaInNextLink = false; // XXX: Should come from file
- aPendingOverflowCheck = false;
aSwitchingToNextBox = false;
}
@@ -63,7 +62,6 @@ private:
ESelection aPreChainingSel;
ESelection aPostChainingSel;
bool aIsPartOfLastParaInNextLink;
- bool aPendingOverflowCheck;
bool aSwitchingToNextBox;
};
@@ -73,12 +71,6 @@ class TextChain
public:
~TextChain();
- //void AppendLink(SdrTextObj *);
- //bool IsLinkInChain(SdrTextObj *) const;
-
- //SdrTextObj *GetNextLink(const SdrTextObj *) const;
- //SdrTextObj *GetPrevLink(const SdrTextObj *) const;
-
ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *);
// Specific Link Properties
@@ -98,10 +90,6 @@ public:
bool GetIsPartOfLastParaInNextLink(const SdrTextObj *);
void SetIsPartOfLastParaInNextLink(const SdrTextObj *, bool );
- // return whether there is a pending overflow check (usually when we move cursor after an overflow in the prev link)
- bool GetPendingOverflowCheck(const SdrTextObj *);
- void SetPendingOverflowCheck(const SdrTextObj *, bool );
-
// return whether we are currently moving the cursor to the next box (useful to know whether we should prevent SetOutlinerParaObject invocations in SdrTextObj::EndTextEdit)
bool GetSwitchingToNextBox(const SdrTextObj *);
void SetSwitchingToNextBox(const SdrTextObj *, bool);
@@ -113,8 +101,6 @@ private:
std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
friend class SdrModel;
- //SdrTextObj *impGetNextLink(const SdrTextObj *) const;
- //SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
};
#endif // INCLUDED_SVX_TEXTCHAIN_HXX
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 4160b37e9951..10c033463f3a 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -80,17 +80,6 @@ void TextChain::SetIsPartOfLastParaInNextLink(const SdrTextObj *pTarget, bool b)
pLinkProperties->aIsPartOfLastParaInNextLink = b;
}
-bool TextChain::GetPendingOverflowCheck(const SdrTextObj *pTarget)
-{
- ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget);
- return pLinkProperties->aPendingOverflowCheck;
-}
-void TextChain::SetPendingOverflowCheck(const SdrTextObj *pTarget, bool b)
-{
- ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget);
- pLinkProperties->aPendingOverflowCheck = b;
-}
-
bool TextChain::GetSwitchingToNextBox(const SdrTextObj *pTarget)
{
ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget);
diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx
index 4f944f4342f6..3480481daad3 100644
--- a/svx/source/svdraw/textchaincursor.cxx
+++ b/svx/source/svdraw/textchaincursor.cxx
@@ -190,13 +190,6 @@ void TextChainCursorManager::impChangeEditingTextObj(SdrTextObj *pTargetTextObj,
{
assert(pTargetTextObj);
- // To ensure that we check for overflow in the next box // This is handled in SdrTextObj::EndTextEdit
- SdrTextObj *pNextLink = mpTextObj->GetNextLinkInChain();
- TextChain *pTextChain = mpTextObj->GetTextChain();
- // If we are moving forward
- if (pNextLink && pTargetTextObj == pNextLink)
- pTextChain->SetPendingOverflowCheck(pNextLink, true);
-
mpEditView->SdrEndTextEdit();
mpEditView->SdrBeginTextEdit(pTargetTextObj);
// OutlinerView has changed, so we update the pointer