diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-09-17 12:18:13 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-18 12:04:52 +0200 |
| commit | 3af68b14791118868e410133ea5a2b555bbac6eb (patch) | |
| tree | 24e7e1a0822438c9bdd2a4848067b582c42f91ba /svx | |
| parent | 69e62bbebc1f4809101df0c694a930b07dbc194d (diff) | |
svx: Assert that GetMarkedSdrObj() cannot be null here
as such invalid ones have been removed already in advance.
This could come togeher with c0e9968b4bbda9563213589bcb0472f8797bb553.
Change-Id: I914031390d13dd4ad91d2ead61db7f2d53c78004
Reviewed-on: https://gerrit.libreoffice.org/42365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdmark.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index e82bc794a14c..bf31cea26892 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -36,6 +36,8 @@ #include <svl/SfxBroadcaster.hxx> #include <svx/svdoedge.hxx> +#include <cassert> + void SdrMark::setTime() { TimeValue aNow; @@ -183,7 +185,8 @@ void SdrMarkList::ImpForceSort() { size_t i = count - 1; SdrMark* pCmp = maList[i]; - if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj() && pAkt->GetMarkedSdrObj()) + assert(pAkt->GetMarkedSdrObj()); + if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj()) { // Con1/Con2 Merging if(pCmp->IsCon1()) |