diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-09 14:41:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 11:30:59 +0100 |
| commit | dbc7c605d65cc2dc37af3d2077ac553754bc4f7d (patch) | |
| tree | cf43716f48910dbc275cec2bfd39bb498a011ffc /sd | |
| parent | Resolves: #i121153# adapted RenderBitmapPrimitive2D_self... (diff) | |
| download | core-dbc7c605d65cc2dc37af3d2077ac553754bc4f7d.tar.gz core-dbc7c605d65cc2dc37af3d2077ac553754bc4f7d.zip | |
Resolves: #i121183# enhance export of ppt hatch masterpagebackground
(cherry picked from commit 60f299f255a8a2fd2c4aabde6933d4388af3643b)
Conflicts:
filter/source/msfilter/escherex.cxx
sd/source/filter/eppt/eppt.cxx
sd/source/filter/eppt/eppt.hxx
Change-Id: I62d772ab67ed03bfa964040bd07b3684cf2dee8f
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/eppt/epptbase.hxx | 1 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptbase.cxx | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index dc0593837b2a..861d06abbf0f 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1202,8 +1202,10 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 ); // Flags: Connector | Background | HasSpt - Point aEmptyPoint = Point(); - Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) ); + + // #i121183# Use real PageSize in 100th mm + Rectangle aRect(Point(0, 0), Size(maPageSize.Width, maPageSize.Height)); + EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); aPropOpt.AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid ); ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE ); diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index f84360db01d6..212e3e3d64d0 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -353,6 +353,7 @@ protected: MapMode maMapModeSrc; MapMode maMapModeDest; ::com::sun::star::awt::Size maDestPageSize; + ::com::sun::star::awt::Size maPageSize; // #i121183# Keep size in logic coordinates (100th mm) ::com::sun::star::awt::Size maNotesPageSize; PageType meLatestPageType; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 8e9ff5c4fbc7..7f829e9b3b5b 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -197,6 +197,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert if ( ImplGetPropertyValue( mXPagePropSet, OUString( "Height" ) ) ) mAny >>= nHeight; maDestPageSize = MapSize( awt::Size( nWidth, nHeight ) ); + maPageSize = awt::Size(nWidth, nHeight); DBG(printf( "call exportDocumentPre()\n")); exportPPTPre(rMediaData); |