diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:06:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:06:29 +0000 |
| commit | 372c4509ed4fd479465d336682171e45f4d074f7 (patch) | |
| tree | 394cb6012d86ffbc0bfdee2f06ebcafd5a645b03 /xmloff/source/core/xmlehelp.cxx | |
| parent | 561b6d831a4f5ec46754f335c8117b675b3b4e01 (diff) | |
INTEGRATION: CWS oasis (1.6.276); FILE MERGED
2004/04/19 12:34:24 mib 1.6.276.1: - changed "graphics" style family to "graphic" (#i20153#)
- replaced "inch" with "in" (#i18170#)
Diffstat (limited to 'xmloff/source/core/xmlehelp.cxx')
| -rw-r--r-- | xmloff/source/core/xmlehelp.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx index 5f7d2c4b5b..392d300e6b 100644 --- a/xmloff/source/core/xmlehelp.cxx +++ b/xmloff/source/core/xmlehelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlehelp.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dvo $ $Date: 2001-06-29 21:07:12 $ + * last change: $Author: rt $ $Date: 2004-07-13 08:06:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -536,19 +536,9 @@ MapUnit SvXMLExportHelper::GetUnitFromString(const ::rtl::OUString& rString, Map case sal_Unicode('i'): case sal_Unicode('I'): { - if(nPos+3 < nLen) - { - if(rString[nPos+1] == sal_Unicode('n') || rString[nPos+1] == sal_Unicode('N')) - { - if(rString[nPos+2] == sal_Unicode('c') || rString[nPos+2] == sal_Unicode('C')) - { - if(rString[nPos+3] == sal_Unicode('h') || rString[nPos+3] == sal_Unicode('H')) - { - eRetUnit = MAP_INCH; - } - } - } - } + if(nPos+1 < nLen && (rString[nPos+1] == sal_Unicode('n') + || rString[nPos+1] == sal_Unicode('n'))) + eRetUnit = MAP_INCH; break; } case sal_Unicode('m'): |