CWS-TOOLING: integrate CWS impress174

2009-08-27 18:21:38 +0200 af  r275502 : #i73289# Fixed detection of the cases when the layout menu is be disabled.
2009-08-24 17:45:50 +0200 sj  r275326 : #i103360# only setting filltype if there is also a correct fill element
2009-08-24 16:11:06 +0200 cl  r275322 : #i73871# only remove replaced objects from mark list if replaced by SdrEditView::ReplaceObjectAtView(). see issue for reason
2009-08-24 15:03:33 +0200 cl  r275319 : fixed merge error
2009-08-20 12:45:29 +0200 sj  r275174 : CWS-TOOLING: rebase CWS impress174 to trunk@275001 (milestone: DEV300:m55)
2009-08-19 15:54:47 +0200 sj  r275153 : #158486# text of flipped shapes is not flipped in word
2009-08-17 17:30:16 +0200 sj  r275063 : #158486# also correcting text bound for additional text rotation
2009-08-05 11:09:32 +0200 sj  r274643 : #i102797# adapted customshape coloring (fixed fontwork)
2009-08-04 14:17:36 +0200 sj  r274620 : #i99501# pdf export: fixed export of rotated graphics
2009-07-30 16:15:44 +0200 sj  r274494 : #158653# binary ppt import: fixed table border lines
2009-07-27 18:28:02 +0200 sj  r274376 : added shape text clipping for customshapes
2009-07-20 18:09:14 +0200 sj  r274154 : #i101918# fixed gallery preview (now taking the correct mapmode)
2009-07-13 18:00:58 +0200 cl  r273948 : #i103238# clear hard set attributes only if new style set is manually applied
2009-07-13 17:58:07 +0200 cl  r273947 : #i73289# do not expand a toolpanel when it gets enabled
2009-07-08 12:39:49 +0200 sj  r273827 : #i101566# applied patch from cmc to solve font width inconsistencies
2009-07-08 12:11:13 +0200 sj  r273826 : #i87727# added PDFDialog service
2009-07-06 17:22:40 +0200 sj  r273755 : #i103360# fixed a merge problem, no more looping when loading transparence gradients on background page
2009-07-03 14:42:07 +0200 sj  r273701 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 14:09:44 +0200 sj  r273696 : #102797# removed warning
2009-07-03 14:01:47 +0200 sj  r273695 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 13:13:39 +0200 sj  r273688 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 11:25:30 +0200 sj  r273684 : #i103278# fixed import of lines
2009-07-01 16:23:47 +0200 cl  r273599 : #i96820# correctly call setChanged on model if table is modified
2009-07-01 14:43:09 +0200 cl  r273588 : #i8770# Patch: fix missing type provider for pdf export dialog
2009-07-01 14:40:28 +0200 cl  r273586 : #i73871# activate picture bar after converting shape to bitmap
2009-07-01 14:39:05 +0200 cl  r273584 : #i73871# activate picture bar after converting shape to bitmap
2009-07-01 14:04:53 +0200 cl  r273578 : #i73289# PATCH: Disable layout pane on the masterslide

3 files changed, 160 insertions, 94 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index f066cd6a4729..804db0c58a16 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -55,6 +55,12 @@
 #include <svx/xlnedwit.hxx>
 #include <svx/xlnstcit.hxx>
 #include <svx/xlnedcit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xgrad.hxx>
+#include <svx/xbitmap.hxx>
+#include <svx/xhatch.hxx>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPESEGMENTCOMMAND_HPP__
@@ -64,6 +70,7 @@
 #include <boost/shared_ptr.hpp>
 #endif
 #include <basegfx/numeric/ftools.hxx>
