diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:38:04 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-16 11:49:23 +0000 |
| commit | fe97bc5be1c8e9db176d55ae4347b0ffcef2a1c8 (patch) | |
| tree | c78f9df97ce3c7fd380a6822aabbfc2769696f4e | |
| parent | Version 3.5.0.1, tag libreoffice-3.5.0.1 (3.5.0-rc1) (diff) | |
| download | binfilter-fe97bc5be1c8e9db176d55ae4347b0ffcef2a1c8.tar.gz binfilter-fe97bc5be1c8e9db176d55ae4347b0ffcef2a1c8.zip | |
Fix some apparent misuses of RTL_CONSTASCII_USTRINGPARAM
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx index fd8bc4964..6a78e9a38 100644 --- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx +++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx @@ -1190,21 +1190,21 @@ void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc ) { s = s.toAsciiUpperCase(); using comphelper::string::matchL; - if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("BOLD"))) Bold=sal_True; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ITAL"))) Ital=sal_True; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SERF"))) Serf=sal_True; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SANS"))) Sans=sal_True; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("FIXD"))) Fixd=sal_True; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ROMAN"))) SVFamil=FAMILY_ROMAN; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SWISS"))) SVFamil=FAMILY_SWISS; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MODERN"))) SVFamil=FAMILY_MODERN; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SCRIPT"))) SVFamil=FAMILY_SCRIPT; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("DECORA"))) SVFamil=FAMILY_DECORATIVE; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ANSI"))) SVChSet=RTL_TEXTENCODING_MS_1252; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("IBMPC"))) SVChSet=RTL_TEXTENCODING_IBM_850; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL; - else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = osl_getThreadTextEncoding(); + if (matchL(s, RTL_CONSTASCII_STRINGPARAM("BOLD"))) Bold=sal_True; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("ITAL"))) Ital=sal_True; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("SERF"))) Serf=sal_True; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("SANS"))) Sans=sal_True; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("FIXD"))) Fixd=sal_True; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("ROMAN"))) SVFamil=FAMILY_ROMAN; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("SWISS"))) SVFamil=FAMILY_SWISS; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("MODERN"))) SVFamil=FAMILY_MODERN; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("SCRIPT"))) SVFamil=FAMILY_SCRIPT; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("DECORA"))) SVFamil=FAMILY_DECORATIVE; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("ANSI"))) SVChSet=RTL_TEXTENCODING_MS_1252; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("IBMPC"))) SVChSet=RTL_TEXTENCODING_IBM_850; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL; + else if (matchL(s, RTL_CONSTASCII_STRINGPARAM("SYSTEM"))) SVChSet = osl_getThreadTextEncoding(); else if (comphelper::string::isdigitAsciiString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32()); } } |