Author: orw
Date: Fri Mar 8 11:16:11 2013
New Revision: 1454323
URL: http://svn.apache.org/r1454323
Log:
#121420# - extend sfx2::sidebar::Theme by colors for highlight selection and
the text color in a highlighted selection
Modified:
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/Theme.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Theme.cxx
Modified: openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/Theme.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/Theme.hxx?rev=1454323&r1=1454322&r2=1454323&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/Theme.hxx (original)
+++ openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/Theme.hxx Fri Mar 8
11:16:11 2013
@@ -89,6 +89,8 @@ public:
Color_TabMenuSeparator,
Color_TabItemBorder,
Color_DropDownBorder,
+ Color_Highlight,
+ Color_HighlightText,
__Color_Paint,
Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/Theme.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/Theme.cxx?rev=1454323&r1=1454322&r2=1454323&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Theme.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Theme.cxx Fri Mar 8
11:16:11 2013
@@ -323,6 +323,13 @@ void Theme::UpdateTheme (void)
Any(sal_Int32(rStyle.GetActiveBorderColor().GetRGBColor())));
setPropertyValue(
+ maPropertyIdToNameMap[Color_Highlight],
+ Any(sal_Int32(rStyle.GetHighlightColor().GetRGBColor())));
+ setPropertyValue(
+ maPropertyIdToNameMap[Color_HighlightText],
+ Any(sal_Int32(rStyle.GetHighlightTextColor().GetRGBColor())));
+
+ setPropertyValue(
maPropertyIdToNameMap[Paint_TabItemBackgroundNormal],
Any());
setPropertyValue(
@@ -799,6 +806,8 @@ void Theme::SetupPropertyMaps (void)
AddEntry(Color_TabMenuSeparator);
AddEntry(Color_TabItemBorder);
AddEntry(Color_DropDownBorder);
+ AddEntry(Color_Highlight);
+ AddEntry(Color_HighlightText);
AddEntry(Paint_DeckBackground);
AddEntry(Paint_DeckTitleBarBackground);
@@ -866,6 +875,8 @@ Theme::PropertyType Theme::GetPropertyTy
case Color_TabMenuSeparator:
case Color_TabItemBorder:
case Color_DropDownBorder:
+ case Color_Highlight:
+ case Color_HighlightText:
return PT_Color;
case Paint_DeckBackground: