diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-10-30 08:07:07 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-10-30 08:07:07 +0000 |
| commit | 80afc54c6379b46189b38d943fedd2bd6317c877 (patch) | |
| tree | 0db5341e38dfb651f0380c309cdb7a65e202080e /xmloff | |
| parent | b5e083a5423eef92fd453d2d8b109f5f9e9fa3d7 (diff) | |
INTEGRATION: CWS ause060 (1.121.2); FILE MERGED
2006/09/29 17:24:55 hjs 1.121.2.1: #i69951# remove CONV_STAR_FONTS
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 0134a86da655..4d8071ad88cb 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtimp.cxx,v $ * - * $Revision: 1.121 $ + * $Revision: 1.122 $ * - * last change: $Author: obo $ $Date: 2006-09-17 11:18:17 $ + * last change: $Author: rt $ $Date: 2006-10-30 09:07:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -891,7 +891,6 @@ void XMLTextImportHelper::DeleteParagraph() } } -#ifdef CONV_STAR_FONTS OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, const OUString& rStyleName, sal_uInt8& rFlags, @@ -970,7 +969,6 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, return bConverted ? sChars.makeStringAndClear() : rChars; } -#endif OUString XMLTextImportHelper::SetStyleAndAttrs( SvXMLImport& rImport, |