[Libreoffice-commits] core.git: svx/source svx/uiconfig
Maxim Monastirsky
momonasmon at gmail.com
Fri Feb 14 15:54:36 CET 2014
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 5 ---
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 30 +++++++++------------
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2 -
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 8 -----
svx/uiconfig/ui/sidebarparagraph.ui | 5 ---
5 files changed, 16 insertions(+), 34 deletions(-)
New commits:
commit 4eb7f3911921817a8f8d56a2bafb54d1fd12afcd
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Fri Feb 14 10:15:14 2014 +0200
fdo#68537 Correct icon and tooltip for background color
Just to close this bug, more changes are expected.
Change-Id: I1017481211a5a1b9219f02fed3af31be0399e27a
Reviewed-on: https://gerrit.libreoffice.org/8046
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index f307c20..ca18b1f 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -58,7 +58,7 @@ const char UNO_JUSTIFYPARA[] = ".uno:JustifyPara";
const char UNO_DEFAULTBULLET[] = ".uno:DefaultBullet";
const char UNO_DEFAULTNUMBERING[] = ".uno:DefaultNumbering";
-const char UNO_PARABACKCOLOR[] = ".uno:ParaBackColor";
+const char UNO_PARABACKCOLOR[] = ".uno:BackgroundColor";
const char UNO_INCREMENTINDENT[] = ".uno:IncrementIndent";
const char UNO_DECREMENTINDENT[] = ".uno:DecrementIndent";
@@ -345,7 +345,6 @@ void ParaPropertyPanel::InitToolBoxBGColor()
{
const sal_uInt16 nIdBackColor = mpTBxBackColor->GetItemId(UNO_PARABACKCOLOR);
- mpTBxBackColor->SetItemImage(nIdBackColor, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor);
mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(0 /* not defined, default is transparent */, nIdBackColor, mpTBxBackColor));
mpTBxBackColor->SetItemBits( nIdBackColor, mpTBxBackColor->GetItemBits( nIdBackColor ) | TIB_DROPDOWNONLY );
@@ -1439,8 +1438,6 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
maIndHang (SVX_RES(IMG_INDENT_HANG)),
maNumBImageList (SVX_RES(IL_NUM_BULLET)),
maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)),
- maImgBackColorHigh (SVX_RES(IMG_BACK_COLOR_H)),
- maImgBackColor (SVX_RES(IMG_BACK_COLOR)),
maTxtLeft (0),
mpLnSPItem (NULL),
meLnSpState (SFX_ITEM_DONTCARE),
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index ab03971..24866bd 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -18,22 +18,20 @@
#include "svx/dialogs.hrc"
-#define IMG_BACK_COLOR (RID_SVX_SIDEBAR_BEGIN + 0)
-#define IMG_BACK_COLOR_H (RID_SVX_SIDEBAR_BEGIN + 1)
-#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 2)
-#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 3)
-#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 4)
-#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 5)
-#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 6)
-#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 7)
-#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 8)
-#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 9)
-#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 10)
-#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 11)
-#define IMG_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 12)
-#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 13)
-#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 14)
-#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 15)
+#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0)
+#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1)
+#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 2)
+#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 3)
+#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 4)
+#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 5)
+#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 6)
+#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 7)
+#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 8)
+#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 9)
+#define IMG_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 10)
+#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 11)
+#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 12)
+#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 13)
//for numbering and bullet
#define IID_BULLET 1
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index c30d7fe..0109d56 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -123,8 +123,6 @@ private:
ImageList maNumBImageList;
ImageList maNumBImageListRTL;
- Image maImgBackColorHigh;
- Image maImgBackColor;
/****************************************************************
**
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index b3fd4b5..91ecf45 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -47,14 +47,6 @@
}; \
IdCount = { 2 ; };
-Image IMG_BACK_COLOR
-{
- ImageBitmap = Bitmap{File = "symphony/sc_backgroundcolor.png";};
-};
-Image IMG_BACK_COLOR_H
-{
- ImageBitmap = Bitmap{File = "symphony/sch_backgroundcolor.png";};
-};
Image IMG_SPACE3
{
ImageBitmap = Bitmap{File = "symphony/spacing3.png";};
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 9be67f3..2808548 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -80,10 +80,7 @@
<property name="width_request">105</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Paragraph Background Color</property>
- <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
- <property name="action_name">.uno:ParaBackColor</property>
+ <property name="action_name">.uno:BackgroundColor</property>
<property name="use_underline">True</property>
</object>
<packing>
More information about the Libreoffice-commits
mailing list