[Libreoffice-commits] .: sw/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Jul 5 13:11:41 PDT 2012


 sw/source/ui/config/uinums.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a7a891d591f6977c04136a0b4ccde0b87a89237f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 4 21:28:38 2012 +0100

    sal_uInt16 matches UniString sal_Unicode ctor, not FontFamily enum
    
    i.e. totally the wrong thing entire
    
    Change-Id: I24c6f7ca625affe808f865b8962cb690ce1c8755

diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 763327e..d3a736e 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -387,7 +387,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
 
         if( aName.Len() )
         {
-            Font aFont( nFamily, Size( nWidth, nHeight ) );
+            Font aFont( static_cast<FontFamily>(nFamily), Size( nWidth, nHeight ) );
             aFont.SetName( aName );
             aFont.SetCharSet( (CharSet)nCharSet );
             aFont.SetPitch( (FontPitch)nPitch );


More information about the Libreoffice-commits mailing list