diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:22:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 14:22:27 +0000 |
| commit | 3824483c6eb95bf337c987f41d35b227a8b7c119 (patch) | |
| tree | b053acbc04bce0d630248fd0195e3ddae1e59513 /sd/source/filter/grf | |
| parent | 69922d084a8ec344c263c26101b7f86c2547885f (diff) | |
CWS-TOOLING: integrate CWS sjfixes10
2009-01-15 14:02:24 +0100 af r266369 : #i88851# Finding the right font size is now an iterative process.
2009-01-15 11:01:59 +0100 wg r266354 : i97985
2009-01-15 10:57:33 +0100 wg r266353 : i97985
2009-01-15 10:48:53 +0100 wg r266347 : i97985
2009-01-15 10:48:23 +0100 wg r266346 : i97985
2009-01-15 10:46:47 +0100 wg r266345 : i97985
2009-01-15 10:45:43 +0100 wg r266344 : i97985
2009-01-15 10:45:14 +0100 wg r266343 : i97985
2009-01-15 10:44:38 +0100 wg r266342 : i97985
2009-01-15 10:43:56 +0100 wg r266341 : i97985
2009-01-15 10:42:50 +0100 wg r266340 : i97985
2009-01-15 10:41:40 +0100 wg r266339 : i97985
2009-01-15 10:39:46 +0100 wg r266337 : i97985
2009-01-15 10:00:09 +0100 hde r266336 : i98065
2009-01-13 15:48:20 +0100 wg r266232 : i97985
2009-01-13 13:22:05 +0100 wg r266217 : i97985
2009-01-13 12:34:05 +0100 wg r266210 : i97985
2009-01-13 12:30:56 +0100 wg r266209 : i97985
2009-01-13 12:26:56 +0100 wg r266208 : i97985
2009-01-12 15:58:06 +0100 wg r266165 : i97985
2009-01-12 15:43:24 +0100 wg r266163 : i97985
2009-01-08 16:21:47 +0100 sj r266023 : fixed warning
2009-01-08 15:33:34 +0100 sj r266017 : fixed warning
2009-01-06 18:13:42 +0100 sj r265935 : CWS-TOOLING: rebase CWS sjfixes10 to trunk@265758 (milestone: DEV300:m38)
2008-12-10 16:54:02 +0100 af r265206 : #i43354# Do not delete all unused master pages automatically.
2008-12-04 13:12:50 +0100 af r264836 : #i92795# Use BitmapEx for icons to allow transparency.
2008-12-02 17:01:49 +0100 af r264723 : #i93082# Fixed SID_INSERTPAGE_LAYOUT_MENU.
2008-11-28 14:37:28 +0100 af r264555 : #i88851# Changed association of Ctrl-'?' to views.
2008-11-28 11:38:52 +0100 af r264535 : #i96681# Set version to 1.0.2
2008-11-28 11:30:04 +0100 af r264533 : #i88851# Ctrl-1,2,3 switch to slide overview, notes, normal view.
2008-11-27 16:41:25 +0100 af r264505 : #i92144# Removed unused code.
2008-11-26 15:29:56 +0100 af r264401 : #i92574# Do not lock configuration controller when main pane is not available.
2008-11-21 10:13:40 +0100 sj r264112 : #i96146# applied patch (ambiguous && ||)
2008-11-20 20:12:06 +0100 sj r264097 : #i96083# applied patch (ambigous && ||)
2008-11-20 19:13:53 +0100 sj r264096 : #i96163# applied patch (ambigous && ||)
2008-11-20 18:39:10 +0100 sj r264093 : #i96165# applied patch (ambigous && ||)
2008-11-03 18:12:29 +0100 sj r263303 : #i93996# fixed word wrapping problem
2008-11-03 18:11:02 +0100 sj r263302 : #i93996# fixed word wrapping problem
2008-11-03 18:08:41 +0100 sj r263301 : #i93996# fixed word wrapping problem
2008-11-03 18:06:45 +0100 sj r263300 : #i93996# fixed word wrapping problem
2008-11-03 18:05:00 +0100 sj r263299 : #i94831,i93616# fixed crash when importing diagonal cell border lines, fixed table import
2008-11-03 18:00:43 +0100 sj r263298 : #i93718# spellchecking is no longer triggering the autolayout of connector objects
Diffstat (limited to 'sd/source/filter/grf')
| -rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 0518de840063..747f9efb5b34 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -238,7 +238,7 @@ sal_Bool SdGRFFilter::Import() aPagSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); // scale to fit page - if ( ( aGrfSize.Height() > aPagSize.Height() ) || (aGrfSize.Width() > aPagSize.Width() ) && + if ( ( ( aGrfSize.Height() > aPagSize.Height() ) || ( aGrfSize.Width() > aPagSize.Width() ) ) && aGrfSize.Height() && aPagSize.Height() ) { double fGrfWH = (double) aGrfSize.Width() / aGrfSize.Height(); |