diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2018-01-20 09:01:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-22 12:46:27 +0100 |
| commit | a3c053172da5979c8a03fd43f58fc04abbfaf776 (patch) | |
| tree | 16a603e13f65eba58837f25c94e98af9960da824 /include | |
| parent | 8930dc75e2d5c1e2d2165db6d55617930816fbe4 (diff) | |
tdf#115100: fix assertions in svdglue.hxx
See bt:
https://bugs.documentfoundation.org/attachment.cgi?id=139225
See comments
https://bugs.documentfoundation.org/show_bug.cgi?id=115100#c2
https://bugs.documentfoundation.org/show_bug.cgi?id=115100#c3
Change-Id: I21266bdd809d3e13ca403ec46e51e9aa86487bb9
(cherry picked from commit 619a06d2712e340e82dfd701a0c6363058929c27)
Reviewed-on: https://gerrit.libreoffice.org/48263
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/svdglue.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index 0a74ef8e5127..781be5e52651 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -97,9 +97,9 @@ public: SdrAlign GetAlign() const { return nAlign; } void SetAlign(SdrAlign nAlg) { nAlign=nAlg; } SdrAlign GetHorzAlign() const { return nAlign & static_cast<SdrAlign>(0x00FF); } - void SetHorzAlign(SdrAlign nAlg) { assert((nAlg & static_cast<SdrAlign>(0xff)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & static_cast<SdrAlign>(0xFF00)) | (nAlg & static_cast<SdrAlign>(0x00FF)); } + void SetHorzAlign(SdrAlign nAlg) { assert((nAlg & static_cast<SdrAlign>(0xFF00)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & static_cast<SdrAlign>(0xFF00)) | (nAlg & static_cast<SdrAlign>(0x00FF)); } SdrAlign GetVertAlign() const { return nAlign & static_cast<SdrAlign>(0xFF00); } - void SetVertAlign(SdrAlign nAlg) { assert((nAlg & static_cast<SdrAlign>(0xff00)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & static_cast<SdrAlign>(0x00FF)) | (nAlg & static_cast<SdrAlign>(0xFF00)); } + void SetVertAlign(SdrAlign nAlg) { assert((nAlg & static_cast<SdrAlign>(0x00FF)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & static_cast<SdrAlign>(0x00FF)) | (nAlg & static_cast<SdrAlign>(0xFF00)); } bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; |