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

[Petr Mladek]

 patches/dev300/apply                           |    4 --
 patches/dev300/svx-fix-fit-to-frame-crash.diff |   11 ------
 patches/dev300/wmf-mm-text-1.diff              |   43 -------------------------
 3 files changed, 58 deletions(-)

New commits:
commit 7f4b5f7324bdacb2b8a00de4b77a8a447c5c5db8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 16:00:29 2011 +0200

    pushed svx-fix-fit-to-frame-crash.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d71ed44..81ca0ca 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1228,9 +1228,6 @@ ubuntu-arm-thumb.diff, doko
 #ubuntu-arm-thumb.diff, doko
 
 [ Fixes ]
-# Fix for crash on Windows by Rail Aliev. Root cause unknown.
-svx-fix-fit-to-frame-crash.diff, n#508621, rodo
-
 # expand path placeholders early in template dialog
 normalize-template-paths-fix.diff, n#512146, thorsten
 
diff --git a/patches/dev300/svx-fix-fit-to-frame-crash.diff b/patches/dev300/svx-fix-fit-to-frame-crash.diff
deleted file mode 100644
index 2de1f9a..0000000
--- a/patches/dev300/svx-fix-fit-to-frame-crash.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- editeng/source/editeng/impedit3.cxx
-+++ editeng/source/editeng/impedit3.cxx
-@@ -946,7 +946,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
-                         long nCurPos = nTmpWidth+nStartX;
-                         // consider scaling
-                         if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
--                            nCurPos = nCurPos*100/nStretchX;
-+                            nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
- 
-                         short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
-                         aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
commit 837fa6e824cdcfafb0373fdb0d85f3ff2cfabccd
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 14:51:11 2011 +0200

    pushed wmf-mm-text-1.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 26fab95..d71ed44 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-1.diff, n#417818, rodo
 
 [ UbuntuHardyOnly ]
 # Add patch to only show local files needed when gnome-vfs/gio is disabled
diff --git a/patches/dev300/wmf-mm-text-1.diff b/patches/dev300/wmf-mm-text-1.diff
deleted file mode 100644
index 9d8f1d7..0000000
--- a/patches/dev300/wmf-mm-text-1.diff
+++ /dev/null
@@ -1,43 +0,0 @@
----
- svtools/source/filter.vcl/wmf/winmtf.cxx |   14 ++++++++++++--
- 1 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git svtools/source/filter.vcl/wmf/winmtf.cxx svtools/source/filter.vcl/wmf/winmtf.cxx
-index a7910d6..bfc23b4 100644
---- svtools/source/filter.vcl/wmf/winmtf.cxx
-+++ svtools/source/filter.vcl/wmf/winmtf.cxx
-@@ -423,10 +423,15 @@ Point WinMtfOutput::ImplMap( const Point& rPt )
-                 case MM_TEXT:
-                     fX2 -= mnWinOrgX;
-                     fY2 -= mnWinOrgY;
--                    fX2 *= 2540.0/mnUnitsPerInch;
--                    fY2 *= 2540.0/mnUnitsPerInch;
-+                    if( mnDevWidth != 1 || mnDevHeight != 1 ) {
-+                        fX2 *= 2540.0/mnUnitsPerInch;
-+                        fY2 *= 2540.0/mnUnitsPerInch;
-+                    }
-                     fX2 += mnDevOrgX;
-                     fY2 += mnDevOrgY;
-+                    fX2 *= (double)mnMillX * 100.0 / (double)mnPixX;
-+                    fY2 *= (double)mnMillY * 100.0 / (double)mnPixY;
-+
-                     break;
-                 case MM_LOENGLISH :
-                 {
-@@ -504,8 +509,13 @@ Size WinMtfOutput::ImplMap( const Size& rSz )
-             switch( mnMapMode )
-             {
-                 case MM_TEXT:
-+                if( mnDevWidth != 1 && mnDevHeight != 1 ) {
-                     fWidth *= 2540.0/mnUnitsPerInch;
-                     fHeight*= 2540.0/mnUnitsPerInch;
-+                } else {
-+                    fWidth *= (double)mnMillX * 100 / (double)mnPixX;
-+                    fHeight *= (double)mnMillY * 100 / (double)mnPixY;
-+                }
-                 break;
-                 case MM_LOENGLISH :
-                 {
--- 
-1.7.0.1
-