Skip to content

C
core
Kaydet (Commit) 4ef268d2 authored tarafından Krisztian Pinter's avatar Krisztian Pinter Kaydeden (comit) Tomaž Vajngerl
Dosyalara gözat
Seçenekler

Get more color attributes for document colors in Writer 

Change-Id: I2005b434f20a56417105c7b26ce09155a7023023
üst 9dbc4cc7
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
sw/source/core/doc/docfmt.cxx
Dosyayı görüntüle @ 4ef268d2
...@@ -1932,8 +1932,12 @@ std::vector<Color> SwDoc::GetDocColors() ...@@ -1932,8 +1932,12 @@ std::vector<Color> SwDoc::GetDocColors()
while( nWhich ) while( nWhich )
{ {
const SfxPoolItem *pItem; const SfxPoolItem *pItem;
if( SFX_ITEM_SET == pItemSet->GetItemState( nWhich, false, &pItem ) && if( SFX_ITEM_SET == pItemSet->GetItemState( nWhich, false, &pItem ) )
RES_CHRATR_COLOR == pItem->Which() ) {
sal_uInt16 aWhich = pItem->Which();
if( RES_CHRATR_COLOR == aWhich ||
RES_CHRATR_HIGHLIGHT == aWhich ||
RES_BACKGROUND == aWhich )
{ {
Color aColor( ((SvxColorItem*)pItem)->GetValue() ); Color aColor( ((SvxColorItem*)pItem)->GetValue() );
if( COL_AUTO != aColor.GetColor() && if( COL_AUTO != aColor.GetColor() &&
...@@ -1942,6 +1946,7 @@ std::vector<Color> SwDoc::GetDocColors() ...@@ -1942,6 +1946,7 @@ std::vector<Color> SwDoc::GetDocColors()
docColors.push_back( aColor ); docColors.push_back( aColor );
} }
} }
}
nWhich = aIter.NextWhich(); nWhich = aIter.NextWhich();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment