From 09b1c24dc971323e4b9bb4bd80517e1480cc7069 Mon Sep 17 00:00:00 2001 From: Radu Ioan Date: Sat, 29 Nov 2014 12:50:37 +0200 Subject: fdo#85486 - Clean up unnecessary enumerations from xenum.hxx Removed XDashStyle Change-Id: Id14802a007a90508ee033e1dc964c57d3d5ef582 Reviewed-on: https://gerrit.libreoffice.org/13213 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- cui/source/tabpages/tpline.cxx | 2 +- cui/source/tabpages/tplnedef.cxx | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'cui') diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 5bf102892349..7d1fd99e9ef3 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -102,7 +102,7 @@ SvxLineTabPage::SvxLineTabPage pXPool ( static_cast(rInAttrs.GetPool()) ), aXLStyle ( drawing::LineStyle_DASH ), aXWidth ( 1 ), - aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ), + aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ), aXColor ( OUString(), COL_LIGHTRED ), aXLineAttr ( pXPool ), rXLSet ( aXLineAttr.GetItemSet() ), diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index c31c8116b55e..3b45fd902e22 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -65,7 +65,7 @@ SvxLineDefTabPage::SvxLineDefTabPage pXPool ( static_cast(rInAttrs.GetPool()) ), aXLStyle ( drawing::LineStyle_DASH ), aXWidth ( XOUT_WIDTH ), - aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ), + aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ), aXColor ( OUString(), COL_BLACK ), aXLineAttr ( pXPool ), rXLSet ( aXLineAttr.GetItemSet() ), @@ -209,7 +209,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxLineDefTabPage::CheckChanges_Impl() { // is here used to NOT lose changes - //XDashStyle eXDS; + //css::drawing::DashStyle eXDS; if( m_pNumFldNumber1->IsValueChangedFromSaved() || m_pMtrLength1->IsValueChangedFromSaved() || @@ -844,12 +844,12 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) void SvxLineDefTabPage::FillDash_Impl() { - XDashStyle eXDS; + css::drawing::DashStyle eXDS; if( m_pCbxSynchronize->IsChecked() ) - eXDS = XDASH_RECTRELATIVE; + eXDS = css::drawing::DashStyle_RECTRELATIVE; else - eXDS = XDASH_RECT; + eXDS = css::drawing::DashStyle_RECT; aDash.SetDashStyle( eXDS ); aDash.SetDots( (sal_uInt8) m_pNumFldNumber1->GetValue() ); @@ -868,8 +868,8 @@ void SvxLineDefTabPage::FillDash_Impl() void SvxLineDefTabPage::FillDialog_Impl() { - XDashStyle eXDS = aDash.GetDashStyle(); // XDASH_RECT, XDASH_ROUND - if( eXDS == XDASH_RECTRELATIVE ) + css::drawing::DashStyle eXDS = aDash.GetDashStyle(); // css::drawing::DashStyle_RECT, css::drawing::DashStyle_ROUND + if( eXDS == css::drawing::DashStyle_RECTRELATIVE ) m_pCbxSynchronize->Check(); else m_pCbxSynchronize->Check( false ); -- cgit