summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-16 12:48:45 +0200
committerNoel Grandin <noel@peralex.com>2016-08-17 08:45:15 +0200
commit49561be0fd2041fc9d32c4ac1ab1063f620a4e08 (patch)
tree4345072ee14a3451e1b9b1bd0e646c146844665e /sw/source/uibase
parent42ab2cfbd92bc30a62a2c126d4ad6d5726846d8b (diff)
convert SvxTabAdjust to scoped enum
Change-Id: I29a33b8ea5daaa4b9059d024ffa4a99ca924f7ef
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/appopt.cxx2
-rw-r--r--sw/source/uibase/app/docshini.cxx2
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx6
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index f1c01ee726a8..3740c55caf76 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -335,7 +335,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
pPref->SetDefTab(nTabDist);
if(pAppView)
{
- SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
+ SvxTabStopItem aDefTabs( 0, 0, SvxTabAdjust::Default, RES_PARATR_TABSTOP );
MakeDefTabs( nTabDist, aDefTabs );
pAppView->GetWrtShell().SetDefault( aDefTabs );
}
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 7d8bf172e332..5cb5c5c88dba 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -689,7 +689,7 @@ void SwDocShell::SubInitNew()
sal_uInt16 nNewPos = static_cast< sal_uInt16 >(SW_MOD()->GetUsrPref(false)->GetDefTab());
if( nNewPos )
aDfltSet.Put( SvxTabStopItem( 1, nNewPos,
- SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP ) );
+ SvxTabAdjust::Default, RES_PARATR_TABSTOP ) );
}
aDfltSet.Put( SvxColorItem( Color( COL_AUTO ), RES_CHRATR_COLOR ) );
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index a3df2571aa29..764c76eb5a12 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1029,7 +1029,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if( SfxItemState::SET == pSet->GetItemState( SID_ATTR_TABSTOP_DEFAULTS, false, &pItem ) &&
nDefDist != (nNewDist = static_cast<const SfxUInt16Item*>(pItem)->GetValue()) )
{
- SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
+ SvxTabStopItem aDefTabs( 0, 0, SvxTabAdjust::Default, RES_PARATR_TABSTOP );
MakeDefTabs( nNewDist, aDefTabs );
rWrtSh.SetDefault( aDefTabs );
pSet->ClearItem( SID_ATTR_TABSTOP_DEFAULTS );
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 80f943bd222b..060bf5a7b3b5 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -984,7 +984,7 @@ void SwView::Execute(SfxRequest &rReq)
{
if(pArgs && SfxItemState::SET == pArgs->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
{
- SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
+ SvxTabStopItem aDefTabs( 0, 0, SvxTabAdjust::Default, RES_PARATR_TABSTOP );
const sal_uInt16 nTab = static_cast<const SfxUInt16Item*>(pItem)->GetValue();
MakeDefTabs( nTab, aDefTabs );
m_pWrtShell->SetDefault( aDefTabs );
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 9eafba95cd2b..a030f90b496e 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -152,7 +152,7 @@ static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
for ( sal_uInt16 i = 0; i < rTabStops.Count(); )
{
// Here also throw out the DefTab to zero
- if ( SVX_TAB_ADJUST_DEFAULT == rTabStops[i].GetAdjustment() ||
+ if ( SvxTabAdjust::Default == rTabStops[i].GetAdjustment() ||
rTabStops[i].GetTabPos() == 0 )
{
rTabStops.Remove(i);
@@ -635,7 +635,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
if ( rLR.GetTextFirstLineOfst() < 0 )
{
- SvxTabStop aSwTabStop( 0, SVX_TAB_ADJUST_DEFAULT );
+ SvxTabStop aSwTabStop( 0, SvxTabAdjust::Default );
aTabStops.Insert( aSwTabStop );
}
@@ -714,7 +714,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
::lcl_EraseDefTabs(aTabStops);
- SvxTabStop aSwTabStop( 0, SVX_TAB_ADJUST_DEFAULT );
+ SvxTabStop aSwTabStop( 0, SvxTabAdjust::Default );
aTabStops.Insert(aSwTabStop);
const SvxTabStopItem& rDefTabs =
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index f566769fe678..c04bd7bfd7b6 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -580,7 +580,7 @@ void MakeDefTabs(SwTwips nDefDist, SvxTabStopItem& rTabs)
if( rTabs.Count() )
return;
{
- SvxTabStop aSwTabStop( nDefDist, SVX_TAB_ADJUST_DEFAULT );
+ SvxTabStop aSwTabStop( nDefDist, SvxTabAdjust::Default );
rTabs.Insert( aSwTabStop );
}
}