[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply            |    1 
 patches/dev300/wmf-mm-text.diff |   95 ----------------------------------------
 2 files changed, 96 deletions(-)

New commits:
commit 23501c4788861eef653ae1684a63c9f7c6a822ff
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 14:47:25 2011 +0200

    pushed wmf-mm-text.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c65cea2..26fab95 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1192,7 +1192,6 @@ odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
 
 [ Fixes ]
 external-apm-header.diff, freuter
-wmf-mm-text.diff, n#417818, rodo
 wmf-mm-text-1.diff, n#417818, rodo
 
 [ UbuntuHardyOnly ]
diff --git a/patches/dev300/wmf-mm-text.diff b/patches/dev300/wmf-mm-text.diff
deleted file mode 100644
index 218c7ea..0000000
--- a/patches/dev300/wmf-mm-text.diff
+++ /dev/null
@@ -1,95 +0,0 @@
----
- svtools/source/filter.vcl/wmf/winmtf.cxx |   21 +++++++++++++++++++++
- svtools/source/filter.vcl/wmf/winmtf.hxx |    3 +++
- svtools/source/filter.vcl/wmf/winwmf.cxx |    1 +
- 3 files changed, 25 insertions(+), 0 deletions(-)
-
-diff --git svtools/source/filter.vcl/wmf/winmtf.cxx svtools/source/filter.vcl/wmf/winmtf.cxx
-index 9360277..a7910d6 100644
---- svtools/source/filter.vcl/wmf/winmtf.cxx
-+++ svtools/source/filter.vcl/wmf/winmtf.cxx
-@@ -420,6 +420,14 @@ Point WinMtfOutput::ImplMap( const Point& rPt )
-         {
-             switch( mnMapMode )
-             {
-+                case MM_TEXT:
-+                    fX2 -= mnWinOrgX;
-+                    fY2 -= mnWinOrgY;
-+                    fX2 *= 2540.0/mnUnitsPerInch;
-+                    fY2 *= 2540.0/mnUnitsPerInch;
-+                    fX2 += mnDevOrgX;
-+                    fY2 += mnDevOrgY;
-+                    break;
-                 case MM_LOENGLISH :
-                 {
-                     fX2 -= mnWinOrgX;
-@@ -495,6 +503,10 @@ Size WinMtfOutput::ImplMap( const Size& rSz )
-         {
-             switch( mnMapMode )
-             {
-+                case MM_TEXT:
-+                    fWidth *= 2540.0/mnUnitsPerInch;
-+                    fHeight*= 2540.0/mnUnitsPerInch;
-+                break;
-                 case MM_LOENGLISH :
-                 {
-                     fWidth *= 25.40;
-@@ -931,6 +943,7 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
-     mbComplexClip       ( false ),
-     mnGfxMode			( GM_COMPATIBLE ),
-     mnMapMode           ( MM_TEXT ),
-+    mnUnitsPerInch ( 96 ),
-     mnDevOrgX			( 0 ),
-     mnDevOrgY			( 0 ),
-     mnDevWidth			( 1 ),
-@@ -2057,6 +2070,14 @@ void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode )
- 
- //-----------------------------------------------------------------------------------
- 
-+void WinMtfOutput::SetUnitsPerInch( sal_uInt16 nUnitsPerInch )
-+{
-+    if( nUnitsPerInch != 0 )
-+    mnUnitsPerInch = nUnitsPerInch;
-+}
-+
-+//-----------------------------------------------------------------------------------
-+
- void WinMtfOutput::SetWorldTransform( const XForm& rXForm )
- {
-     maXForm.eM11 = rXForm.eM11;
-diff --git svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/winmtf.hxx
-index 51ec483..541fbef 100644
---- svtools/source/filter.vcl/wmf/winmtf.hxx
-+++ svtools/source/filter.vcl/wmf/winmtf.hxx
-@@ -588,6 +588,8 @@ class WinMtfOutput
- 
-         sal_uInt32			mnGfxMode;
-         sal_uInt32          mnMapMode;
-+    sal_uInt16			mnUnitsPerInch;
-+
-         XForm				maXForm;
-         sal_Int32			mnDevOrgX, mnDevOrgY;
-         sal_Int32			mnDevWidth, mnDevHeight;
-@@ -634,6 +636,7 @@ class WinMtfOutput
- 
-         sal_uInt32			GetMapMode() const { return mnMapMode; };
-         void                SetMapMode( sal_uInt32 mnMapMode );
-+    void SetUnitsPerInch( sal_uInt16 nUnitsPerInch );
-         void				SetWorldTransform( const XForm& rXForm );
-         void				ModifyWorldTransform( const XForm& rXForm, sal_uInt32 nMode );
- 
-diff --git svtools/source/filter.vcl/wmf/winwmf.cxx svtools/source/filter.vcl/wmf/winwmf.cxx
-index 1a70555..9f86995 100644
---- svtools/source/filter.vcl/wmf/winwmf.cxx
-+++ svtools/source/filter.vcl/wmf/winwmf.cxx
-@@ -1043,6 +1043,7 @@ BOOL WMFReader::ReadHeader(WMF_APMFILEHEADER *pAPMHeader)
-       }
-     }
- 
-+    pOut->SetUnitsPerInch( nUnitsPerInch );
-     pOut->SetWinOrg( aPlaceableBound.TopLeft() );
-     aWMFSize = Size( labs( aPlaceableBound.GetWidth() ), labs( aPlaceableBound.GetHeight() ) );
-     pOut->SetWinExt( aWMFSize );
--- 
-1.7.0.1
-