Author: zhengfan
Date: Sun Apr 7 06:09:34 2013
New Revision: 1465324
URL: http://svn.apache.org/r1465324
Log:
i122011: Fix the issue that text hightlight color update icon not work in Text
Properties Panel, also include the fixes of i122012 and i122013. by ZhengFan.
Modified:
openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi
Modified: openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc?rev=1465324&r1=1465323&r2=1465324&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Sun Apr 7
06:09:34 2013
@@ -400,7 +400,7 @@
#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 303)
#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 304)
#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 305)
-#define RID_SVXSTR_NUMBULLET_NONE
(RID_SVX_START + 306)
+#define RID_SVXSTR_NUMBULLET_NONE
(RID_SVX_START + 361)
#define RID_SVXSTR_NUMBULLET_CURRENT_LIST_DESCRIPTION (RID_SVX_START +
307)
#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START +
308)
#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START +
309)
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx?rev=1465324&r1=1465323&r2=1465324&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Sun Apr 7 06:09:34 2013
@@ -752,10 +752,10 @@ void ParaPropertyPanel::ShowMenu (void)
void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 nSID, SfxItemState
eState, const SfxPoolItem* pState)
{
- if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxBrushItem))
+ if( eState >= SFX_ITEM_DEFAULT && pState->ISA(SvxColorItem))
{
- const SvxBrushItem* pItem = (const SvxBrushItem*)pState;
- maColor = pItem->GetColor();
+ const SvxColorItem* pItem = (const SvxColorItem*)pState;
+ maColor = pItem->GetValue();
mbColorAvailable = sal_True;
mpColorUpdater->Update(maColor);
}
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src?rev=1465324&r1=1465323&r2=1465324&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
Sun Apr 7 06:09:34 2013
@@ -855,6 +855,10 @@ Control RID_POPUPPANEL_PARAPAGE_LINESPAC
};
+String RID_SVXSTR_NUMBULLET_NONE
+{
+ Text [en-US] = "None";
+};
String RID_SVXSTR_GRAPHICS_DESCRIPTION_0
{
Modified: openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi?rev=1465324&r1=1465323&r2=1465324&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_textsh.sdi Sun Apr 7 06:09:34 2013
@@ -59,6 +59,7 @@ interface BaseText
SID_ATTR_BRUSH_CHAR // status()
[
ExecMethod = Execute ;
+ StateMethod = GetTxtCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
