diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-19 16:56:13 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:21:37 +0100 |
| commit | aeacfe0967f930f5e16711a32b90784fc856f0ec (patch) | |
| tree | d7a67c12ad4ab2de3cb663018c2b5e347ab12fe2 /filter/source/svg/svgfontexport.cxx | |
| parent | ed953d1842caf0b8a00d1528cd012e3a9b83bdd2 (diff) | |
Fix OutputDevice members / stack allocation: filter.
Change-Id: Ib67fd510626809baab774382d37b20462253fc31
Diffstat (limited to 'filter/source/svg/svgfontexport.cxx')
| -rw-r--r-- | filter/source/svg/svgfontexport.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 2de4b734adbb..bd97906c37f3 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -78,10 +78,10 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const vcl::Font& rFont void SVGFontExport::implCollectGlyphs() { - VirtualDevice aVDev; + ScopedVclPtr<VirtualDevice> pVDev( new VirtualDevice() ); ObjectVector::const_iterator aIter( maObjects.begin() ); - aVDev.EnableOutput( false ); + pVDev->EnableOutput( false ); while( aIter != maObjects.end() ) { @@ -89,7 +89,7 @@ void SVGFontExport::implCollectGlyphs() { const GDIMetaFile& rMtf = (*aIter).GetRepresentation(); - aVDev.Push(); + pVDev->Push(); for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; ++i ) { @@ -128,13 +128,13 @@ void SVGFontExport::implCollectGlyphs() break; default: - pAction->Execute( &aVDev ); + pAction->Execute( pVDev ); break; } if( !aText.isEmpty() ) { - GlyphSet& rGlyphSet = implGetGlyphSet( aVDev.GetFont() ); + GlyphSet& rGlyphSet = implGetGlyphSet( pVDev->GetFont() ); ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( ::vcl::unohelper::CreateBreakIterator() ); @@ -165,7 +165,7 @@ void SVGFontExport::implCollectGlyphs() } } - aVDev.Pop(); + pVDev->Pop(); } ++aIter; @@ -189,14 +189,14 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", true, true ); OUString aCurIdStr( aEmbeddedFontStr ); OUString aUnitsPerEM( OUString::number( nFontEM ) ); - VirtualDevice aVDev; + ScopedVclPtr<VirtualDevice> pVDev( new VirtualDevice() ); vcl::Font aFont( rFont ); aFont.SetSize( Size( 0, nFontEM ) ); aFont.SetAlign( ALIGN_BASELINE ); - aVDev.SetMapMode( MAP_100TH_MM ); - aVDev.SetFont( aFont ); + pVDev->SetMapMode( MAP_100TH_MM ); + pVDev->SetFont( aFont ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += OUString::number( ++mnCurFontId ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM ); @@ -223,8 +223,8 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight", aFontWeight ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style", aFontStyle ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", OUString::number( aVDev.GetFontMetric().GetAscent() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::number( aVDev.GetFontMetric().GetDescent() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", OUString::number( pVDev->GetFontMetric().GetAscent() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::number( pVDev->GetFontMetric().GetDescent() ) ); { SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", true, true ); @@ -245,7 +245,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) while( aIter != rGlyphSet.end() ) { - implEmbedGlyph( aVDev, *aIter ); + implEmbedGlyph( *pVDev.get(), *aIter ); ++aIter; } } |