scp2/source/ooo/file_ooo.scp | 1 + svx/source/svdraw/svdotextdecomposition.cxx | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-)
New commits: commit 638ecac30d04a0f13e55f2566a9e318b9dbf02f0 Author: David Tardon <[email protected]> Date: Wed Jun 12 07:33:40 2013 +0200 fdo#65485 install .ui translations for writer again Change-Id: I8e8ad67058286aec94164a44dbd461078a792359 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 11a0eb1..003f92e 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -631,6 +631,7 @@ UI_FILELIST_ALL_LANG(spa, UIConfig/spa, filelist) #endif UI_FILELIST_ALL_LANG(svt, UIConfig/svt, filelist) UI_FILELIST_ALL_LANG(svx, UIConfig/svx, filelist) +UI_FILELIST_ALL_LANG(swriter, UIConfig/modules/swriter, filelist) #ifdef ENABLE_TELEPATHY UI_FILELIST_ALL_LANG(tubes, UIConfig/tubes, filelist) #endif commit 5776449ee5d2b363d9c645a583f73e950b5aaeeb Author: David Tardon <[email protected]> Date: Tue Jun 11 14:51:32 2013 +0200 typo Change-Id: I31826c779039b0a95ac7571d4dd871d878ba3ca7 diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 0d53e44..0365429 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -780,8 +780,8 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive( rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage())); // now get back the layouted text size from outliner - const Size aOutlinerTextSiz(rOutliner.GetPaperSize()); - const basegfx::B2DVector aOutlinerScale(aOutlinerTextSiz.Width(), aOutlinerTextSiz.Height()); + const Size aOutlinerTextSize(rOutliner.GetPaperSize()); + const basegfx::B2DVector aOutlinerScale(aOutlinerTextSize.Width(), aOutlinerTextSize.Height()); basegfx::B2DVector aAdjustTranslate(0.0, 0.0); // correct horizontal translation using the now known text size @@ -962,8 +962,8 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( rOutliner.SetControlWord(nOriginalControlWord); // now get back the layouted text size from outliner - const Size aOutlinerTextSiz(rOutliner.GetPaperSize()); - const basegfx::B2DVector aOutlinerScale(aOutlinerTextSiz.Width(), aOutlinerTextSiz.Height()); + const Size aOutlinerTextSize(rOutliner.GetPaperSize()); + const basegfx::B2DVector aOutlinerScale(aOutlinerTextSize.Width(), aOutlinerTextSize.Height()); basegfx::B2DVector aAdjustTranslate(0.0, 0.0); // For draw objects containing text correct hor/ver alignment if text is bigger @@ -1095,10 +1095,10 @@ void SdrTextObj::impDecomposeStretchTextPrimitive( rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage())); // now get back the laid out text size from outliner - const Size aOutlinerTextSiz(rOutliner.CalcTextSize()); + const Size aOutlinerTextSize(rOutliner.CalcTextSize()); const basegfx::B2DVector aOutlinerScale( - basegfx::fTools::equalZero(aOutlinerTextSiz.Width()) ? 1.0 : aOutlinerTextSiz.Width(), - basegfx::fTools::equalZero(aOutlinerTextSiz.Height()) ? 1.0 : aOutlinerTextSiz.Height()); + basegfx::fTools::equalZero(aOutlinerTextSize.Width()) ? 1.0 : aOutlinerTextSize.Width(), + basegfx::fTools::equalZero(aOutlinerTextSize.Height()) ? 1.0 : aOutlinerTextSize.Height()); // prepare matrices to apply to newly created primitives basegfx::B2DHomMatrix aNewTransformA; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
