[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-text-background-color' - editeng/source

[matteocam]

 editeng/source/editeng/editdoc.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a7f27d468dd92a2ffbe114a5bdedf423f657f1ad
Author: matteocam <matteo.campane...@gmail.com>
Date:   Tue Jun 3 15:18:30 2014 -0400

    CreateFont supports Background Color
    
    Change-Id: I3413c77db8e822aeb957909a661d175320555f6d

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 8750f2d..472e400 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1927,6 +1927,8 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, 
bool bSearchInParent, s
         rFont.SetLanguage( ((const SvxLanguageItem&)rSet.Get( nWhich_Language 
)).GetLanguage() );
     if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_COLOR ) == 
SFX_ITEM_ON ) )
         rFont.SetColor( ((const SvxColorItem&)rSet.Get( EE_CHAR_COLOR 
)).GetValue() );
+    if ( bSearchInParent || ( rSet.GetItemState( EE_CHAR_BKGCOLOR ) == 
SFX_ITEM_ON ) )
+        rFont.SetColor( ((const SvxBackgroundColorItem&)rSet.Get( 
EE_CHAR_BKGCOLOR )).GetValue() );
     if ( bSearchInParent || ( rSet.GetItemState( nWhich_FontHeight ) == 
SFX_ITEM_ON ) )
         rFont.SetSize( Size( rFont.GetSize().Width(), ((const 
SvxFontHeightItem&)rSet.Get( nWhich_FontHeight ) ).GetHeight() ) );
     if ( bSearchInParent || ( rSet.GetItemState( nWhich_Weight ) == 
SFX_ITEM_ON ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits