Kaydet (Commit) d1d5c918 authored tarafından Krisztian Pinter's avatar Krisztian Pinter Kaydeden (comit) Tomaž Vajngerl

Add SvxLineColorToolBoxControl functionality to SvxColorToolBoxControl

This is the first step in merging SvxLineColorToolBoxControl into
SvxColorToolBoxControl.

Change-Id: I6a725fef5f9a08524d509b70de15c7a0202e7ed6
üst 65973c5e
...@@ -1010,8 +1010,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, ...@@ -1010,8 +1010,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
SfxPopupWindow( nSlotId, pParentWindow, SfxPopupWindow( nSlotId, pParentWindow,
"palette_popup_window", "svx/ui/colorwindow.ui", "palette_popup_window", "svx/ui/colorwindow.ui",
rFrame ), rFrame ),
maWindowSize( 250, 350 ),
theSlotId( nSlotId ), theSlotId( nSlotId ),
maWindowSize( 250, 350 ),
maCommand( rCommand ), maCommand( rCommand ),
mrPaletteManager( rPaletteManager ) mrPaletteManager( rPaletteManager )
...@@ -2205,6 +2205,11 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( ...@@ -2205,6 +2205,11 @@ SvxColorToolBoxControl::SvxColorToolBoxControl(
case SID_EXTRUSION_3D_COLOR: case SID_EXTRUSION_3D_COLOR:
addStatusListener( OUString( ".uno:Extrusion3DColor")); addStatusListener( OUString( ".uno:Extrusion3DColor"));
break; break;
case SID_ATTR_LINE_COLOR:
addStatusListener( OUString( ".uno:XLineColor" ));
mPaletteManager.SetLastColor( COL_BLACK );
break;
} }
pBtnUpdater.reset( new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ) ); pBtnUpdater.reset( new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ) );
...@@ -2248,6 +2253,10 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() ...@@ -2248,6 +2253,10 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
case SID_EXTRUSION_3D_COLOR: case SID_EXTRUSION_3D_COLOR:
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ) ); pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ) );
break; break;
case SID_ATTR_LINE_COLOR:
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) );
break;
} }
pColorWin->StartPopupMode( &GetToolBox(), pColorWin->StartPopupMode( &GetToolBox(),
...@@ -2319,6 +2328,11 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/) ...@@ -2319,6 +2328,11 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
aCommand = ".uno:Extrusion3DColor"; aCommand = ".uno:Extrusion3DColor";
aParamName = "Extrusion3DColor"; aParamName = "Extrusion3DColor";
break; break;
case SID_ATTR_LINE_COLOR:
aCommand = ".uno:XLineColor";
aParamName = "XLineColor";
break;
} }
Sequence< PropertyValue > aArgs( 1 ); Sequence< PropertyValue > aArgs( 1 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment