diff options
| author | ka <kai.ahrens@oracle.com> | 2011-02-17 21:55:54 +0100 |
|---|---|---|
| committer | ka <kai.ahrens@oracle.com> | 2011-02-17 21:55:54 +0100 |
| commit | 8b13bc67f94884541bfb336cdb4f0871dee755c6 (patch) | |
| tree | 615a0c9de9bd964f480d2e49f4873e4fb1ab3aae /filter/source/svg/svgfontexport.cxx | |
| parent | d652efa0b870ae1dde675391a067f2db78c9b153 (diff) | |
| parent | f684c501959268d1e4ce6c47a204af1b756f8451 (diff) | |
ka102: rebased to DEV300_m100
Diffstat (limited to 'filter/source/svg/svgfontexport.cxx')
| -rw-r--r-- | filter/source/svg/svgfontexport.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 8ea64e888fc9..99d8692fa3df 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -101,7 +101,7 @@ void SVGFontExport::implCollectGlyphs() { ::rtl::OUString aText; MetaAction* pAction = rMtf.GetAction( i ); - const USHORT nType = pAction->GetType(); + const sal_uInt16 nType = pAction->GetType(); switch( nType ) { @@ -192,7 +192,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) const ::rtl::OUString aEmbeddedFontStr( B2UCONST( "EmbeddedFont_" ) ); { - SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", true, true ); + SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); ::rtl::OUString aCurIdStr( aEmbeddedFontStr ); ::rtl::OUString aUnitsPerEM( ::rtl::OUString::valueOf( nFontEM ) ); VirtualDevice aVDev; @@ -208,7 +208,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM ); { - SvXMLElementExport aExp2( mrExport, XML_NAMESPACE_NONE, "font", true, true ); + SvXMLElementExport aExp2( mrExport, XML_NAMESPACE_NONE, "font", sal_True, sal_True ); ::rtl::OUString aFontWeight; ::rtl::OUString aFontStyle; const Size aSize( nFontEM, nFontEM ); @@ -233,7 +233,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) ); { - SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", true, true ); + SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True ); } mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aSize.Width() ) ); @@ -245,7 +245,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", SVGActionWriter::GetPathString( aMissingGlyphPolyPoly, sal_False ) ); { - SvXMLElementExport aExp4( mrExport, XML_NAMESPACE_NONE, "missing-glyph", true, true ); + SvXMLElementExport aExp4( mrExport, XML_NAMESPACE_NONE, "missing-glyph", sal_True, sal_True ); } } @@ -291,7 +291,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& r } { - SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "glyph", true, true ); + SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "glyph", sal_True, sal_True ); } } } |