diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-09 14:41:38 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2012-10-09 14:41:38 +0000 |
| commit | 60f299f255a8a2fd2c4aabde6933d4388af3643b (patch) | |
| tree | 9abdb5dce767b40fa9e7967f649c69580c7af7a4 /sd | |
| parent | 121b5090651912359533500e4a9ba9630cc3555f (diff) | |
#121183# enhance export of hatch masterpagebackgrund for ppt format
Notes
Notes:
merged as: dbc7c605d65cc2dc37af3d2077ac553754bc4f7d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 7 | ||||
| -rw-r--r-- | sd/source/filter/eppt/eppt.hxx | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index fd875a27ed60..9f28d1480c28 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -172,6 +172,7 @@ PPTWriter::PPTWriter( const std::vector< com::sun::star::beans::PropertyValue >& if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) ) mAny >>= nHeight; maDestPageSize = ImplMapSize( ::com::sun::star::awt::Size( nWidth, nHeight ) ); + maPageSize = Size(nWidth, nHeight); mrStg = rSvStorage; if ( !mrStg.Is() ) @@ -1704,8 +1705,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 ) ); + + // #121183# Use real PageSize in 100th mm + Rectangle aRect(Point(0, 0), maPageSize); + 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/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 6d207729df2d..a44dbccf28d9 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -689,6 +689,7 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide MapMode maMapModeSrc; MapMode maMapModeDest; ::com::sun::star::awt::Size maDestPageSize; + Size maPageSize; // #121183# Keep size in logic coordinates (100th mm) ::com::sun::star::awt::Size maNotesPageSize; PageType meLatestPageType; List maSlideNameList; |