incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1359129 - /incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx
Date Mon, 09 Jul 2012 12:57:56 GMT
Author: af
Date: Mon Jul  9 12:57:55 2012
New Revision: 1359129

URL: http://svn.apache.org/viewvc?rev=1359129&view=rev
Log:
#i120039# Export more bitmap fill style parameters.

          Reported by: Du Jing
          Patch by: zjchen
          Review by: Andre Fischer

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx?rev=1359129&r1=1359128&r2=1359129&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx Mon Jul  9 12:57:55 2012
@@ -1485,7 +1485,43 @@ sal_Bool EscherPropertyContainer::Create
             }
 
             if ( eBitmapMode == ::com::sun::star::drawing::BitmapMode_REPEAT )
-                AddOpt( ESCHER_Prop_fillType, ESCHER_FillTexture );
+			{
+				sal_Int32 nSizeX = 0,nSizeY = 0,nOffsetX = 0,nOffsetY = 0,nPosOffsetX = 0,nPosOffsetY
= 0;
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
+                        String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeX" ) ), sal_True
) )
+                {
+                    aAny >>= nSizeX;
+                }
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
+                        String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapSizeY" ) ), sal_True
) )
+                {
+                    aAny >>= nSizeY;
+                }
+	            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
+                        String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapOffsetX" ) ), sal_True
) )
+                {
+                    aAny >>= nOffsetX;
+                }
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
+                        String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapOffsetY" ) ), sal_True
) )
+                {
+                    aAny >>= nOffsetY;
+                }
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
+                        String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapPositionOffsetX"
) ), sal_True ) )
+                {
+                    aAny >>= nPosOffsetX;
+                }
+                if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
+                        String( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapPositionOffsetY"
) ), sal_True ) )
+                {
+                    aAny >>= nPosOffsetY;
+                }
+				if(nSizeX == -100 && nSizeY == -100 && nOffsetX == 0 && nOffsetY
== 0 && nPosOffsetX == 0 && nPosOffsetY == 0)
+					AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );	
+				else
+					AddOpt( ESCHER_Prop_fillType, ESCHER_FillTexture );
+			}
             else
                 AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
 



Mime
View raw message