diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-24 12:20:21 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:19:41 +0200 |
| commit | d1d5c9185f9d5231bdaa332d965b31b946411ac3 (patch) | |
| tree | a580193ccd8d412cc3d79b6a6e9bd67a9d31ffeb /svx | |
| parent | 65973c5eedc0da72fffca300239a149bd7fc1aa4 (diff) | |
Add SvxLineColorToolBoxControl functionality to SvxColorToolBoxControl
This is the first step in merging SvxLineColorToolBoxControl into
SvxColorToolBoxControl.
Change-Id: I6a725fef5f9a08524d509b70de15c7a0202e7ed6
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 7031229a2fda..5177544e91fb 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1010,8 +1010,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SfxPopupWindow( nSlotId, pParentWindow, "palette_popup_window", "svx/ui/colorwindow.ui", rFrame ), - maWindowSize( 250, 350 ), theSlotId( nSlotId ), + maWindowSize( 250, 350 ), maCommand( rCommand ), mrPaletteManager( rPaletteManager ) @@ -2205,6 +2205,11 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( case SID_EXTRUSION_3D_COLOR: addStatusListener( OUString( ".uno:Extrusion3DColor")); break; + + case SID_ATTR_LINE_COLOR: + addStatusListener( OUString( ".uno:XLineColor" )); + mPaletteManager.SetLastColor( COL_BLACK ); + break; } pBtnUpdater.reset( new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ) ); @@ -2248,6 +2253,10 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() case SID_EXTRUSION_3D_COLOR: pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ) ); break; + + case SID_ATTR_LINE_COLOR: + pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) ); + break; } pColorWin->StartPopupMode( &GetToolBox(), @@ -2319,6 +2328,11 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/) aCommand = ".uno:Extrusion3DColor"; aParamName = "Extrusion3DColor"; break; + + case SID_ATTR_LINE_COLOR: + aCommand = ".uno:XLineColor"; + aParamName = "XLineColor"; + break; } Sequence< PropertyValue > aArgs( 1 ); |