diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-24 16:05:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-25 08:56:14 +0200 |
| commit | abf60c4a0fd111985891e2faa30a1e32799fdf9c (patch) | |
| tree | b83b66c7457b8e221a01dfe3808adc918c41e6b9 /sc/source/filter | |
| parent | 6cb56b551bc1e30a887d8a333d70567cad23aa9e (diff) | |
convert EE_CNTRL constants to enum class
there were a couple of lines in SC and SW where the code was using a
EV_CNTRL constant. I switched it to used the same-valued constant from
EE_CNTRL
Change-Id: I027183cc3b6e700bf365d48833e37eddc9b50f04
Diffstat (limited to 'sc/source/filter')
| -rw-r--r-- | sc/source/filter/excel/xlroot.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 7375719c77d7..c3ea29bafff8 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -352,7 +352,7 @@ ScEditEngineDefaulter& XclRoot::GetEditEngine() const rEE.SetEditTextObjectPool( GetDoc().GetEditPool() ); rEE.SetUpdateMode( false ); rEE.EnableUndo( false ); - rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS ); + rEE.SetControlWord( rEE.GetControlWord() & ~EEControlBits::ALLOWBIGOBJS ); } return *mrData.mxEditEngine; } @@ -366,7 +366,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const rEE.SetRefMapMode( MAP_TWIP ); // headers/footers use twips as default metric rEE.SetUpdateMode( false ); rEE.EnableUndo( false ); - rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS ); + rEE.SetControlWord( rEE.GetControlWord() & ~EEControlBits::ALLOWBIGOBJS ); // set Calc header/footer defaults SfxItemSet* pEditSet = new SfxItemSet( rEE.GetEmptyItemSet() ); @@ -390,7 +390,7 @@ EditEngine& XclRoot::GetDrawEditEngine() const rEE.SetRefMapMode( MAP_100TH_MM ); rEE.SetUpdateMode( false ); rEE.EnableUndo( false ); - rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS ); + rEE.SetControlWord( rEE.GetControlWord() & ~EEControlBits::ALLOWBIGOBJS ); } return *mrData.mxDrawEditEng; } diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 1b77eeca9779..05a409c4359c 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -577,7 +577,7 @@ void WorkbookGlobals::initialize( bool bWorkbookFile ) mxEditEngine->SetEditTextObjectPool( rDoc.GetEditPool() ); mxEditEngine->SetUpdateMode( false ); mxEditEngine->EnableUndo( false ); - mxEditEngine->SetControlWord( mxEditEngine->GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS ); + mxEditEngine->SetControlWord( mxEditEngine->GetControlWord() & ~EEControlBits::ALLOWBIGOBJS ); // set some document properties needed during import if( mrBaseFilter.isImportFilter() ) diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 25dd3dba6704..921b105e64b5 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -3418,7 +3418,7 @@ ScEditEngineDefaulter* ScXMLImport::GetEditEngine() mpEditEngine->SetEditTextObjectPool(pDoc->GetEditPool()); mpEditEngine->SetUpdateMode(false); mpEditEngine->EnableUndo(false); - mpEditEngine->SetControlWord(mpEditEngine->GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS); + mpEditEngine->SetControlWord(mpEditEngine->GetControlWord() & ~EEControlBits::ALLOWBIGOBJS); } return mpEditEngine.get(); } |