diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-10-30 08:05:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-30 08:05:54 +0000 |
| commit | 7ebc6dabe1cdd6b02b4b10074605277af89f2073 (patch) | |
| tree | 8badf402abc28c15b6afaa95acc18336dfb21ae5 /xmloff | |
| parent | f7839ea2aa7eff3b1ee18b0334616505653b5a7b (diff) | |
INTEGRATION: CWS ause060 (1.94.2); FILE MERGED
2006/09/29 17:24:53 hjs 1.94.2.1: #i69951# remove CONV_STAR_FONTS
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 08e4dc5466b0..20b20c74b28a 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xmlimp.cxx,v $ * - * $Revision: 1.95 $ + * $Revision: 1.96 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:39:33 $ + * last change: $Author: rt $ $Date: 2006-10-30 09:05:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -148,11 +148,9 @@ #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif -#ifdef CONV_STAR_FONTS #ifndef _VCL_FONTCVT_HXX #include <vcl/fontcvt.hxx> #endif -#endif #define LOGFILE_AUTHOR "unknown" @@ -243,10 +241,8 @@ void SAL_CALL SvXMLImportEventListener::disposing( const lang::EventObject& ) class SvXMLImport_Impl { public: -#ifdef CONV_STAR_FONTS FontToSubsFontConverter hBatsFontConv; FontToSubsFontConverter hMathFontConv; -#endif bool mbOwnGraphicResolver; bool mbOwnEmbeddedResolver; @@ -259,9 +255,7 @@ public: // <-- SvXMLImport_Impl() : -#ifdef CONV_STAR_FONTS hBatsFontConv( 0 ), hMathFontConv( 0 ), -#endif mbOwnGraphicResolver( false ), mbOwnEmbeddedResolver( false ), // --> OD 2004-08-11 #i28749# @@ -270,12 +264,10 @@ public: {} ~SvXMLImport_Impl() { -#ifdef CONV_STAR_FONTS if( hBatsFontConv ) DestroyFontToSubsFontConverter( hBatsFontConv ); if( hMathFontConv ) DestroyFontToSubsFontConverter( hMathFontConv ); -#endif } ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; @@ -1633,7 +1625,6 @@ void SvXMLImport::_CreateDataStylesImport() } -#ifdef CONV_STAR_FONTS sal_Unicode SvXMLImport::ConvStarBatsCharToStarSymbol( sal_Unicode c ) { sal_Unicode cNew = c; @@ -1669,7 +1660,6 @@ sal_Unicode SvXMLImport::ConvStarMathCharToStarSymbol( sal_Unicode c ) return cNew; } -#endif |