summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrisztian Pinter <pin.terminator@gmail.com>2014-07-24 12:20:21 +0200
committerKrisztian Pinter <pin.terminator@gmail.com>2014-07-25 17:20:30 +0200
commit04cd9df2203acc1396354646539e7cd08169fbbc (patch)
tree64c25af014f22a175e79c1205b3f83440b7c7e15
parent0e2891031a3d628211193466097136296932c513 (diff)
Add SvxLineColorToolBoxControl functionality to SvxColorToolBoxControl
This is the first step in merging SvxLineColorToolBoxControl into SvxColorToolBoxControl. Change-Id: I6a725fef5f9a08524d509b70de15c7a0202e7ed6
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx16
1 files changed, 15 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 01a0ebbfd7d2..591c51a51aee 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1026,8 +1026,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
SfxPopupWindow( nSlotId, rFrame, pParentWindow,
"palette_popup_window", "svx/ui/colorwindow.ui",
WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
- maWindowSize( 250, 350 ),
theSlotId( nSlotId ),
+ maWindowSize( 250, 350 ),
maCommand( rCommand ),
mrPaletteManager( rPaletteManager )
@@ -2221,6 +2221,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() ) );
@@ -2264,6 +2269,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(),
@@ -2335,6 +2344,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 );