+#include <basegfx/color/bcolortools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 // #i76201#
@@ -724,23 +731,23 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
     /*const sal_Int32* pDefData =*/ ApplyShapeAttributes( rGeometryItem );
     switch( eSpType )
     {
-        case mso_sptCan :                       nColorData = 0x20200000; break;
-        case mso_sptCube :                      nColorData = 0x302d0000; break;
-        case mso_sptActionButtonBlank :         nColorData = 0x502ad400; break;
-        case mso_sptActionButtonHome :          nColorData = 0x702ad4ad; break;
-        case mso_sptActionButtonHelp :          nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonInformation :   nColorData = 0x702ad4a5; break;
-        case mso_sptActionButtonBackPrevious :  nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonForwardNext :   nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonBeginning :     nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonEnd :           nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonReturn :        nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonDocument :      nColorData = 0x702ad4da; break;
-        case mso_sptActionButtonSound :         nColorData = 0x602ad4a0; break;
-        case mso_sptActionButtonMovie :         nColorData = 0x602ad4a0; break;
-        case mso_sptBevel :                     nColorData = 0x502ad400; break;
-        case mso_sptFoldedCorner :              nColorData = 0x20d00000; break;
-        case mso_sptSmileyFace :                nColorData = 0x20d00000; break;
+        case mso_sptCan :                       nColorData = 0x20400000; break;

+        case mso_sptCube :                      nColorData = 0x302e0000; break;

+        case mso_sptActionButtonBlank :         nColorData = 0x502ce400; break;

+        case mso_sptActionButtonHome :          nColorData = 0x702ce4ce; break;

+        case mso_sptActionButtonHelp :          nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonInformation :   nColorData = 0x702ce4c5; break;

+        case mso_sptActionButtonBackPrevious :  nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonForwardNext :   nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonBeginning :     nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonEnd :           nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonReturn :        nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonDocument :      nColorData = 0x702ce4ec; break;

+        case mso_sptActionButtonSound :         nColorData = 0x602ce4c0; break;

+        case mso_sptActionButtonMovie :         nColorData = 0x602ce4c0; break;

+        case mso_sptBevel :                     nColorData = 0x502ce400; break;

+        case mso_sptFoldedCorner :              nColorData = 0x20e00000; break;

+        case mso_sptSmileyFace :                nColorData = 0x20e00000; break;

         case mso_sptNil :
         {
             if( sShapeType.getLength() > 4 &&
@@ -754,14 +761,14 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
         case mso_sptCurvedRightArrow :
         case mso_sptCurvedUpArrow :
         case mso_sptCurvedDownArrow :           nColorData = 0x2d000000; break;
-        case mso_sptRibbon2 :                   nColorData = 0x30dd0000; break;
-        case mso_sptRibbon :                    nColorData = 0x30dd0000; break;
+        case mso_sptRibbon2 :                   nColorData = 0x30ee0000; break;
+        case mso_sptRibbon :                    nColorData = 0x30ee0000; break;
 
-        case mso_sptEllipseRibbon2 :            nColorData = 0x30dd0000; break;
-        case mso_sptEllipseRibbon :             nColorData = 0x30dd0000; break;
+        case mso_sptEllipseRibbon2 :            nColorData = 0x30ee0000; break;
+        case mso_sptEllipseRibbon :             nColorData = 0x30ee0000; break;
 
-        case mso_sptVerticalScroll :            nColorData = 0x30dd0000; break;
-        case mso_sptHorizontalScroll :          nColorData = 0x30dd0000; break;
+        case mso_sptVerticalScroll :            nColorData = 0x30ee0000; break;
+        case mso_sptHorizontalScroll :          nColorData = 0x30ee0000; break;
         default:
             break;
     }
@@ -1022,41 +1029,48 @@ sal_Bool EnhancedCustomShape2d::GetParameter( double& rRetValue, const EnhancedC
 // nLumDat 27-24 = nLumDatEntry 0
 // nLumDat 23-20 = nLumDatEntry 1 ...
 // each 4bit entry is to be interpreted as a 10 percent signed luminance changing
-Color EnhancedCustomShape2d::GetColorData( const Color& rFillColor, sal_uInt32 nIndex )
+sal_Int32 EnhancedCustomShape2d::GetLuminanceChange( sal_uInt32 nIndex ) const
 {
-    Color aRetColor;
+    const sal_uInt32 nCount = nColorData >> 28;
+    if ( !nCount )
+        return 0;
 
-    sal_uInt32 i, nColor, nTmp, nCount = nColorData >> 28;
+    if ( nIndex >= nCount )
+        nIndex = nCount - 1;
 
-    if ( nCount )
+    const sal_Int32 nLumDat = nColorData << ( ( 1 + nIndex ) << 2 );
+    return ( nLumDat >> 28 ) * 10;
+}
+
+Color EnhancedCustomShape2d::GetColorData( const Color& rFillColor, sal_uInt32 nIndex ) const
+{
+    const sal_Int32 nLuminance = GetLuminanceChange(nIndex);
+    if( !nLuminance )
+        return rFillColor;
+
+    basegfx::BColor aHSVColor=
+        basegfx::tools::rgb2hsv(
+            basegfx::BColor(rFillColor.GetRed()/255.0,
+                            rFillColor.GetGreen()/255.0,
+                            rFillColor.GetBlue()/255.0));
+    if( nLuminance > 0 )
+    {
+        aHSVColor.setGreen(
+            aHSVColor.getGreen() * (1.0-nLuminance/100.0));
+        aHSVColor.setBlue(
+            nLuminance/100.0 +
+            (1.0-nLuminance/100.0)*aHSVColor.getBlue());
+    }
+    else if( nLuminance < 0 )
     {
-        if ( nIndex >= nCount )
-            nIndex = nCount - 1;
-
-        sal_uInt32 nFillColor = (sal_uInt32)rFillColor.GetRed() |
-                                    ((sal_uInt32)rFillColor.GetGreen() << 8 ) |
-                                        ((sal_uInt32)rFillColor.GetBlue() << 16 );
-
-        sal_Int32 nLumDat = nColorData << ( ( 1 + nIndex ) << 2 );
-        sal_Int32 nLuminance = ( nLumDat >> 28 ) * 12;
-
-        nTmp = nFillColor;
-        nColor = 0;
-        for ( i = 0; i < 3; i++ )
-        {
-            sal_Int32 nC = (sal_uInt8)nTmp;
-            nTmp >>= 8;
-            nC += ( ( nLuminance * nC ) >> 8 );
-            if ( nC < 0 )
-                nC = 0;
-            else if ( nC &~ 0xff )
-                nC = 0xff;
-            nColor >>= 8;
-            nColor |= nC << 16;
-        }
-        aRetColor = Color( (sal_uInt8)nColor, (sal_uInt8)( nColor >> 8 ), (sal_uInt8)( nColor >> 16 ) );
+        aHSVColor.setBlue(
+            (1.0+nLuminance/100.0)*aHSVColor.getBlue());
     }
-    return aRetColor;
+
+    aHSVColor = basegfx::tools::hsv2rgb(aHSVColor);
+    return Color( (sal_uInt8)static_cast< sal_Int32 >( basegfx::clamp(aHSVColor.getRed(),0.0,1.0) * 255.0 + 0.5 ),
+                  (sal_uInt8)static_cast< sal_Int32 >( basegfx::clamp(aHSVColor.getGreen(),0.0,1.0) * 255.0 + 0.5 ),
+                  (sal_uInt8)static_cast< sal_Int32 >( basegfx::clamp(aHSVColor.getBlue(),0.0,1.0) * 255.0 + 0.5 ) );
 }
 
 Rectangle EnhancedCustomShape2d::GetTextRect() const
@@ -1687,6 +1701,19 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
 
     if(aNewB2DPolyPolygon.count())
     {
+        if( !bLineGeometryNeededOnly )

+        {

+            // hack aNewB2DPolyPolygon to fill logic rect - this is

+            // needed to produce gradient fills that look like mso

+            aNewB2DPolygon.clear();

+            aNewB2DPolygon.append(basegfx::B2DPoint(0,0));

+            aNewB2DPolyPolygon.append(aNewB2DPolygon);

+

+            aNewB2DPolygon.clear();

+            aNewB2DPolygon.append(basegfx::B2DPoint(aLogicRect.GetWidth(),

+                                                    aLogicRect.GetHeight()));

+            aNewB2DPolyPolygon.append(aNewB2DPolygon);

+        }

         // #i37011#
         bool bForceCreateTwoObjects(false);
 
@@ -1856,6 +1883,78 @@ void CorrectCalloutArrows( MSO_SPT eSpType, sal_uInt32 nLineObjectCount, std::ve
     }
 }
 
+void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet,
+                                          sal_uInt32& nColorIndex, sal_uInt32 nColorCount)
+{
+    if ( !rObj.IsLine() )
+    {
+        const XFillStyle eFillStyle = ((const XFillStyleItem&)rObj.GetMergedItem(XATTR_FILLSTYLE)).GetValue();
+        switch( eFillStyle )
+        {
+            default:
+            case XFILL_SOLID:
+            {
+                Color aFillColor;
+                if ( nColorCount )
+                {
+                    aFillColor = GetColorData(
+                        ((XFillColorItem&)rCustomShapeSet.Get( XATTR_FILLCOLOR )).GetColorValue(),
+                        std::min(nColorIndex, nColorCount-1) );
+                    rObj.SetMergedItem( XFillColorItem( String(), aFillColor ) );
+                }
+                break;
+            }
+            case XFILL_GRADIENT:
+            {
+                XGradient aXGradient(((const XFillGradientItem&)rObj.GetMergedItem(XATTR_FILLGRADIENT)).GetGradientValue());
+                if ( nColorCount )
+                {
+                    aXGradient.SetStartColor(
+                        GetColorData(
+                            aXGradient.GetStartColor(),
+                            std::min(nColorIndex, nColorCount-1) ));
+                    aXGradient.SetEndColor(
+                        GetColorData(
+                            aXGradient.GetEndColor(),
+                            std::min(nColorIndex, nColorCount-1) ));
+                }
+
+                rObj.SetMergedItem( XFillGradientItem( String(), aXGradient ) );
+                break;
+            }
+            case XFILL_HATCH:
+            {
+                XHatch aXHatch(((const XFillHatchItem&)rObj.GetMergedItem(XATTR_FILLHATCH)).GetHatchValue());
+                if ( nColorCount )
+                {
+                    aXHatch.SetColor(
+                        GetColorData(
+                            aXHatch.GetColor(),
+                            std::min(nColorIndex, nColorCount-1) ));
+                }
+
+                rObj.SetMergedItem( XFillHatchItem( String(), aXHatch ) );
+                break;
+            }
+            case XFILL_BITMAP:
+            {
+                Bitmap aBitmap(((const XFillBitmapItem&)rObj.GetMergedItem(XATTR_FILLBITMAP)).GetBitmapValue().GetBitmap());
+                if ( nColorCount )
+                {
+                    aBitmap.Adjust(
+                        static_cast< short > ( GetLuminanceChange(
+                            std::min(nColorIndex, nColorCount-1))));
+                }
+
+                rObj.SetMergedItem( XFillBitmapItem( String(), aBitmap ) );
+                break;
+            }
+        }
+
+        if ( nColorIndex < nColorCount )
+            nColorIndex++;
+    }
+}
 
 SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnly )
 {
@@ -1880,18 +1979,10 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
     if ( vObjectList.size() )
     {
         const SfxItemSet& rCustomShapeSet = pCustomShapeObj->GetMergedItemSet();
-        // For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
-        // const sal_Bool   bShadow(((SdrShadowItem&)rCustomShapeSet.Get( SDRATTR_SHADOW )).GetValue());
-        Color           aBasicColor( COL_WHITE );
         Color           aFillColor;
         sal_uInt32      nColorCount = nColorData >> 28;
         sal_uInt32      nColorIndex = 0;
 
-        if ( nColorCount )
-        {
-            aBasicColor = ((XFillColorItem&)rCustomShapeSet.Get( XATTR_FILLCOLOR )).GetColorValue();
-        }
-
         // #i37011# remove invisible objects
         if(vObjectList.size())
         {
@@ -1916,26 +2007,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
         if(1L == vObjectList.size())
         {
             // a single object, correct some values
-            SdrPathObj* pObj(vObjectList[0L]);
-
-// For primitive rendering, shadow handling is done completely based on the geometry, so i removed it here
-//          if(bShadow)
-//          {
-//              pObj->SetMergedItem(SdrShadowItem(sal_True));
-//          }
-
-            if(!pObj->IsLine())
-            {
-                if ( nColorIndex < nColorCount )
-                {
-                    aFillColor = GetColorData( aBasicColor, nColorIndex++ );
-                }
-
-                if ( nColorCount )
-                {
-                    pObj->SetMergedItem( XFillColorItem( String(), aFillColor ) );
-                }
-            }
+            AdaptObjColor(*vObjectList[0L],rCustomShapeSet,nColorIndex,nColorCount);
         }
         else
         {
@@ -1954,16 +2026,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( sal_Bool bLineGeometryNeededOnl
                 else
                 {
                     nAreaObjectCount++;
-
-                    if ( nColorIndex < nColorCount )
-                    {
-                        aFillColor = GetColorData( aBasicColor, nColorIndex++ );
-                    }
-
-                    if ( nColorCount )
-                    {
-                        pObj->SetMergedItem( XFillColorItem( String(), aFillColor ) );
-                    }
+                    AdaptObjColor(*pObj,rCustomShapeSet,nColorIndex,nColorCount);
                 }
             }
 
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx
index 25a537db072a..6be05a9e588d 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx
@@ -120,7 +120,10 @@ class EnhancedCustomShape2d : public SfxItemSet
         sal_Int32                   nRotateAngle;
 
         sal_Bool                    SetAdjustValueAsDouble( const double& rValue, const sal_Int32 nIndex );
-        Color                       GetColorData( const Color& rFillColor, sal_uInt32 nIndex );
+        sal_Int32                   GetLuminanceChange( sal_uInt32 nIndex ) const;
+        Color                       GetColorData( const Color& rFillColor, sal_uInt32 nIndex ) const;
+        void                        AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet,
+                                                  sal_uInt32& nColorIndex, sal_uInt32 nColorCount);
         sal_Bool                    GetParameter( double& rParameterReturnValue,  const com::sun::star::drawing::EnhancedCustomShapeParameter&,
                                                     const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight ) const;
         Point                       GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&,
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 426c94adcab8..abe6178cc800 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -683,7 +683,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
                 break;
             const Polygon& rOutlinePoly( aOutlines2d[ nOutline2dIdx++ ] );
             const sal_uInt16 nPointCount = rOutlinePoly.GetSize();
-            if ( nPointCount )
+            if ( nPointCount > 1 )
             {
                 std::vector< double > vDistances;
                 vDistances.reserve( nPointCount );
@@ -745,7 +745,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW
             const Polygon& rOutlinePoly2( aOutlines2d[ nOutline2dIdx++ ] );
             const sal_uInt16 nPointCount = rOutlinePoly.GetSize();
             const sal_uInt16 nPointCount2 = rOutlinePoly2.GetSize();
-            if ( nPointCount && nPointCount2 )
+            if ( ( nPointCount > 1 ) && ( nPointCount2 > 1 ) )
             {
                 std::vector< double > vDistances;
                 vDistances.reserve( nPointCount );