diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 09:05:57 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 11:15:16 +0000 |
commit | 17076d8ecf77f313b7a93912528f9cb0fd0d3ea8 (patch) | |
tree | cb77cae87f0a07e729deb9a66679a4cfec434768 /sw | |
parent | 70d5cd845d4fe218588155cf43bdf854e8fc54f3 (diff) |
convert OUTLINER_MODE to scoped enum
Change-Id: I7ac45d7fbd5e77a105cbe942c6d4fd6cfc8ff909
Reviewed-on: https://gerrit.libreoffice.org/24789
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/fields/textapi.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmldrawwriter.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/lingu/sdrhhcwrap.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index 4f3c8552d274..565eb8f9ef01 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -125,7 +125,7 @@ SvxTextForwarder* SwTextAPIEditSource::GetTextForwarder() { //init draw model first pImpl->mpDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel(); - pImpl->mpOutliner = new Outliner( pImpl->mpPool, OUTLINERMODE_TEXTOBJECT ); + pImpl->mpOutliner = new Outliner( pImpl->mpPool, OutlinerMode::TextObject ); pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); } @@ -143,7 +143,7 @@ void SwTextAPIEditSource::SetText( OutlinerParaObject& rText ) { //init draw model first pImpl->mpDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel(); - pImpl->mpOutliner = new Outliner( pImpl->mpPool, OUTLINERMODE_TEXTOBJECT ); + pImpl->mpOutliner = new Outliner( pImpl->mpPool, OutlinerMode::TextObject ); pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); } @@ -159,7 +159,7 @@ void SwTextAPIEditSource::SetString( const OUString& rText ) { //init draw model first pImpl->mpDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel(); - pImpl->mpOutliner = new Outliner( pImpl->mpPool, OUTLINERMODE_TEXTOBJECT ); + pImpl->mpOutliner = new Outliner( pImpl->mpPool, OutlinerMode::TextObject ); pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner ); } else diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index c9769f8a52e0..3685ea104558 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -293,7 +293,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, rWrt.Strm().WriteChar( '>' ); // Was jetzt kommt ist das Gegenstueck zu SdrTextObjectt::SetText() - Outliner aOutliner(nullptr, OUTLINERMODE_TEXTOBJECT); + Outliner aOutliner(nullptr, OutlinerMode::TextObject); aOutliner.SetUpdateMode( false ); aOutliner.SetText( *pOutlinerParaObj ); OUString aText( aOutliner.GetText( aOutliner.GetParagraph(0), diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 666b6c1501ac..022a59c7e6a5 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -963,7 +963,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP EditTextObject* pTemporaryText = m_pDrawEditEngine->CreateTextObject(); pRet = new OutlinerParaObject(*pTemporaryText); - pRet->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT ); + pRet->SetOutlinerMode( OutlinerMode::TextObject ); delete pTemporaryText; m_pDrawEditEngine->SetText( OUString() ); @@ -1172,7 +1172,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, bool bVertical = pTextObj->IsVerticalWriting(); EditTextObject* pTemporaryText = m_pDrawEditEngine->CreateTextObject(); OutlinerParaObject* pOp = new OutlinerParaObject(*pTemporaryText); - pOp->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT ); + pOp->SetOutlinerMode( OutlinerMode::TextObject ); pOp->SetVertical( bVertical ); delete pTemporaryText; pTextObj->NbcSetOutlinerParaObject( pOp ); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index d78167a6d169..38bfe02560ef 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -768,7 +768,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh) { SdrOutliner aTmpOutliner(pDoc->getIDocumentDrawModelAccess().GetDrawModel()-> GetDrawOutliner().GetEmptyItemSet().GetPool(), - OUTLINERMODE_TEXTOBJECT ); + OutlinerMode::TextObject ); aTmpOutliner.SetRefDevice( pDoc->getIDocumentDeviceAccess().getPrinter( false ) ); MapMode aMapMode (MAP_TWIP); aTmpOutliner.SetRefMapMode(aMapMode); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index acac39f59642..621277e0a475 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -598,7 +598,7 @@ void SwSidebarWin::InitControls() } SwDocShell* aShell = mrView.GetDocShell(); - mpOutliner = new Outliner(&aShell->GetPool(),OUTLINERMODE_TEXTOBJECT); + mpOutliner = new Outliner(&aShell->GetPool(),OutlinerMode::TextObject); aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner ); mpOutliner->SetUpdateMode( true ); Rescale(); diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index 5395ffe7656a..a5a7494ec37f 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -54,7 +54,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, bool bInteractive ) : SdrOutliner(pVw->GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()-> GetDrawOutliner().GetEmptyItemSet().GetPool(), - OUTLINERMODE_TEXTOBJECT ), + OutlinerMode::TextObject ), pView( pVw ), pTextObj( nullptr ), pOutlView( nullptr ), diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 9c1e436f0f6d..2ab98fea04b9 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -491,7 +491,7 @@ bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, { SwWrtShell *pSh = &GetWrtShell(); SdrView *pSdrView = pSh->GetDrawView(); - SdrOutliner* pOutliner = ::SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrView->GetModel()); + SdrOutliner* pOutliner = ::SdrMakeOutliner(OutlinerMode::TextObject, *pSdrView->GetModel()); uno::Reference< linguistic2::XSpellChecker1 > xSpell( ::GetSpellChecker() ); if (pOutliner) { |