diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-17 13:26:25 +1100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:25:56 -0400 |
| commit | 49329d19eff5b5beffdeaa54242c9534f5b470c4 (patch) | |
| tree | 85517ead7d4e926c17f9e52cda01475c3c93eaeb /accessibility | |
| parent | 745d356d6b5b6b9308f35e89713288f17dd32503 (diff) | |
vcl: rename Font::GetName to Font::GetFamilyName
Reviewed-on: https://gerrit.libreoffice.org/21529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e)
Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/extended/textwindowaccessibility.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/helper/characterattributeshelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index fbf2cd7d0f29..947396a060f3 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1015,7 +1015,7 @@ Document::retrieveCharacterAttributes( //character font name aAttribs[i].Name = "CharFontName"; aAttribs[i].Handle = -1; - aAttribs[i].Value = css::uno::makeAny( aFont.GetName() ); + aAttribs[i].Value = css::uno::makeAny( aFont.GetFamilyName() ); aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE; i++; diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx index cf8cf794c2d5..3c63bc6ae543 100644 --- a/accessibility/source/helper/characterattributeshelper.cxx +++ b/accessibility/source/helper/characterattributeshelper.cxx @@ -30,7 +30,7 @@ CharacterAttributesHelper::CharacterAttributesHelper( const vcl::Font& rFont, sa m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharColor" ), makeAny( (sal_Int32) nColor ) ) ); m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontCharSet" ), makeAny( (sal_Int16) rFont.GetCharSet() ) ) ); m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontFamily" ), makeAny( (sal_Int16) rFont.GetFamily() ) ) ); - m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontName" ), makeAny( rFont.GetName() ) ) ); + m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontName" ), makeAny( rFont.GetFamilyName() ) ) ); m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontPitch" ), makeAny( (sal_Int16) rFont.GetPitch() ) ) ); m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharFontStyleName" ), makeAny( rFont.GetStyleName() ) ) ); m_aAttributeMap.insert( AttributeMap::value_type( OUString( "CharHeight" ), makeAny( (sal_Int16) rFont.GetSize().Height() ) ) ); |