summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-05-07 21:04:32 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-05-15 19:51:05 +0200
commit618d33c2089c7f7741e22a80ffb11f82da1729a4 (patch)
treed1ba900058521df2633ef1e3ac6b2f186c14efbd
parent98c55e4c350931daad45db2d7478006756ff1324 (diff)
fdo#70498 work-around scaling in SetClipPath
Scaling needed to be worked-around again so that the image in the bug report could be drawn correctly. The issue needs some more investigation how to detect what are the exact conditions that scaling is needed. Change-Id: Icd3f57a8ded92c49848feea92dc5a14362718874
-rw-r--r--vcl/source/filter/wmf/winmtf.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index d925d0452a9b..390ded430180 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -296,14 +296,14 @@ Color WinMtf::ReadColor()
Point WinMtfOutput::ImplScale( const Point& rPt) // Hack to set varying defaults for incompletely defined files.
{
- if (mbIsMapDevSet && mbIsMapWinSet)
- {
- return rPt; //fdo#73764
- }
- else
- {
- return Point((rPt.X())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Left(),(rPt.Y())*UNDOCUMENTED_WIN_RCL_RELATION-mrclFrame.Top());
- }
+ if (mbIsMapDevSet)
+ return rPt; //fdo#73764
+
+ if (mbIsMapWinSet)
+ return Point(rPt.X() * UNDOCUMENTED_WIN_RCL_RELATION - mrclFrame.Left(),
+ rPt.Y() * UNDOCUMENTED_WIN_RCL_RELATION - mrclFrame.Top());
+
+ return ImplMap(rPt);
}
Point WinMtfOutput::ImplMap( const Point& rPt )