[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - vcl/source

[Andras Timar]

 vcl/source/filter/wmf/winmtf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22818d9fb7551d8f2a7d9389d28dd96b794a1e89
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jan 19 19:13:57 2014 +0100

    fdo#73764 partially revert 3998d1abb291
    
    Change-Id: Ie9b6d6a318fad256f3f0999fe9c0810a4323f10d
    Reviewed-on: https://gerrit.libreoffice.org/7537
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit ade704ea4ac7317f2ad300c8321c64ba54d0e692)
    Reviewed-on: https://gerrit.libreoffice.org/7575
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 160416b..38e79a8 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -317,7 +317,7 @@ Point WinMtfOutput::ImplScale( const Point& rPt) // Hack to set varying defaults
 {
         if (mbIsMapDevSet && mbIsMapWinSet)
         {
-            return Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top());
+            return rPt; //fdo#73764
         }
         else
         {