[Libreoffice-commits] core.git: 2 commits - l10ntools/source svx/source

[Zolnai Tamás]

 l10ntools/source/export.cxx                       |   19 +++++++++++--------
 svx/source/customshapes/EnhancedCustomShape2d.cxx |    7 +++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 1471103be04a1bcf18002b5ddc7c9c0744655b2b
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Dec 28 12:53:40 2014 +0100

    fdo#87754: duplicated strings in an ItemList are not translated
    
    Change-Id: I72c6e234ff999a6dbed48cc62fe7d39aeb798f35

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 38cd3ed..ced58e3 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1156,16 +1156,19 @@ void Export::MergeRest( ResData *pResData )
                 }
 
                 MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData );
-                OString sText;
-                bool bText = pEntrys && pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, true );
 
-                if( bText && !sText.isEmpty())
+                if( pEntrys )
                 {
-                    ConvertMergeContent( sText );
-                    sLine =
-                        sLine.copy( 0 , sLine.indexOf('"') ) +
-                        sText +
-                        sLine.copy( sLine.lastIndexOf('"') + 1 );
+                    OString sText;
+                    pEntrys->GetText( sText, STRING_TYP_TEXT, sCur, false );
+                    if( !sText.isEmpty())
+                    {
+                        ConvertMergeContent( sText );
+                        sLine =
+                            sLine.copy( 0 , sLine.indexOf('"') ) +
+                            sText +
+                            sLine.copy( sLine.lastIndexOf('"') + 1 );
+                    }
                 }
 
                 OString sText1( "\t" );
commit 04fa50e39888926e1efdb52d46e6ab9bcd9cbea8
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Dec 28 12:53:02 2014 +0100

    Regression in rendering of flowChartPunchedTape custom shape
    
    Regression from:
    20f8006e21943b08f1f152e4a0359c9ebe4786f2
    
    It's not a good idea to create the arc first in small
    resolution and scale it later, because the result won't
    be smooth (e.g. in case of flowChartPunchedTape).
    
    Both cloud and flowChartPunchedTape rendered well after
    that change. It seems the problem in case of cloud
    was with the arc tangent values which should be calculated
    based on the ARCANGLETO's original values before scaling.
    
    Change-Id: I0315afd0452108b6539b4b8ba271d1615810d985

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 9a66921..38478bb 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1790,6 +1790,9 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
 
                             OSL_TRACE("ARCANGLETO angles: %f, %f --> parameters: %f, %f", fStartAngle, fSwingAngle, fT, fTE );
 
+                            fWR *= fXScale;
+                            fHR *= fYScale;
+
                             Rectangle aRect ( Point ( aStartPoint.getX() - fWR*cos(fT) - fWR, aStartPoint.getY() - fHR*sin(fT) - fHR ),
                                               Point ( aStartPoint.getX() - fWR*cos(fT) + fWR, aStartPoint.getY() - fHR*sin(fT) + fHR) );
 
@@ -1799,8 +1802,8 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                                       aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom(),
                                       aStartPoint.X(), aStartPoint.Y(), aEndPoint.X(), aEndPoint.Y(), bClockwise);
                             basegfx::B2DPolygon aArc = CreateArc( aRect, bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, aStartPoint == aEndPoint && fSwingAngle > F_PI);
-                            // Now that we have the arc, move it to aStartPointB2D and also scale it.
-                            basegfx::B2DHomMatrix aMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix(fXScale, fYScale, aStartPointB2D.getX(), aStartPointB2D.getY());
+                            // Now that we have the arc, move it to aStartPointB2D.
+                            basegfx::B2DHomMatrix aMatrix = basegfx::tools::createTranslateB2DHomMatrix(aStartPointB2D.getX(), aStartPointB2D.getY());
                             aArc.transform(aMatrix);
                             aNewB2DPolygon.append(aArc);
                         }