[Libreoffice-commits] core.git: sw/source

[Joren De Cuyper]

 sw/source/filter/html/htmlforw.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3b2f10b4ee53f1a6a1f5c9d18a0437b46187f50e
Author: Joren De Cuyper <jorendc at libreoffice.org>
Date:   Tue Jul 29 17:05:26 2014 +0200

    FontName -> FontFamily error
    
    Introduced in c67d6b2a57f6e95395515fe695709590af109397
    Thanks to Matteo Casalin.
    
    Change-Id: Ibaa7956eb44cfe62bbaf73ff5656dc21a5793c6a
    Reviewed-on: https://gerrit.libreoffice.org/10612
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index f34e351..f478cf7 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -1093,9 +1093,9 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
                 if( !bEdit || aFName != aFixedFont.GetName() )
                 {
                     FontFamily eFamily = FAMILY_DONTKNOW;
-                    if( xPropSetInfo->hasPropertyByName( "FontName" ) )
+                    if( xPropSetInfo->hasPropertyByName( "FontFamily" ) )
                     {
-                        aTmp = xPropSet->getPropertyValue( "FontName" );
+                        aTmp = xPropSet->getPropertyValue( "FontFamily" );
                         if( aTmp.getValueType() == ::cppu::UnoType<sal_Int16>::get())
                             eFamily = (FontFamily)*(sal_Int16*) aTmp.getValue();
                     }