strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PendingOverflowCheck in TextChain is unused

Browse source 
Change-Id: I575865d79fc279ec017b6af461003f77e9c6073c
Reviewed-on: https://gerrit.libreoffice.org/83258
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2019-11-20 09:53:29 +02:00
parent 98f2bd667c
commit 5059984c44
3 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/svx/textchain.hxx
View file

@ -52,7 +52,6 @@ protected:
aPreChainingSel = ESelection(0,0,0,0); aPreChainingSel = ESelection(0,0,0,0);
aPostChainingSel = ESelection(0,0,0,0); aPostChainingSel = ESelection(0,0,0,0);
aIsPartOfLastParaInNextLink = false; // XXX: Should come from file aIsPartOfLastParaInNextLink = false; // XXX: Should come from file
aPendingOverflowCheck = false;
aSwitchingToNextBox = false; aSwitchingToNextBox = false;
} }
@ -63,7 +62,6 @@ private:
ESelection aPreChainingSel; ESelection aPreChainingSel;
ESelection aPostChainingSel; ESelection aPostChainingSel;
bool aIsPartOfLastParaInNextLink; bool aIsPartOfLastParaInNextLink;
bool aPendingOverflowCheck;
bool aSwitchingToNextBox; bool aSwitchingToNextBox;
}; };
@ -73,12 +71,6 @@ class TextChain
public: public:
~TextChain(); ~TextChain();
//void AppendLink(SdrTextObj *);
//bool IsLinkInChain(SdrTextObj *) const;
//SdrTextObj *GetNextLink(const SdrTextObj *) const;
//SdrTextObj *GetPrevLink(const SdrTextObj *) const;
ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *); ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *);
// Specific Link Properties // Specific Link Properties
@ -98,10 +90,6 @@ public:
bool GetIsPartOfLastParaInNextLink(const SdrTextObj *); bool GetIsPartOfLastParaInNextLink(const SdrTextObj *);
void SetIsPartOfLastParaInNextLink(const SdrTextObj *, bool ); 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) // 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 *); bool GetSwitchingToNextBox(const SdrTextObj *);
void SetSwitchingToNextBox(const SdrTextObj *, bool); void SetSwitchingToNextBox(const SdrTextObj *, bool);
@ -113,8 +101,6 @@ private:
std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap; std::map< ChainLinkId, ImpChainLinkProperties *> maLinkPropertiesMap;
friend class SdrModel; friend class SdrModel;
//SdrTextObj *impGetNextLink(const SdrTextObj *) const;
//SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
}; };
#endif // INCLUDED_SVX_TEXTCHAIN_HXX #endif // INCLUDED_SVX_TEXTCHAIN_HXX

11
svx/source/svdraw/textchain.cxx
View file

@ -80,17 +80,6 @@ void TextChain::SetIsPartOfLastParaInNextLink(const SdrTextObj *pTarget, bool b)
pLinkProperties->aIsPartOfLastParaInNextLink = 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) bool TextChain::GetSwitchingToNextBox(const SdrTextObj *pTarget)
{ {
ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget); ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget);

7
svx/source/svdraw/textchaincursor.cxx
View file

@ -190,13 +190,6 @@ void TextChainCursorManager::impChangeEditingTextObj(SdrTextObj *pTargetTextObj,
{ {
assert(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->SdrEndTextEdit();
mpEditView->SdrBeginTextEdit(pTargetTextObj); mpEditView->SdrBeginTextEdit(pTargetTextObj);
// OutlinerView has changed, so we update the pointer // OutlinerView has changed, so we update the pointer