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

tdf#72776 Allow text removal in the shapes

Browse source 
Previous fix had crafted condition for fixing one specific
case but it was braking other cases.
(svx/source/unodraw/unoshtxt.cxx)

For example it was not possible to remove text inside textbox
and save that -> it was not saved in LOK case.

Problem is that we had not saved text inside shape and due
to calling GetBackgroundTextForwarder() we did reset to
empty content. In this patch we force UpdateData() call
by releasing lock just before we try to do some final
text cursor operations what applies changes in the content
and prevents us from losing it.

Call which was invoking GetBackgroundTextForwarder() was:
file: xmloff/source/draw/ximpshap.cxx
method: SdXMLShapeContext::endFastElement
line: mxCursor->gotoEnd( false );

After that I found that we had bug which breaks test:
sd/qa/unit/import-tests.cxx    odp/shapes-test.odp
It occurs when using this patch or when not using my code
but removing locking functionality for SvxTextEditSourceImpl.
NbcSetOutlinerParaObjectForText triggers shape resizing
even when no text is present inside.

Summary:
1. revert hack from https://git.libreoffice.org/core/+/71b66b0039819f38c935b4eb5d5951ceaf6e8468%5E%21
2. trigger text update by releasing lock for a moment to keep
   correct state
3. fix bug with resizing empty shape

Change-Id: Idf1fc6caf19dfb932ce7caa21034f76fa04ce5f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130474
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
This commit is contained in:
Szymon Kłos 2022-02-23 11:18:59 +01:00
parent 76e11015a8
commit cf2449aac0
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
svx/source/unodraw/unoshtxt.cxx
View file

@ -547,10 +547,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( pOutlinerParaObject && ( bOwnParaObj || !mpObject->IsEmptyPresObj() || mpObject->getSdrPageFromSdrObject()->IsMasterPage() ) )
{
// tdf#72776: do not set empty text to SdrOutliner, if it is already set
if( !mpOutliner->GetEditEngine().GetTextLen() || pOutlinerParaObject->Count() > 1 || ( pOutlinerParaObject->Count() == 1 &&
!pOutlinerParaObject->GetTextObject().GetText(0).isEmpty() ) )
mpOutliner->SetText( *pOutlinerParaObject );
mpOutliner->SetText( *pOutlinerParaObject );
// put text to object and set EmptyPresObj to FALSE
if( mpText && bOwnParaObj && mpObject->IsEmptyPresObj() && pTextObj->IsReallyEdited() )
@ -778,7 +775,8 @@ void SvxTextEditSourceImpl::UpdateData()
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mpObject );
if( pTextObj )
{
if( mpOutliner->GetParagraphCount() != 1 || mpOutliner->GetEditEngine().GetTextLen( 0 ) )
if( (mpOutliner->GetParagraphCount() != 1 && mpOutliner->GetParagraphCount() != 2)
|| mpOutliner->GetEditEngine().GetTextLen( 0 ) )
{
pTextObj->NbcSetOutlinerParaObjectForText( mpOutliner->CreateParaObject(), mpText );
}

7
xmloff/source/draw/ximpshap.cxx
View file

@ -328,6 +328,13 @@ void SdXMLShapeContext::endFastElement(sal_Int32 )
{
if(mxCursor.is())
{
// tdf#72776 force UpdateData in the EditSource so we will not override text in SdrOutliner
if( mxLockable.is() )
{
mxLockable->removeActionLock();
mxLockable->addActionLock();
}
// delete addition newline
mxCursor->gotoEnd( false );
mxCursor->goLeft( 1, true );