summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/drawdoc.cxx42
-rw-r--r--sd/source/filter/ppt/pptin.cxx6
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx4
-rw-r--r--sd/source/ui/app/sdmod2.cxx10
-rw-r--r--sd/source/ui/docshell/docshel4.cxx6
-rw-r--r--sd/source/ui/presenter/PresenterTextView.cxx7
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx4
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx10
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx8
-rw-r--r--sd/source/ui/view/Outliner.cxx12
-rw-r--r--sd/source/ui/view/drviewse.cxx6
-rw-r--r--sd/source/ui/view/outlnvs2.cxx8
-rw-r--r--sd/source/ui/view/outlnvsh.cxx14
-rw-r--r--sd/source/ui/view/outlview.cxx4
-rw-r--r--sd/source/ui/view/sdview.cxx18
15 files changed, 79 insertions, 80 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 51a29afd5393..0cf966ee201d 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -279,22 +279,22 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
SetLinkManager( new sfx2::LinkManager(mpDocSh) );
}
- sal_uLong nCntrl = rOutliner.GetControlWord();
- nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
+ EEControlBits nCntrl = rOutliner.GetControlWord();
+ nCntrl |= EEControlBits::ALLOWBIGOBJS;
if (mbOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
- nCntrl &= ~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl &= ~ EEControlBits::ULSPACESUMMATION;
if ( meDocType != DOCUMENT_TYPE_IMPRESS )
SetSummationOfParagraphs( false );
else
{
SetSummationOfParagraphs( pOptions->IsSummationOfParagraphs() );
if ( pOptions->IsSummationOfParagraphs() )
- nCntrl |= EE_CNTRL_ULSPACESUMMATION;
+ nCntrl |= EEControlBits::ULSPACESUMMATION;
}
rOutliner.SetControlWord(nCntrl);
@@ -326,13 +326,13 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() );
- sal_uLong nCntrl2 = pHitTestOutliner->GetControlWord();
- nCntrl2 |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl2 &= ~EE_CNTRL_ONLINESPELLING;
+ EEControlBits nCntrl2 = pHitTestOutliner->GetControlWord();
+ nCntrl2 |= EEControlBits::ALLOWBIGOBJS;
+ nCntrl2 &= ~EEControlBits::ONLINESPELLING;
- nCntrl2 &= ~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl2 &= ~ EEControlBits::ULSPACESUMMATION;
if ( pOptions->IsSummationOfParagraphs() )
- nCntrl2 |= EE_CNTRL_ULSPACESUMMATION;
+ nCntrl2 |= EEControlBits::ULSPACESUMMATION;
pHitTestOutliner->SetControlWord( nCntrl2 );
@@ -613,11 +613,11 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
// StyleRequestHandler are.
::Outliner& rDrawOutliner = GetDrawOutliner();
rDrawOutliner.SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(GetStyleSheetPool()));
- sal_uLong nCntrl = rDrawOutliner.GetControlWord();
+ EEControlBits nCntrl = rDrawOutliner.GetControlWord();
if (mbOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
rDrawOutliner.SetControlWord(nCntrl);
// Initialize HitTestOutliner and DocumentOutliner, but don't initialize the
@@ -831,16 +831,16 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
void SdDrawDocument::SetOnlineSpell(bool bIn)
{
mbOnlineSpell = bIn;
- sal_uLong nCntrl = 0;
+ EEControlBits nCntrl;
if(mpOutliner)
{
nCntrl = mpOutliner->GetControlWord();
if(mbOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
mpOutliner->SetControlWord(nCntrl);
}
@@ -850,9 +850,9 @@ void SdDrawDocument::SetOnlineSpell(bool bIn)
nCntrl = mpInternalOutliner->GetControlWord();
if (mbOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
mpInternalOutliner->SetControlWord(nCntrl);
}
@@ -862,9 +862,9 @@ void SdDrawDocument::SetOnlineSpell(bool bIn)
nCntrl = rOutliner.GetControlWord();
if (mbOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
rOutliner.SetControlWord(nCntrl);
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 8205f8a8acb6..ce15ed3b0381 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -238,9 +238,9 @@ bool ImplSdPPTImport::Import()
pSdrModel->EnableUndo(false);
SdrOutliner& rOutl = mpDoc->GetDrawOutliner();
- sal_uInt32 nControlWord = rOutl.GetEditEngine().GetControlWord();
- nControlWord |= EE_CNTRL_ULSPACESUMMATION;
- nControlWord &=~ EE_CNTRL_ULSPACEFIRSTPARA;
+ EEControlBits nControlWord = rOutl.GetEditEngine().GetControlWord();
+ nControlWord |= EEControlBits::ULSPACESUMMATION;
+ nControlWord &= ~EEControlBits::ULSPACEFIRSTPARA;
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index eeae073f6766..5cef329d5f5c 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -338,8 +338,8 @@ void AnnotationWindow::InitControls()
mpVScrollbar->SetScrollHdl(LINK(this, AnnotationWindow, ScrollHdl));
mpVScrollbar->EnableDrag();
- sal_uLong nCntrl = mpOutliner->GetControlWord();
- nCntrl |= EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_NOCOLORS;
+ EEControlBits nCntrl = mpOutliner->GetControlWord();
+ nCntrl |= EEControlBits::PASTESPECIAL | EEControlBits::AUTOCORRECT | EEControlBits::USECHARATTRIBS | EEControlBits::NOCOLORS;
mpOutliner->SetControlWord(nCntrl);
Engine()->SetModifyHdl( Link() );
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index b6f924d026c0..fc01b4a96cb0 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -672,23 +672,23 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
if ( bMiscOptions )
{
pDoc->SetSummationOfParagraphs( pMiscItem->GetOptionsMisc().IsSummationOfParagraphs() );
- sal_uInt32 nSum = pMiscItem->GetOptionsMisc().IsSummationOfParagraphs() ? EE_CNTRL_ULSPACESUMMATION : 0;
- sal_uInt32 nCntrl;
+ EEControlBits nSum = pMiscItem->GetOptionsMisc().IsSummationOfParagraphs() ? EEControlBits::ULSPACESUMMATION : EEControlBits::NONE;
+ EEControlBits nCntrl;
SdDrawDocument* pDocument = pDocSh->GetDoc();
SdrOutliner& rOutl = pDocument->GetDrawOutliner();
- nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl = rOutl.GetControlWord() &~ EEControlBits::ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner( false );
if( pOutl )
{
- nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl = pOutl->GetControlWord() &~ EEControlBits::ULSPACESUMMATION;
pOutl->SetControlWord( nCntrl | nSum );
}
pOutl = pDocument->GetInternalOutliner( false );
if( pOutl )
{
- nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl = pOutl->GetControlWord() &~ EEControlBits::ULSPACESUMMATION;
pOutl->SetControlWord( nCntrl | nSum );
}
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index b6663dbddb63..3eb55845f39e 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -387,9 +387,9 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium,
// in. We need to tell both the edit engine of the draw outliner,
// and the document, to do "summation of paragraphs".
SdrOutliner& rOutl = mpDoc->GetDrawOutliner();
- sal_uInt32 nControlWord = rOutl.GetEditEngine().GetControlWord();
- nControlWord |= EE_CNTRL_ULSPACESUMMATION;
- nControlWord &=~ EE_CNTRL_ULSPACEFIRSTPARA;
+ EEControlBits nControlWord = rOutl.GetEditEngine().GetControlWord();
+ nControlWord |= EEControlBits::ULSPACESUMMATION;
+ nControlWord &=~ EEControlBits::ULSPACEFIRSTPARA;
((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord );
mpDoc->SetSummationOfParagraphs( true );
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index fbcd9cd68313..a9c746fe5f19 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -327,10 +327,9 @@ EditEngine* PresenterTextView::Implementation::CreateEditEngine (void)
Application::GetDefaultDevice()->GetTextWidth(OUString("XXXX"))));
pEditEngine->SetControlWord(
- (pEditEngine->GetControlWord()
- | EE_CNTRL_AUTOINDENTING) &
- (~EE_CNTRL_UNDOATTRIBS) &
- (~EE_CNTRL_PASTESPECIAL));
+ EEControlBits(pEditEngine->GetControlWord() | EEControlBits::AUTOINDENTING) &
+ EEControlBits(~EEControlBits::UNDOATTRIBS) &
+ EEControlBits(~EEControlBits::PASTESPECIAL) );
pEditEngine->SetWordDelimiters (" .=+-*/(){}[];\"");
pEditEngine->SetRefMapMode (MAP_PIXEL);
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index b5f2b71f359e..812469caf889 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -297,12 +297,12 @@ void PreviewRenderer::PaintPage (
// Turn off online spelling and redlining.
SdrOutliner* pOutliner = NULL;
- sal_uLong nSavedControlWord (0);
+ EEControlBits nSavedControlWord;
if (mpDocShellOfView!=NULL && mpDocShellOfView->GetDoc()!=NULL)
{
pOutliner = &mpDocShellOfView->GetDoc()->GetDrawOutliner();
nSavedControlWord = pOutliner->GetControlWord();
- pOutliner->SetControlWord((nSavedControlWord & ~EE_CNTRL_ONLINESPELLING));
+ pOutliner->SetControlWord((nSavedControlWord & ~EEControlBits::ONLINESPELLING));
}
// Use a special redirector to prevent PresObj shapes from being painted.
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 6264d10b11c8..26f0f9f72873 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -786,24 +786,24 @@ throw (UnknownPropertyException, PropertyVetoException,
bChanged = true;
if ( pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS )
{
- sal_uInt32 nSum = bIsSummationOfParagraphs ? EE_CNTRL_ULSPACESUMMATION : 0;
- sal_uInt32 nCntrl;
+ EEControlBits nSum = bIsSummationOfParagraphs ? EEControlBits::ULSPACESUMMATION : EEControlBits::NONE;
+ EEControlBits nCntrl;
pDoc->SetSummationOfParagraphs( bIsSummationOfParagraphs );
SdDrawDocument* pDocument = pDocSh->GetDoc();
SdrOutliner& rOutl = pDocument->GetDrawOutliner();
- nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl = rOutl.GetControlWord() &~ EEControlBits::ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner( false );
if( pOutl )
{
- nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl = pOutl->GetControlWord() &~ EEControlBits::ULSPACESUMMATION;
pOutl->SetControlWord( nCntrl | nSum );
}
pOutl = pDocument->GetInternalOutliner( false );
if( pOutl )
{
- nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
+ nCntrl = pOutl->GetControlWord() &~ EEControlBits::ULSPACESUMMATION;
pOutl->SetControlWord( nCntrl | nSum );
}
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 57d7736cd0a3..a421de2bc64b 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1428,10 +1428,10 @@ private:
mpPrinter->SetMapMode(aMap);
::Outliner& rOutliner = mrBase.GetDocument()->GetDrawOutliner();
- const sal_uLong nSavedControlWord (rOutliner.GetControlWord());
- sal_uLong nCntrl = nSavedControlWord;
- nCntrl &= ~EE_CNTRL_MARKFIELDS;
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ const EEControlBits nSavedControlWord (rOutliner.GetControlWord());
+ EEControlBits nCntrl = nSavedControlWord;
+ nCntrl &= ~EEControlBits::MARKFIELDS;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
rOutliner.SetControlWord( nCntrl );
// When in outline view then apply all pending changes to the model.
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 1077a24b5c81..26d15c9c95e5 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -171,10 +171,10 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
SetForbiddenCharsTable( pDoc->GetForbiddenCharsTable() );
- sal_uLong nCntrl = GetControlWord();
- nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl |= EE_CNTRL_MARKFIELDS;
- nCntrl |= EE_CNTRL_AUTOCORRECT;
+ EEControlBits nCntrl = GetControlWord();
+ nCntrl |= EEControlBits::ALLOWBIGOBJS;
+ nCntrl |= EEControlBits::MARKFIELDS;
+ nCntrl |= EEControlBits::AUTOCORRECT;
bool bOnlineSpell = false;
@@ -203,9 +203,9 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
}
if (bOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
SetControlWord(nCntrl);
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index bded56ca05b9..96b7c65adc77 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1371,12 +1371,12 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (pOL)
{
- sal_uLong nCntrl = pOL->GetControlWord();
+ EEControlBits nCntrl = pOL->GetControlWord();
if (bOnlineSpell)
- nCntrl |= EE_CNTRL_ONLINESPELLING;
+ nCntrl |= EEControlBits::ONLINESPELLING;
else
- nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ nCntrl &= ~EEControlBits::ONLINESPELLING;
pOL->SetControlWord(nCntrl);
}
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index d75a96d3c87c..7806b653dfea 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -251,17 +251,17 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
case SID_COLORVIEW:
{
::Outliner* pOutl = pOutlinerView->GetOutliner();
- sal_uLong nCntrl = pOutl->GetControlWord();
+ EEControlBits nCntrl = pOutl->GetControlWord();
- if ( !(nCntrl & EE_CNTRL_NOCOLORS) )
+ if ( !(nCntrl & EEControlBits::NOCOLORS) )
{
// color view is enabled: disable
- pOutl->SetControlWord(nCntrl | EE_CNTRL_NOCOLORS);
+ pOutl->SetControlWord(nCntrl | EEControlBits::NOCOLORS);
}
else
{
// color view is disabled: enable
- pOutl->SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
+ pOutl->SetControlWord(nCntrl & ~EEControlBits::NOCOLORS);
}
InvalidateWindows();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index bc7ec61bc3a8..24df4ce1107b 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -785,9 +785,9 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
else
{
// Enable color view?
- sal_uLong nCntrl = rOutl.GetControlWord();
+ EEControlBits nCntrl = rOutl.GetControlWord();
bool bNoColor = false;
- if (nCntrl & EE_CNTRL_NOCOLORS)
+ if (nCntrl & EEControlBits::NOCOLORS)
bNoColor = true;
rSet.Put( SfxBoolItem( SID_COLORVIEW, bNoColor ) );
@@ -1231,12 +1231,12 @@ void OutlineViewShell::ReadFrameViewData(FrameView* pView)
rOutl.SetFlatMode( pView->IsNoAttribs() );
- sal_uLong nCntrl = rOutl.GetControlWord();
+ EEControlBits nCntrl = rOutl.GetControlWord();
if ( pView->IsNoColors() )
- rOutl.SetControlWord(nCntrl | EE_CNTRL_NOCOLORS);
+ rOutl.SetControlWord(nCntrl | EEControlBits::NOCOLORS);
else
- rOutl.SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
+ rOutl.SetControlWord(nCntrl & ~EEControlBits::NOCOLORS);
sal_uInt16 nPage = mpFrameView->GetSelectedPage();
pLastPage = GetDoc()->GetSdPage( nPage, PK_STANDARD );
@@ -1250,9 +1250,9 @@ void OutlineViewShell::WriteFrameViewData()
{
::Outliner& rOutl = pOlView->GetOutliner();
- sal_uLong nCntrl = rOutl.GetControlWord();
+ EEControlBits nCntrl = rOutl.GetControlWord();
bool bNoColor = false;
- if (nCntrl & EE_CNTRL_NOCOLORS)
+ if (nCntrl & EEControlBits::NOCOLORS)
bNoColor = true;
mpFrameView->SetNoColors(bNoColor);
mpFrameView->SetNoAttribs( rOutl.IsFlatMode() );
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index c1bd6fc6dc5a..feeea971ae06 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -193,9 +193,9 @@ OutlineView::~OutlineView()
{
// uninitialize Outliner: enable color display
ResetLinks();
- sal_uLong nCntrl = mrOutliner.GetControlWord();
+ EEControlBits nCntrl = mrOutliner.GetControlWord();
mrOutliner.SetUpdateMode(false); // otherwise there will be drawn on SetControlWord
- mrOutliner.SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
+ mrOutliner.SetControlWord(nCntrl & ~EEControlBits::NOCOLORS);
SvtAccessibilityOptions aOptions;
mrOutliner.ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
mrOutliner.Clear();
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3eff2560d9c8..96d63bc6cb2a 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -629,14 +629,14 @@ bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
/**
* Start text input
*/
-static void SetSpellOptions( const SdDrawDocument& rDoc, sal_uLong& rCntrl )
+static void SetSpellOptions( const SdDrawDocument& rDoc, EEControlBits& rCntrl )
{
bool bOnlineSpell = rDoc.GetOnlineSpell();
if( bOnlineSpell )
- rCntrl |= EE_CNTRL_ONLINESPELLING;
+ rCntrl |= EEControlBits::ONLINESPELLING;
else
- rCntrl &= ~EE_CNTRL_ONLINESPELLING;
+ rCntrl &= ~EEControlBits::ONLINESPELLING;
}
void OutlinerMasterViewFilter::Start(SdrOutliner *pOutl)
@@ -677,14 +677,14 @@ bool View::SdrBeginTextEdit(
{
pOutl->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>( mrDoc.GetStyleSheetPool() ));
pOutl->SetCalcFieldValueHdl(LINK(SD_MOD(), SdModule, CalcFieldValueHdl));
- sal_uLong nCntrl = pOutl->GetControlWord();
- nCntrl |= EE_CNTRL_ALLOWBIGOBJS;
- nCntrl |= EE_CNTRL_MARKFIELDS;
- nCntrl |= EE_CNTRL_AUTOCORRECT;
+ EEControlBits nCntrl = pOutl->GetControlWord();
+ nCntrl |= EEControlBits::ALLOWBIGOBJS;
+ nCntrl |= EEControlBits::MARKFIELDS;
+ nCntrl |= EEControlBits::AUTOCORRECT;
- nCntrl &= ~EE_CNTRL_ULSPACESUMMATION;
+ nCntrl &= ~EEControlBits::ULSPACESUMMATION;
if ( mrDoc.IsSummationOfParagraphs() )
- nCntrl |= EE_CNTRL_ULSPACESUMMATION;
+ nCntrl |= EEControlBits::ULSPACESUMMATION;
SetSpellOptions( mrDoc, nCntrl );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 14:49:00 +0000