diff options
| author | Jianyuan Li <lijiany@apache.org> | 2012-08-16 01:13:03 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-20 15:56:19 +0100 |
| commit | 0982b526bf0cd938af468f8c2d05830d6b6a8620 (patch) | |
| tree | 25c23118168e2000609bd25e2bdb08e05b8454c5 /include/filter/msfilter | |
| parent | fdo#38838 Replacement of the String with OUString (diff) | |
| download | core-0982b526bf0cd938af468f8c2d05830d6b6a8620.tar.gz core-0982b526bf0cd938af468f8c2d05830d6b6a8620.zip | |
Resolves: #i120554# Shape Gradient MS2003 import/export Enhancement
Reported by: Jianyuan Li
Patch by: Jianyuan Li
Review by: SunYing
(cherry picked from commit 09c33de80a0e5fa321979e53bf88c4d17271eba8)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/inc/filter/msfilter/msdffimp.hxx
filter/source/msfilter/escherex.cxx
filter/source/msfilter/msdffimp.cxx
Change-Id: I80a60af4862eb99523ea59e4f788b685d6de1fbd
WaE fixes: reorder initialization, handle all cases in switch, ...
(cherry picked from commit 350f294badf378806348e77e6a8ed0b5f1d5b77d)
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: I4f1bde463921d48d1e014d0521427eaa9294663e
Add default to switch statements to avoid compiler warnings.
Patch by: Jianyuan Li
(cherry picked from commit f1302af0d803ca969022e69bcf7deeb62459f789)
Change-Id: I4e78e3b565d5922d452d2cfd1bf473af1587d29b
Diffstat (limited to 'include/filter/msfilter')
| -rw-r--r-- | include/filter/msfilter/escherex.hxx | 13 | ||||
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index b57d269d30b0..9ccf4350e50b 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -1270,13 +1270,22 @@ public: void CreateGradientProperties( const ::com::sun::star::awt::Gradient & rGradient ); void CreateGradientProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + sal_Bool bTransparentGradient = sal_False ); + void CreateLineProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_Bool bEdge ); - void CreateFillProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_Bool bEdge ); + void CreateFillProperties( + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + sal_Bool bEdge, + sal_Bool bTransparentGradient = sal_False ); + void CreateFillProperties( + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + sal_Bool bEdge, + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ); void CreateTextProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_uInt32 nText, diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 6359277f49f4..16675dbe9f0e 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -86,6 +86,8 @@ class MSFILTER_DLLPUBLIC DffPropertyReader : public DffPropSet public: sal_Int32 mnFix16Angle; + sal_Bool mbRotateGranientFillWithAngle; + explicit DffPropertyReader( const SvxMSDffManager& rManager ); ~DffPropertyReader(); sal_Int32 Fix16ToAngle( sal_Int32 nAngle ) const; @@ -99,6 +101,7 @@ public: void SetDefaultPropSet( SvStream& rIn, sal_uInt32 nOffDgg ) const; void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const; void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, DffObjData& rObjData ) const; + void ImportGradientColor( SfxItemSet& aSet, MSO_FillType eMSO_FillType, double dTrans = 1.0 , double dBackTrans = 1.0 ) const; }; #define COL_DEFAULT RGB_COLORDATA( 0xFA, 0xFB, 0xFC ) |