diff options
| author | Armin Le Grand <alg@apache.org> | 2013-06-18 13:10:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-19 12:18:47 +0100 |
| commit | bc69be88fa43901504126740bc8810f4e31e17a5 (patch) | |
| tree | 7b34ee18281586a7b309a542a8ad1dd2c661bd2c /sw | |
| parent | 6af376566b55c504335ccfae0fd82d6d2a0c75dd (diff) | |
Resolves: #i121917# Corrected access to text object
(cherry picked from commit 2c9c9923fdf042c41cebaf9a15def7caac86032d)
Conflicts:
sw/source/core/draw/dcontact.cxx
Change-Id: Ia214127ca540c4f4036a0006e7c227649fb39134
(cherry picked from commit 6c5c5584eb1adb64fee3aaf76196115ba3812e2c)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index cc6f1a5252b0..602651362f6f 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2332,8 +2332,16 @@ basegfx::B2DPolyPolygon SwDrawVirtObj::TakeContour() const SdrHdl* SwDrawVirtObj::GetHdl(sal_uInt32 nHdlNum) const { SdrHdl* pHdl = rRefObj.GetHdl(nHdlNum); - Point aP(pHdl->GetPos() + GetOffset()); - pHdl->SetPos(aP); + + if(pHdl) + { + Point aP(pHdl->GetPos() + GetOffset()); + pHdl->SetPos(aP); + } + else + { + OSL_ENSURE(false, "Got no SdrHdl(!)"); + } return pHdl; } @@ -2342,8 +2350,14 @@ SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const { SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum); - if (pHdl) + if(pHdl) + { pHdl->SetPos(pHdl->GetPos() + GetOffset()); + } + else + { + OSL_ENSURE(false, "Got no SdrHdl(!)"); + } return pHdl; } |