summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-01-11 08:33:46 +0100
committerDavid Tardon <dtardon@redhat.com>2011-01-11 09:37:45 +0100
commit3a55f0996773831e0a5a130cfe00ea101a06abf1 (patch)
tree544911c5eded46e763ac5aab463656bd547c03bb /sd
parent8ac53e5281808a84c6560c9038bd80167b2eba0b (diff)
rhbz#668654 avoid division by 0
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageContainer.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
index 6362fb5d90b2..92afcff4f826 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx
@@ -711,8 +711,11 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void)
if (*iDescriptor!=NULL && (*iDescriptor)->mpMasterPage != NULL)
{
Size aPageSize ((*iDescriptor)->mpMasterPage->GetSize());
- nWidth = aPageSize.Width();
- nHeight = aPageSize.Height();
+ OSL_ASSERT(aPageSize.Width() > 0 && aPageSize.Height() > 0);
+ if (aPageSize.Width() > 0)
+ nWidth = aPageSize.Width();
+ if (aPageSize.Height() > 0)
+ nHeight = aPageSize.Height();
mbFirstPageObjectSeen = true;
break;
}