[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - drawinglayer/source svx/source

[Armin Le Grand]

 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |   20 +++++++++++-----
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx      |    7 +++++
 2 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 525dfeafdb5c9a57cd2d40c9b2358446aa6aabbd
Author: Armin Le Grand <alg at apache.org>
Date:   Thu May 30 09:30:24 2013 +0000

    i122395 Adapted mapping of content to more general way

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 25f4867..5cc78f1 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2980,6 +2980,9 @@ namespace
 
                             if(xSubContent.hasElements())
                             {
+                                // prepare sub-content transform
+                                basegfx::B2DHomMatrix aSubTransform;
+
                                 // create SourceRange
                                 const basegfx::B2DRange aSourceRange(
                                     rContent.GetPrefMapMode().GetOrigin().X(),
@@ -2990,17 +2993,22 @@ namespace
                                 // apply mapping if aTargetRange and aSourceRange are not equal
                                 if(!aSourceRange.equal(aTargetRange))
                                 {
-                                    basegfx::B2DHomMatrix aTransform;
-
-                                    aTransform.translate(-aSourceRange.getMinX(), -aSourceRange.getMinY());
-                                    aTransform.scale(
+                                    aSubTransform.translate(-aSourceRange.getMinX(), -aSourceRange.getMinY());
+                                    aSubTransform.scale(
                                         aTargetRange.getWidth() / (basegfx::fTools::equalZero(aSourceRange.getWidth()) ? 1.0 : aSourceRange.getWidth()),
                                         aTargetRange.getHeight() / (basegfx::fTools::equalZero(aSourceRange.getHeight()) ? 1.0 : aSourceRange.getHeight()));
-                                    aTransform.translate(aTargetRange.getMinX(), aTargetRange.getMinY());
+                                    aSubTransform.translate(aTargetRange.getMinX(), aTargetRange.getMinY());
+                                }
 
+                                // apply general current transformation
+                                aSubTransform = rPropertyHolders.Current().getTransformation() * aSubTransform;
+
+                                // evtl. embed sub-content to it's transformation
+                                if(!aSubTransform.isIdentity())
+                                {
                                     const drawinglayer::primitive2d::Primitive2DReference aEmbeddedTransform(
                                         new drawinglayer::primitive2d::TransformPrimitive2D(
-                                            aTransform,
+                                            aSubTransform,
                                             xSubContent));
 
                                     xSubContent = drawinglayer::primitive2d::Primitive2DSequence(&aEmbeddedTransform, 1);
commit 3f1d43bd6d7a2c5841ad3b0fbcd417393df74329
Author: Andre Fischer <af at apache.org>
Date:   Thu May 30 08:59:30 2013 +0000

    122380: Use quick help text as accessible name for some paragraph panel controls.

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 5dc14b0..32cb9a3 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -416,6 +416,10 @@ void ParaPropertyPanel::InitToolBoxIndent()
     maRightIndent->SetModifyHdl( aLink );
     maFLineIndent->SetModifyHdl( aLink );
 
+    maLeftIndent->SetAccessibleName(maLeftIndent->GetQuickHelpText());
+    maRightIndent->SetAccessibleName(maRightIndent->GetQuickHelpText());
+    maFLineIndent->SetAccessibleName(maFLineIndent->GetQuickHelpText());
+
     const bool bIsHighContrastModeActive (Theme::IsHighContrastMode());
 
     if( Application::GetSettings().GetLayoutRTL())
@@ -484,6 +488,9 @@ void ParaPropertyPanel::InitToolBoxSpacing()
     maTopDist->SetModifyHdl(aLink);
     maBottomDist->SetModifyHdl( aLink );
 
+    mpTopDist->SetAccessibleName(mpTopDist->GetQuickHelpText());
+    mpBottomDist->SetAccessibleName(mpBottomDist->GetQuickHelpText());
+
     maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM1, maParInc);
     maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM2, maParDec);
     aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl );