From 1e6ff8f7f8b5322bed7a1b4483f2f483b00212ba Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 18 Jul 2014 18:07:36 +0200 Subject: XFillStyle -> css::drawing::FillStyle Change-Id: I6b2fabd72fd34f4ac1b3a18f386c90794bc39ce4 --- svx/source/tbxctrls/colrctrl.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'svx/source/tbxctrls/colrctrl.cxx') diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 56ac8a6f2bfd..9792a562bde0 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -36,6 +36,7 @@ #include "svx/xexch.hxx" #include +using namespace com::sun::star; // - SvxColorValueSetData - @@ -197,7 +198,7 @@ void SvxColorValueSet_docking::DoDrag() SfxItemSet& rSet = aXFillSetItem.GetItemSet(); rSet.Put( XFillColorItem( GetItemText( nItemId ), GetItemColor( nItemId ) ) ); - rSet.Put(XFillStyleItem( ( 1 == nItemId ) ? XFILL_NONE : XFILL_SOLID ) ); + rSet.Put(XFillStyleItem( ( 1 == nItemId ) ? drawing::FillStyle_NONE : drawing::FillStyle_SOLID ) ); EndSelection(); ( new SvxColorValueSetData( aXFillSetItem ) )->StartDrag( this, DND_ACTION_COPY ); @@ -425,7 +426,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) { if ( nPos == 1 ) // unsichtbar { - XFillStyleItem aXFillStyleItem( XFILL_NONE ); + XFillStyleItem aXFillStyleItem( drawing::FillStyle_NONE ); pDispatcher->Execute( nLeftSlot, SFX_CALLMODE_RECORD, &aXFillStyleItem, 0L ); } else @@ -448,7 +449,7 @@ IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl) } if ( !bDone ) { - XFillStyleItem aXFillStyleItem( XFILL_SOLID ); + XFillStyleItem aXFillStyleItem( drawing::FillStyle_SOLID ); XFillColorItem aXFillColorItem( aStr, aColor ); pDispatcher->Execute( nLeftSlot, SFX_CALLMODE_RECORD, &aXFillColorItem, &aXFillStyleItem, 0L ); -- cgit