diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-08-07 21:33:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-08 06:31:35 +0000 |
| commit | f02a51e92c580f29c3367f3e563577f805a7013c (patch) | |
| tree | b71e1084512ac459f9f3eca45c3c1b91758d6df5 /sd/source | |
| parent | a5a8006c4b77ea7fce4e6c808031c785373624eb (diff) | |
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@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/core/sdpage.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index d7435c044547..34391d6afaf8 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"); |