Bugzilla – Attachment 54626 Details for
Bug 34425
[EasyHack] formatting background color toolbar button
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
modified code, still not complete
34425SoFar.diff (text/plain), 7.49 KB, created by
Winfried Donkers
on 2011-12-21 00:00:18 UTC
(
hide
)
Description:
modified code, still not complete
Filename:
MIME Type:
Creator:
Winfried Donkers
Created:
2011-12-21 00:00:18 UTC
Size:
7.49 KB
patch
obsolete
>diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx >index 9cf9555..0ce46eb 100644 >--- a/sc/source/ui/app/scdll.cxx >+++ b/sc/source/ui/app/scdll.cxx >@@ -203,8 +203,10 @@ void ScDLL::Init() > SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod); > SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); > // SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); >- SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); >- SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); >+//34425 Dnk start mod >+ SvxFontColorExtToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); >+ SvxFontColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); >+//34425 Dnk end mod > SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod); > SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod); > SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod); >diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc >index f66af83..a9f5fe4 100755 >--- a/svx/inc/svx/svxids.hrc >+++ b/svx/inc/svx/svxids.hrc >@@ -1134,7 +1134,7 @@ > #define SID_EXTRUSION_SURFACE ( SID_SVX_START + 975 ) > #define SID_EXTRUSION_DEPTH_DIALOG ( SID_SVX_START + 976 ) > #define SID_FONTWORK_GALLERY_FLOATER ( SID_SVX_START + 977 ) >-// free ( SID_SVX_START + 978 ) >+#define SID_BACKGROUND_COLOR_EXT ( SID_SVX_START + 978 ) //34425 Dnk, was free > #define SID_FONTWORK_SHAPE_TYPE ( SID_SVX_START + 979 ) > #define SID_FONTWORK_SAME_LETTER_HEIGHTS ( SID_SVX_START + 980 ) > #define SID_FONTWORK_ALIGNMENT_FLOATER ( SID_SVX_START + 981 ) >diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx >index ad465ef..6093e53 100644 >--- a/svx/inc/svx/tbcontrl.hxx >+++ b/svx/inc/svx/tbcontrl.hxx >@@ -316,6 +316,9 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl > // SfxStatusForwarder aForward; > ::svx::ToolboxButtonColorUpdater* pBtnUpdater; > Color mLastColor; >+//34425 Dnk, start mod >+ sal_Bool bChoiceFromPalette; >+//34425 Dnk, end mod > > public: > SFX_DECL_TOOLBOX_CONTROL(); >diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx >index b5c50a5..0f5a919 100644 >--- a/svx/source/tbxctrls/tbcontrl.cxx >+++ b/svx/source/tbxctrls/tbcontrl.cxx >@@ -2245,13 +2245,24 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl( > { > rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); > // The following commands are available at the writer module. >- if ( SID_ATTR_CHAR_COLOR2 == nSlotId ) >- addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharColorExt" ))); >- else >- addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" ))); >+//34425 Dnk start mod >+ bChoiceFromPalette = sal_False; > >- sal_uInt16 nMode = SID_ATTR_CHAR_COLOR2 == nSlotId >- ? TBX_UPDATER_MODE_CHAR_COLOR_NEW : TBX_UPDATER_MODE_CHAR_COLOR_NEW; >+ switch ( nSlotId ) >+ { >+ case SID_ATTR_CHAR_COLOR2 : >+ case SID_ATTR_CHAR_COLOR : >+ addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharColorExt" ))); >+ break; >+ case SID_ATTR_CHAR_COLOR_BACKGROUND : >+ case SID_BACKGROUND_COLOR : >+ addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" ))); >+ break; >+ } >+//34425 Dnk end mod >+ >+//34425 Dnk removed useless code in next line >+ sal_uInt16 nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW; > pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode ); > } > >@@ -2281,7 +2292,6 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow() > SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), > &GetToolBox(), > mLastColor ); >- > if ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND ) > pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ) ); > >@@ -2289,6 +2299,9 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow() > FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF ); > pColorWin->StartSelection(); > SetPopupWindow( pColorWin ); >+//34425 Dnk start mod >+ bChoiceFromPalette = sal_True; >+//34425 Dnk, end mod > return pColorWin; > } > >@@ -2302,28 +2315,34 @@ void SvxFontColorExtToolBoxControl::StateChanged( > sal_uInt16 nId = GetId(); > ToolBox& rTbx = GetToolBox(); > const SvxColorItem* pItem = 0; >- >- if ( nSID == SID_ATTR_CHAR_COLOR_EXT || >- nSID == SID_ATTR_CHAR_COLOR_BACKGROUND_EXT ) >- { >- if ( SFX_ITEM_DONTCARE != eState ) >- { >- const SfxBoolItem* pBool = PTR_CAST( SfxBoolItem, pState ); >- rTbx.CheckItem( nId, pBool && pBool->GetValue()); >- } >- rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); >- } >- else >- { >- if ( SFX_ITEM_DONTCARE != eState ) >- pItem = PTR_CAST( SvxColorItem, pState ); >- >- if ( pItem ) >- { >- pBtnUpdater->Update( pItem->GetValue() ); >- mLastColor = pItem->GetValue(); >- } >+//34425 Dnk start mod >+ if ( bChoiceFromPalette ) >+ { >+ bChoiceFromPalette = sal_False; >+ if ( nSID == SID_ATTR_CHAR_COLOR_EXT || >+ nSID == SID_ATTR_CHAR_COLOR_BACKGROUND_EXT || >+ nSID == SID_BACKGROUND_COLOR_EXT ) >+ { >+ if ( SFX_ITEM_DONTCARE != eState ) >+ { >+ const SfxBoolItem* pBool = PTR_CAST( SfxBoolItem, pState ); >+ rTbx.CheckItem( nId, pBool && pBool->GetValue()); >+ } >+ rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); >+ } >+ else >+ { >+ if ( SFX_ITEM_DONTCARE != eState ) >+ pItem = PTR_CAST( SvxColorItem, pState ); >+ >+ if ( pItem ) >+ { >+ pBtnUpdater->Update( pItem->GetValue() ); >+ mLastColor = pItem->GetValue(); >+ } >+ } > } >+//34425 Dnk, end mod > } > > // ----------------------------------------------------------------------- >@@ -2332,16 +2351,23 @@ void SvxFontColorExtToolBoxControl::Select( sal_Bool ) > { > OUString aCommand; > OUString aParamName; >- if ( SID_ATTR_CHAR_COLOR2 == GetSlotId() ) >- { >- aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharColorExt" )); >- aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColorExt" )); >- } >- else >+//34425 Dnk, mod >+ switch ( GetSlotId() ) > { >- aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )); >- aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharBackgroundExt" )); >+ case SID_ATTR_CHAR_COLOR2 : >+ case SID_ATTR_CHAR_COLOR : >+ aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharColorExt" )); >+ aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColorExt" )); >+ break; >+ >+ case SID_BACKGROUND_COLOR_EXT : >+ case SID_BACKGROUND_COLOR : //34425 Dnk test for left part of button... >+ case SID_ATTR_CHAR_COLOR_BACKGROUND_EXT : >+ aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )); >+ aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharBackgroundExt" )); >+ break; > } >+//34425 Dnk, end mod > > Sequence< PropertyValue > aArgs( 1 ); > aArgs[0].Name = aParamName;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 34425
:
43505
|
54485
|
54626
|
54840