CWS-TOOLING: integrate CWS aw077

2009-09-17 Armin Le Grand #resolved conflicts for integration
2009-09-07 Armin Le Grand #i103058# re-added handling of StatusBar texts for DrawObject creation, added FullDrag for circle-similar shapes (all in the ellipse toolbar)
2009-09-03 Armin Le Grand #i100514# extended TextAttributes and handling, adapted for super/subscript, adapted WordBreaking (again)
2009-09-02 Armin Le Grand #i104432# secured TextLayouterDevice::getTextBoundRect implementation and usage
2009-09-02 Armin Le Grand #i104232#, #i100514# Mainly solved 1st one, no more local SpellCheck remembering, but adding to compare op's where needed
2009-08-19 Armin Le Grand #i100514# commited in-between version due to 2week holiday
2009-08-13 Armin Le Grand #i99157# applied changes to BitmapEx and SdrHdlBitmapSet
2009-08-06 Armin Le Grand #i100357# added clipping for too big MetaFiles

sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx

@@ -717,15 +717,13 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecompositio
     aTextLayouter.setFont(getPageNameFont());
 
     // get font attributes
-    ::basegfx::B2DVector aTextSizeAttribute;
-    const drawinglayer::primitive2d::FontAttributes aFontAttributes(drawinglayer::primitive2d::getFontAttributesFromVclFont(
-        aTextSizeAttribute,
-        getPageNameFont(),
-        false,
-        false));
-
-    // prepare DXTextArray (can be empty one)
-    const ::std::vector< double > aDXArray;
+    basegfx::B2DVector aTextSizeAttribute;
+    const drawinglayer::primitive2d::FontAttributes aFontAttributes(
+        drawinglayer::primitive2d::getFontAttributesFromVclFont(
+            aTextSizeAttribute,
+            getPageNameFont(),
+            false,
+            false));
 
     // prepare locale; this may need some more information in the future
     const ::com::sun::star::lang::Locale aLocale;
@@ -809,16 +807,27 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecompositio
         }
 
         // fill text matrix
-        ::basegfx::B2DHomMatrix aTextMatrix;
+        basegfx::B2DHomMatrix aTextMatrix;
+
+        aTextMatrix.set(0, 0, aTextSizeAttribute.getX());
+        aTextMatrix.set(1, 1, aTextSizeAttribute.getY());
+        aTextMatrix.set(0, 2, fStartX);
+        aTextMatrix.set(1, 2, fStartY);
 
-        aTextMatrix.set(0L, 0L, aTextSizeAttribute.getX());
-        aTextMatrix.set(1L, 1L, aTextSizeAttribute.getY());
-        aTextMatrix.set(0L, 2L, fStartX);
-        aTextMatrix.set(1L, 2L, fStartY);
+        // prepare DXTextArray (can be empty one)
+        const ::std::vector< double > aDXArray;
 
         // create Text primitive and add to target
-        xRetval[nInsert++] = Primitive2DReference(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
-            aTextMatrix, aPageName, 0, aPageName.Len(), aDXArray, aFontAttributes, aLocale, aFontColor));
+        xRetval[nInsert++] = Primitive2DReference(
+            new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+                aTextMatrix,
+                aPageName,
+                0,
+                aPageName.Len(),
+                aDXArray,
+                aFontAttributes,
+                aLocale,
+                aFontColor));
     }
 
     {
@@ -839,16 +848,27 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecompositio
         const double fStartY(aNumberRange.getMinY() + fTextHeight + aDiscretePixel.getX());
 
         // fill text matrix
-        ::basegfx::B2DHomMatrix aTextMatrix;
+        basegfx::B2DHomMatrix aTextMatrix;
+
+        aTextMatrix.set(0, 0, aTextSizeAttribute.getX());
+        aTextMatrix.set(1, 1, aTextSizeAttribute.getY());
+        aTextMatrix.set(0, 2, fStartX);
+        aTextMatrix.set(1, 2, fStartY);
 
-        aTextMatrix.set(0L, 0L, aTextSizeAttribute.getX());
-        aTextMatrix.set(1L, 1L, aTextSizeAttribute.getY());
-        aTextMatrix.set(0L, 2L, fStartX);
-        aTextMatrix.set(1L, 2L, fStartY);
+        // prepare DXTextArray (can be empty one)
+        const ::std::vector< double > aDXArray;
 
         // create Text primitive
-        xRetval[nInsert++] = Primitive2DReference(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
-            aTextMatrix, aPageNumber, 0, nNumberLen, aDXArray, aFontAttributes, aLocale, aFontColor));
+        xRetval[nInsert++] = Primitive2DReference(
+            new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+                aTextMatrix,
+                aPageNumber,
+                0,
+                nNumberLen,
+                aDXArray,
+                aFontAttributes,
+                aLocale,
+                aFontColor));
 
         if(getExcluded())
         {

sd/source/ui/view/sdview.cxx

@@ -443,20 +443,21 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                             // get font attributes; use normally scaled font
                             const basegfx::BColor aFontColor(aRGBColor);
                             Font aVclFont;
-                            basegfx::B2DVector aSize;
+                            basegfx::B2DVector aTextSizeAttribute;
 
                             aVclFont.SetHeight( 500 );
 
-                            const drawinglayer::primitive2d::FontAttributes aFontAttributes(drawinglayer::primitive2d::getFontAttributesFromVclFont(
-                                aSize,
-                                aVclFont,
-                                false,
-                                false));
+                            const drawinglayer::primitive2d::FontAttributes aFontAttributes(
+                                drawinglayer::primitive2d::getFontAttributesFromVclFont(
+                                    aTextSizeAttribute,
+                                    aVclFont,
+                                    false,
+                                    false));
 
                             // fill text matrix
                             basegfx::B2DHomMatrix aTextMatrix;
 
-                            aTextMatrix.scale(aSize.getX(), aSize.getY());
+                            aTextMatrix.scale(aTextSizeAttribute.getX(), aTextSizeAttribute.getY());
                             aTextMatrix.shearX(fShearX);
                             aTextMatrix.rotate(fRotate);
                             aTextMatrix.translate(fPosX, fPosY);
@@ -468,15 +469,16 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                             const ::com::sun::star::lang::Locale aLocale;
 
                             // create primitive and add
-                            const drawinglayer::primitive2d::Primitive2DReference xRef(new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
-                                aTextMatrix,
-                                aObjectString,
-                                0,
-                                nTextLength,
-                                aDXArray,
-                                aFontAttributes,
-                                aLocale,
-                                aFontColor));
+                            const drawinglayer::primitive2d::Primitive2DReference xRef(
+                                new drawinglayer::primitive2d::TextSimplePortionPrimitive2D(
+                                    aTextMatrix,
+                                    aObjectString,
+                                    0,
+                                    nTextLength,
+                                    aDXArray,
+                                    aFontAttributes,
+                                    aLocale,
+                                    aFontColor));
                             drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef);
                         }
                     }