summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2024-10-17 22:26:47 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2024-10-18 08:49:35 +0200
commit104cae64dfd9c881264ea03680ca01cff855c4fe (patch)
treebbb30c2549c085d46957bc1d4cce57d560153eed /sd
parentd2032012612d28a3333863afb684d0ef7c6017c4 (diff)
tdf#163486: PVS: recurring check
V571: Recurring check. The 'xObj' condition was already verified in line 809. Change-Id: I4b782c9601893ad91598382ea2f999cbd46df75b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175104 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/sdview.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 2159edb966d0..d8938428ca91 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -809,14 +809,11 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally)
eKind = SdrEndTextEditKind::Unchanged;
}
}
- else if( xObj && xObj->IsEmptyPresObj() )
+ else if( xObj && xObj->IsEmptyPresObj() && xObj->HasText() )
{
- if( xObj && xObj->HasText() )
- {
- SdrPage* pPage = xObj->getSdrPageFromSdrObject();
- if( !pPage || !pPage->IsMasterPage() )
- xObj->SetEmptyPresObj( false );
- }
+ SdrPage* pPage = xObj->getSdrPageFromSdrObject();
+ if( !pPage || !pPage->IsMasterPage() )
+ xObj->SetEmptyPresObj( false );
}
GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(