From 584b415924bba22db23a4258062e54973de0ed7c Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Sun, 11 May 2014 02:21:23 +0300
Subject: Keep only one class for toolbox color controls

instead of 5 (mostly identical) classes.

Also the following bugs were fixed:

* All pickers now use split buttons. (fdo#45671)
* Color palette now indicates the current color. (fdo#73891)
  (Previous changes related to that bug are reverted as part
  of this commit.)
* Selecting a color from a float panel now updates the
  button. (fdo#77683)
* For Font color/background color in Writer, the color
  that is shown on the button, is always the one that's
  actually used. (Can be a different color after hiding
  the toolbar.)
* For Font color/background color in Writer, the button
  now indicates when we're in the format paintbrush mode.
  (Removed in 085e8a07e61ef2d3a82e11094d8773ab17cfdb3c
  for some reason.)

Change-Id: Idb4829552240c52fb0882aca627c8177bbe2f839
---
 sw/sdi/swriter.sdi | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'sw/sdi/swriter.sdi')

diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 9bde88a4149a..eb66d884ce34 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -772,8 +772,8 @@ SfxVoidItem ChapterNumberingDialog FN_NUMBERING_OUTLINE_DLG
     GroupId = GID_OPTIONS;
 ]
 
-SfxBoolItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
-
+SfxVoidItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
+(SvxColorItem BackColor SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)
 [
     /* flags: */
     AutoUpdate = TRUE,
@@ -782,13 +782,14 @@ SfxBoolItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
     HasCoreId = FALSE,
     HasDialog = FALSE,
     ReadOnlyDoc = FALSE,
-    Toggle = TRUE,
+    Toggle = FALSE,
     Container = FALSE,
     RecordAbsolute = FALSE,
     RecordPerSet;
     Synchron;
 
-    Readonly = FALSE,
+    /* status: */
+    SlotType = SfxBoolItem
 
     /* config: */
     AccelConfig = FALSE,
@@ -798,8 +799,8 @@ SfxBoolItem CharBackgroundExt SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
     GroupId = GID_FORMAT;
 ]
 
-SfxBoolItem CharColorExt SID_ATTR_CHAR_COLOR_EXT
-
+SfxVoidItem CharColorExt SID_ATTR_CHAR_COLOR_EXT
+(SvxColorItem FontColor SID_ATTR_CHAR_COLOR_EXT)
 [
     /* flags: */
     AutoUpdate = TRUE,
@@ -808,13 +809,14 @@ SfxBoolItem CharColorExt SID_ATTR_CHAR_COLOR_EXT
     HasCoreId = FALSE,
     HasDialog = FALSE,
     ReadOnlyDoc = FALSE,
-    Toggle = TRUE,
+    Toggle = FALSE,
     Container = FALSE,
     RecordAbsolute = FALSE,
     RecordPerSet;
     Synchron;
 
-    Readonly = FALSE,
+    /* status: */
+    SlotType = SfxBoolItem
 
     /* config: */
     AccelConfig = FALSE,
-- 
cgit