diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-05-23 19:49:08 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-06-07 11:47:17 +0200 |
commit | 46f61ee3997c4c6e1a1dca8b2986f31f0e4a6167 (patch) | |
tree | ad063fa37dead2ebf7ef0a066068f0e38e9fe1a9 | |
parent | 85f892a3a1dbaa3c36ac3f31186eef1ec0eea464 (diff) |
be case-insensitive for open/starsymbol comparison
Reviewed-on: https://gerrit.libreoffice.org/4015
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
Conflicts:
unotools/source/misc/fontcvt.cxx
unotools/source/misc/fontdefs.cxx
vcl/generic/glyphs/gcach_ftyp.cxx
Change-Id: I7a342c809a723f5f9c03271c6145d9c367cea6de
-rw-r--r-- | editeng/source/items/textitem.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/drawingml.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 4 | ||||
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index d5846a098afb..086065950d53 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -374,8 +374,8 @@ SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { sal_Bool bToBats = - GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) || - GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 ); + GetFamilyName().EqualsIgnoreCaseAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) || + GetFamilyName().EqualsIgnoreCaseAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 ); rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch() << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())); diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index d68ff6b91d28..082a1e7574aa 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1054,7 +1054,7 @@ void DrawingML::WriteParagraphNumbering( Reference< XPropertySet > rXPropSet, sa // instead of a Unicode encoding the encoding RTL_TEXTENCODING_SYMBOL was used. // Because there might exist a lot of damaged documemts I added this two lines // which fixes the bullet problem for the export. - if ( aFontDesc.Name == "StarSymbol" ) + if ( aFontDesc.Name.equalsIgnoreAsciiCase("StarSymbol") ) aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252; } else if ( aPropName == "BulletRelSize" ) { diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 04578a28ec23..83a22cbb8f06 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -798,7 +798,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 // instead of a Unicode encoding the encoding RTL_TEXTENCODING_SYMBOL was used. // Because there might exist a lot of damaged documemts I added this two lines // which fixes the bullet problem for the export. - if ( aFontDesc.Name == "StarSymbol" ) + if ( aFontDesc.Name.equalsIgnoreAsciiCase("StarSymbol") ) aFontDesc.CharSet = RTL_TEXTENCODING_MS_1252; } @@ -884,7 +884,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 case SVX_NUM_CHAR_SPECIAL : // Bullet { - if ( aFontDesc.Name.equals("starsymbol") || aFontDesc.Name.equals("opensymbol") ) + if ( aFontDesc.Name.equalsIgnoreAsciiCase("starsymbol") || aFontDesc.Name.equalsIgnoreAsciiCase("opensymbol") ) { rtl_TextEncoding eChrSet = aFontDesc.CharSet; cBulletId = msfilter::util::bestFitOpenSymbolToMSFont(cBulletId, eChrSet, aFontDesc.Name); diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 31aec5599511..ac2000d37a03 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -930,8 +930,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const //Always consider [star]symbol as symbol fonts if ( - (rTo.GetFamilyName().EqualsAscii("OpenSymbol")) || - (rTo.GetFamilyName().EqualsAscii("StarSymbol")) + (rTo.GetFamilyName().EqualsIgnoreCaseAscii("OpenSymbol")) || + (rTo.GetFamilyName().EqualsIgnoreCaseAscii("StarSymbol")) ) { rTo.mbSymbolFlag = true; |