diff options
| author | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2009-11-12 11:26:43 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@Sun.COM> | 2009-11-12 11:26:43 +0100 |
| commit | d1514b06afe83c88d9cdbd037840750951236467 (patch) | |
| tree | 832335c26829469071c3ddd070e3bf81465819dd /sd | |
| parent | 6da880d35ecf65d4b495d9d426a5d48b5d31ad2d (diff) | |
aw078 #i106541# commited in-between stable version with already advanced metafile decomposition for security reasons
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 1a25bedb583b..8a66523280fc 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -728,8 +728,8 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // get font attributes basegfx::B2DVector aTextSizeAttribute; - const drawinglayer::primitive2d::FontAttributes aFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aTextSizeAttribute, getPageNameFont(), false, @@ -835,7 +835,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c 0, aPageName.Len(), aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); } @@ -876,7 +876,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c 0, nNumberLen, aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 46a7d71a91fe..d38704bd124c 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -448,8 +448,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP aVclFont.SetHeight( 500 ); - const drawinglayer::primitive2d::FontAttributes aFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aTextSizeAttribute, aVclFont, false, @@ -476,7 +476,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP 0, nTextLength, aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); |