Get more color attributes for document colors in Writer

Change-Id: I2005b434f20a56417105c7b26ce09155a7023023

sw/source/core/doc/docfmt.cxx

@@ -1932,8 +1932,12 @@ std::vector<Color> SwDoc::GetDocColors()
         while( nWhich )
         {
             const SfxPoolItem *pItem;
-            if( SFX_ITEM_SET == pItemSet->GetItemState( nWhich, false, &pItem ) &&
-                RES_CHRATR_COLOR == pItem->Which() )
+            if( SFX_ITEM_SET == pItemSet->GetItemState( nWhich, false, &pItem ) )
+            {
+                sal_uInt16 aWhich = pItem->Which();
+                if( RES_CHRATR_COLOR        == aWhich ||
+                    RES_CHRATR_HIGHLIGHT    == aWhich ||
+                    RES_BACKGROUND          == aWhich )
                 {
                     Color aColor( ((SvxColorItem*)pItem)->GetValue() );
                     if( COL_AUTO != aColor.GetColor() &&
@@ -1942,6 +1946,7 @@ std::vector<Color> SwDoc::GetDocColors()
                         docColors.push_back( aColor );
                     }
                 }
+            }
 
             nWhich = aIter.NextWhich();
         }