diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-05-15 16:28:45 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-07-19 21:38:03 +0200 |
| commit | 668d28b19508ec313e6a771e5c118e742e463a8a (patch) | |
| tree | 01a9755d84af6a280075a5d1ffe424e0e5632648 /vcl | |
| parent | 14e326516512e3999ca3f7217e5b2a0f1730ca35 (diff) | |
wmf: assume WinOrg/ViewportOrg = (0,0) if they are not provided
Conflicts:
vcl/source/filter/wmf/winwmf.cxx
Change-Id: Ia8a91a565118d102ff769da8bca65f16b5dfece2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/winwmf.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 6438b8f9ce9e..3a633fc7856e 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -1346,10 +1346,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt pStm->Seek( nPos ); - boost::optional<Point> aWinOrg; + Point aWinOrg(0,0); boost::optional<Size> aWinExt; - boost::optional<Point> aViewportOrg; + Point aViewportOrg(0,0); boost::optional<Size> aViewportExt; if( nEnd - nPos ) @@ -1588,13 +1588,13 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt if (bRet) { - if (aWinOrg && aWinExt) + if (aWinExt) { - rPlaceableBound = Rectangle(*aWinOrg, *aWinExt); + rPlaceableBound = Rectangle(aWinOrg, *aWinExt); } - else if (aViewportOrg && aViewportExt) + else if (aViewportExt) { - rPlaceableBound = Rectangle(*aViewportOrg, *aViewportExt); + rPlaceableBound = Rectangle(aViewportOrg, *aViewportExt); } else { |