[Libreoffice-commits] core.git: sd/source

[Jochen Nitschke]

 sd/source/core/sdpage.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f02a51e92c580f29c3367f3e563577f805a7013c
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Aug 7 21:33:11 2016 +0200

    silence false positive OSL_ASSERT
    
    and assert hard as rRectangle size is MAX_PRESOBJS
    
    Change-Id: Ia486d4237e9efdf4f7b89dc3ec5c58916bdfd950
    Reviewed-on: https://gerrit.libreoffice.org/27941
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index d7435c04..34391d6 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1355,9 +1355,6 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,Rectangle* rRectangle ,const
             const int presobjsize = layoutChildren->getLength();
             for( int j=0; j< presobjsize ; j++)
             {
-                // TODO: rework sd to permit arbitrary number of presentation objects
-                OSL_ASSERT(count < MAX_PRESOBJS);
-
                 rtl::OUString nodename;
                 Reference<XNode> presobj = layoutChildren->item(j);
                 nodename=presobj->getNodeName();
@@ -1365,6 +1362,9 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,Rectangle* rRectangle ,const
                 //check whether children is blank 'text-node' or 'presobj' node
                 if(nodename == "presobj")
                 {
+                    // TODO: rework sd to permit arbitrary number of presentation objects
+                    assert(count < MAX_PRESOBJS);
+
                     Reference<XNamedNodeMap> presObjAttributes = presobj->getAttributes();
 
                     Reference<XNode> presObjSizeHeight = presObjAttributes->getNamedItem("relative-height");