[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svx

[Julien Nabet]

 include/svx/svdglue.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a3c053172da5979c8a03fd43f58fc04abbfaf776
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Sat Jan 20 09:01:45 2018 +0100

    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 <c...@libreoffice.org>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits