sc/inc/viewopti.hxx | 92 ++++++++++++---------- sc/qa/unit/uicalc/uicalc.cxx | 4 sc/source/core/tool/viewopti.cxx | 138 ++++++++++++++++----------------- sc/source/filter/excel/impop.cxx | 6 - sc/source/filter/excel/xeview.cxx | 14 +-- sc/source/filter/excel/xiview.cxx | 14 +-- sc/source/ui/app/drwtrans.cxx | 2 sc/source/ui/app/scmod.cxx | 4 sc/source/ui/app/transobj.cxx | 2 sc/source/ui/dialogs/searchresults.cxx | 2 sc/source/ui/inc/viewdata.hxx | 20 ++-- sc/source/ui/miscdlgs/mvtabdlg.cxx | 4 sc/source/ui/optdlg/tpview.cxx | 108 ++++++++++++++----------- sc/source/ui/unoobj/confuno.cxx | 36 ++++---- sc/source/ui/unoobj/viewuno.cxx | 72 ++++++++--------- sc/source/ui/view/drawview.cxx | 2 sc/source/ui/view/gridwin3.cxx | 8 - sc/source/ui/view/gridwin4.cxx | 18 ++-- sc/source/ui/view/gridwin5.cxx | 2 sc/source/ui/view/printfun.cxx | 6 - sc/source/ui/view/tabview5.cxx | 4 sc/source/ui/view/tabvwsh3.cxx | 4 sc/source/ui/view/tabvwsha.cxx | 6 - sc/source/ui/view/viewdata.cxx | 53 ++++++------ sc/source/ui/view/viewfun2.cxx | 2 sc/source/ui/view/viewfunc.cxx | 2 26 files changed, 327 insertions(+), 298 deletions(-)
New commits: commit 04c45b9f6e124f8e80cb891efba497f3b8682aee Author: Tomaž Vajngerl <[email protected]> AuthorDate: Fri Jun 20 12:32:57 2025 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Jun 24 23:05:45 2025 +0200 sc: prefix members of ScViewRenderingOptions, remove operator!= operator!= is not needed if it's only a negation of operator== Change-Id: I4a5256a460e25408d531d3f03a17c013455213ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186761 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 2c09db6e08ec..fa25ffd0e7a9 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -75,7 +75,6 @@ public: void SetDefaults(); bool operator== ( const ScGridOptions& rOpt ) const; - bool operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } }; class SC_DLLPUBLIC ScViewRenderingOptions @@ -83,19 +82,19 @@ class SC_DLLPUBLIC ScViewRenderingOptions public: ScViewRenderingOptions(); - const OUString& GetColorSchemeName() const { return sColorSchemeName; } - void SetColorSchemeName( const OUString& rName ) { sColorSchemeName = rName; } + const OUString& GetColorSchemeName() const { return msColorSchemeName; } + void SetColorSchemeName( const OUString& rName ) { msColorSchemeName = rName; } - const Color& GetDocColor() const { return aDocCol; } - void SetDocColor(const Color& rDocColor) { aDocCol = rDocColor; } + const Color& GetDocColor() const { return maDocumentColor; } + void SetDocColor(const Color& rDocColor) { maDocumentColor = rDocColor; } bool operator==(const ScViewRenderingOptions& rOther) const; private: // The name of the color scheme - OUString sColorSchemeName; + OUString msColorSchemeName; // The background color of the document - Color aDocCol; + Color maDocumentColor; }; // Options - View @@ -136,7 +135,6 @@ public: ScViewOptions& operator= ( const ScViewOptions& rCpy ); bool operator== ( const ScViewOptions& rOpt ) const; - bool operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } private: bool aOptArr [MAX_OPT]; diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 30d6f4ebfc63..a8841642f926 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -69,15 +69,15 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const } ScViewRenderingOptions::ScViewRenderingOptions() - : sColorSchemeName(u"Default"_ustr) - , aDocCol(ScModule::get()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor) + : msColorSchemeName(u"Default"_ustr) + , maDocumentColor(ScModule::get()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor) { } bool ScViewRenderingOptions::operator==(const ScViewRenderingOptions& rOther) const { - return sColorSchemeName == rOther.sColorSchemeName && - aDocCol == rOther.aDocCol; + return msColorSchemeName == rOther.msColorSchemeName && + maDocumentColor == rOther.maDocumentColor; } ScViewOptions::ScViewOptions() commit f8c337a233d78ec5c48dbc8fc6c5d2620e7f31cd Author: Tomaž Vajngerl <[email protected]> AuthorDate: Fri Jun 20 12:07:03 2025 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Jun 24 23:05:39 2025 +0200 sc: convert enum to enum class ScViewOption and ScVObjType Also rename the enum to sc::ViewOption and sc::ViewObjectType. Change-Id: Iba5f37a3786ebb9ea5727ad2a69e9d075ced5eaf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186760 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 72553dcf81b9..2c09db6e08ec 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -27,39 +27,43 @@ // View options -enum ScViewOption +namespace sc { - VOPT_FORMULAS = 0, - VOPT_NULLVALS, - VOPT_SYNTAX, - VOPT_NOTES, - VOPT_NOTEAUTHOR, - VOPT_FORMULAS_MARKS, - VOPT_VSCROLL, - VOPT_HSCROLL, - VOPT_TABCONTROLS, - VOPT_OUTLINER, - VOPT_HEADER, - VOPT_GRID, - VOPT_GRID_ONTOP, - VOPT_HELPLINES, - VOPT_ANCHOR, - VOPT_PAGEBREAKS, - VOPT_SUMMARY, +enum class ViewOption : sal_Int32 +{ + FORMULAS = 0, + NULLVALS, + SYNTAX, + NOTES, + NOTEAUTHOR, + FORMULAS_MARKS, + VSCROLL, + HSCROLL, + TABCONTROLS, + OUTLINER, + HEADER, + GRID, + GRID_ONTOP, + HELPLINES, + ANCHOR, + PAGEBREAKS, + SUMMARY, // tdf#96854 - move/copy sheet dialog: last used option for action (true: copy, false: move) - VOPT_COPY_SHEET, - VOPT_THEMEDCURSOR, + COPY_SHEET, + THEMEDCURSOR, }; -enum ScVObjType +enum class ViewObjectType : sal_Int32 { - VOBJ_TYPE_OLE = 0, - VOBJ_TYPE_CHART, - VOBJ_TYPE_DRAW + OLE = 0, + CHART, + DRAW, }; -#define MAX_OPT sal_uInt16(VOPT_THEMEDCURSOR)+1 -#define MAX_TYPE sal_uInt16(VOBJ_TYPE_DRAW)+1 +} // end sc + +constexpr sal_uInt16 MAX_OPT = sal_uInt16(sc::ViewOption::THEMEDCURSOR) + 1; +constexpr sal_uInt16 MAX_TYPE = sal_uInt16(sc::ViewObjectType::DRAW) + 1; // SvxGrid options with standard operators @@ -105,11 +109,23 @@ public: void SetDefaults(); - void SetOption( ScViewOption eOpt, bool bNew ) { aOptArr[eOpt] = bNew; } - bool GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } - - void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } - ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } + void SetOption(sc::ViewOption eOption, bool bNew) + { + aOptArr[sal_Int32(eOption)] = bNew; + } + bool GetOption(sc::ViewOption eOption) const + { + return aOptArr[sal_Int32(eOption)]; + } + + void SetObjMode(sc::ViewObjectType eObject, ScVObjMode eMode) + { + aModeArr[sal_Int32(eObject)] = eMode; + } + ScVObjMode GetObjMode(sc::ViewObjectType eObject) const + { + return aModeArr[sal_Int32(eObject)]; + } void SetGridColor( const Color& rCol, const OUString& rName ) { aGridCol = rCol; aGridColName = rName;} Color const & GetGridColor( OUString* pStrName = nullptr ) const; diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx index 28093c60fd8e..4f35fdcb38dc 100644 --- a/sc/qa/unit/uicalc/uicalc.cxx +++ b/sc/qa/unit/uicalc/uicalc.cxx @@ -84,14 +84,14 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf142854_GridVisibilityImportXlsxInHeadl // Import an ods file with 'Hide' global grid visibility setting. createScDoc("tdf126541_GridOffGlobally.ods"); ScDocument* pDoc = getScDoc(); - CPPUNIT_ASSERT(!pDoc->GetViewOptions().GetOption(VOPT_GRID)); + CPPUNIT_ASSERT(!pDoc->GetViewOptions().GetOption(sc::ViewOption::GRID)); // To avoid regression, in headless mode leave the bug tdf126541 // It means Sheet based grid line visibility setting will overwrite the global setting. // If there is only 1 sheet in the document, it will not result visible problems. createScDoc("tdf126541_GridOff.xlsx"); pDoc = getScDoc(); - CPPUNIT_ASSERT(!pDoc->GetViewOptions().GetOption(VOPT_GRID)); + CPPUNIT_ASSERT(!pDoc->GetViewOptions().GetOption(sc::ViewOption::GRID)); } CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testExternalReferences) diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index ac6c0390ebea..30d6f4ebfc63 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -96,29 +96,29 @@ ScViewOptions::~ScViewOptions() void ScViewOptions::SetDefaults() { - aOptArr[ VOPT_FORMULAS ] = false; - aOptArr[ VOPT_SYNTAX ] = false; - aOptArr[ VOPT_HELPLINES ] = false; - aOptArr[ VOPT_GRID_ONTOP ] = false; - aOptArr[ VOPT_NOTES ] = true; - aOptArr[ VOPT_NOTEAUTHOR ] = true; - aOptArr[ VOPT_FORMULAS_MARKS ] = false; - aOptArr[ VOPT_NULLVALS ] = true; - aOptArr[ VOPT_VSCROLL ] = true; - aOptArr[ VOPT_HSCROLL ] = true; - aOptArr[ VOPT_TABCONTROLS ] = true; - aOptArr[ VOPT_OUTLINER ] = true; - aOptArr[ VOPT_HEADER ] = true; - aOptArr[ VOPT_GRID ] = true; - aOptArr[ VOPT_ANCHOR ] = true; - aOptArr[ VOPT_PAGEBREAKS ] = true; - aOptArr[ VOPT_SUMMARY ] = true; - aOptArr[ VOPT_COPY_SHEET ] = false; - aOptArr[ VOPT_THEMEDCURSOR ] = false; - - aModeArr[VOBJ_TYPE_OLE ] = VOBJ_MODE_SHOW; - aModeArr[VOBJ_TYPE_CHART] = VOBJ_MODE_SHOW; - aModeArr[VOBJ_TYPE_DRAW ] = VOBJ_MODE_SHOW; + aOptArr[sal_Int32(sc::ViewOption::FORMULAS)] = false; + aOptArr[sal_Int32(sc::ViewOption::SYNTAX)] = false; + aOptArr[sal_Int32(sc::ViewOption::HELPLINES)] = false; + aOptArr[sal_Int32(sc::ViewOption::GRID_ONTOP)] = false; + aOptArr[sal_Int32(sc::ViewOption::NOTES)] = true; + aOptArr[sal_Int32(sc::ViewOption::NOTEAUTHOR)] = true; + aOptArr[sal_Int32(sc::ViewOption::FORMULAS_MARKS)] = false; + aOptArr[sal_Int32(sc::ViewOption::NULLVALS)] = true; + aOptArr[sal_Int32(sc::ViewOption::VSCROLL)] = true; + aOptArr[sal_Int32(sc::ViewOption::HSCROLL)] = true; + aOptArr[sal_Int32(sc::ViewOption::TABCONTROLS)] = true; + aOptArr[sal_Int32(sc::ViewOption::OUTLINER)] = true; + aOptArr[sal_Int32(sc::ViewOption::HEADER)] = true; + aOptArr[sal_Int32(sc::ViewOption::GRID)] = true; + aOptArr[sal_Int32(sc::ViewOption::ANCHOR)] = true; + aOptArr[sal_Int32(sc::ViewOption::PAGEBREAKS)] = true; + aOptArr[sal_Int32(sc::ViewOption::SUMMARY)] = true; + aOptArr[sal_Int32(sc::ViewOption::COPY_SHEET)] = false; + aOptArr[sal_Int32(sc::ViewOption::THEMEDCURSOR)] = false; + + aModeArr[sal_Int32(sc::ViewObjectType::OLE)] = VOBJ_MODE_SHOW; + aModeArr[sal_Int32(sc::ViewObjectType::CHART)] = VOBJ_MODE_SHOW; + aModeArr[sal_Int32(sc::ViewObjectType::DRAW)] = VOBJ_MODE_SHOW; aGridCol = svtools::ColorConfig().GetColorValue( svtools::CALCGRID ).nColor; @@ -306,37 +306,37 @@ ScViewCfg::ScViewCfg() : break; } case SCLAYOUTOPT_GRIDLINES: - SetOption( VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::GRID, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_GRID_ONCOLOR: - SetOption( VOPT_GRID_ONTOP, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::GRID_ONTOP, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_PAGEBREAK: - SetOption( VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_GUIDE: - SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_COLROWHDR: - SetOption( VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::HEADER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_HORISCROLL: - SetOption( VOPT_HSCROLL, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::HSCROLL, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_VERTSCROLL: - SetOption( VOPT_VSCROLL, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::VSCROLL, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_SHEETTAB: - SetOption( VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_OUTLINE: - SetOption( VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_SUMMARY: - SetOption( VOPT_SUMMARY, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::SUMMARY, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCLAYOUTOPT_THEMEDCURSOR: - SetOption( VOPT_THEMEDCURSOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption( sc::ViewOption::THEMEDCURSOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; } } @@ -369,37 +369,37 @@ IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void) pValues[nProp] <<= GetGridColor(); break; case SCLAYOUTOPT_GRIDLINES: - pValues[nProp] <<= GetOption( VOPT_GRID ); + pValues[nProp] <<= GetOption( sc::ViewOption::GRID ); break; case SCLAYOUTOPT_GRID_ONCOLOR: - pValues[nProp] <<= GetOption( VOPT_GRID_ONTOP ); + pValues[nProp] <<= GetOption( sc::ViewOption::GRID_ONTOP ); break; case SCLAYOUTOPT_PAGEBREAK: - pValues[nProp] <<= GetOption( VOPT_PAGEBREAKS ); + pValues[nProp] <<= GetOption( sc::ViewOption::PAGEBREAKS ); break; case SCLAYOUTOPT_GUIDE: - pValues[nProp] <<= GetOption( VOPT_HELPLINES ); + pValues[nProp] <<= GetOption( sc::ViewOption::HELPLINES ); break; case SCLAYOUTOPT_COLROWHDR: - pValues[nProp] <<= GetOption( VOPT_HEADER ); + pValues[nProp] <<= GetOption( sc::ViewOption::HEADER ); break; case SCLAYOUTOPT_HORISCROLL: - pValues[nProp] <<= GetOption( VOPT_HSCROLL ); + pValues[nProp] <<= GetOption( sc::ViewOption::HSCROLL ); break; case SCLAYOUTOPT_VERTSCROLL: - pValues[nProp] <<= GetOption( VOPT_VSCROLL ); + pValues[nProp] <<= GetOption( sc::ViewOption::VSCROLL ); break; case SCLAYOUTOPT_SHEETTAB: - pValues[nProp] <<= GetOption( VOPT_TABCONTROLS ); + pValues[nProp] <<= GetOption( sc::ViewOption::TABCONTROLS ); break; case SCLAYOUTOPT_OUTLINE: - pValues[nProp] <<= GetOption( VOPT_OUTLINER ); + pValues[nProp] <<= GetOption( sc::ViewOption::OUTLINER ); break; case SCLAYOUTOPT_SUMMARY: - pValues[nProp] <<= GetOption( VOPT_SUMMARY ); + pValues[nProp] <<= GetOption( sc::ViewOption::SUMMARY ); break; case SCLAYOUTOPT_THEMEDCURSOR: - pValues[nProp] <<= GetOption( VOPT_THEMEDCURSOR ); + pValues[nProp] <<= GetOption( sc::ViewOption::THEMEDCURSOR ); break; } } @@ -425,25 +425,25 @@ void ScViewCfg::ReadDisplayCfg() switch(nProp) { case SCDISPLAYOPT_FORMULA: - SetOption( VOPT_FORMULAS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::FORMULAS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_ZEROVALUE: - SetOption( VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_NOTETAG: - SetOption( VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::NOTES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_NOTEAUTHOR: - SetOption( VOPT_NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_FORMULAMARK: - SetOption( VOPT_FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_VALUEHI: - SetOption( VOPT_SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_ANCHOR: - SetOption( VOPT_ANCHOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); + SetOption(sc::ViewOption::ANCHOR, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) ); break; case SCDISPLAYOPT_OBJECTGRA: if ( pValues[nProp] >>= nIntVal ) @@ -451,7 +451,7 @@ void ScViewCfg::ReadDisplayCfg() //#i80528# adapt to new range eventually if(sal_Int32(VOBJ_MODE_HIDE) < nIntVal) nIntVal = sal_Int32(VOBJ_MODE_SHOW); - SetObjMode( VOBJ_TYPE_OLE, static_cast<ScVObjMode>(nIntVal)); + SetObjMode(sc::ViewObjectType::OLE, static_cast<ScVObjMode>(nIntVal)); } break; case SCDISPLAYOPT_CHART: @@ -460,7 +460,7 @@ void ScViewCfg::ReadDisplayCfg() //#i80528# adapt to new range eventually if(sal_Int32(VOBJ_MODE_HIDE) < nIntVal) nIntVal = sal_Int32(VOBJ_MODE_SHOW); - SetObjMode( VOBJ_TYPE_CHART, static_cast<ScVObjMode>(nIntVal)); + SetObjMode(sc::ViewObjectType::CHART, static_cast<ScVObjMode>(nIntVal)); } break; case SCDISPLAYOPT_DRAWING: @@ -469,7 +469,7 @@ void ScViewCfg::ReadDisplayCfg() //#i80528# adapt to new range eventually if(sal_Int32(VOBJ_MODE_HIDE) < nIntVal) nIntVal = sal_Int32(VOBJ_MODE_SHOW); - SetObjMode( VOBJ_TYPE_DRAW, static_cast<ScVObjMode>(nIntVal)); + SetObjMode(sc::ViewObjectType::DRAW, static_cast<ScVObjMode>(nIntVal)); } break; } @@ -493,34 +493,34 @@ IMPL_LINK_NOARG(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void) switch(nProp) { case SCDISPLAYOPT_FORMULA: - pValues[nProp] <<= GetOption( VOPT_FORMULAS ); + pValues[nProp] <<= GetOption(sc::ViewOption::FORMULAS); break; case SCDISPLAYOPT_ZEROVALUE: - pValues[nProp] <<= GetOption( VOPT_NULLVALS ); + pValues[nProp] <<= GetOption(sc::ViewOption::NULLVALS); break; case SCDISPLAYOPT_NOTETAG: - pValues[nProp] <<= GetOption( VOPT_NOTES ); + pValues[nProp] <<= GetOption(sc::ViewOption::NOTES); break; case SCDISPLAYOPT_NOTEAUTHOR: - pValues[nProp] <<= GetOption( VOPT_NOTEAUTHOR ); + pValues[nProp] <<= GetOption(sc::ViewOption::NOTEAUTHOR); break; case SCDISPLAYOPT_FORMULAMARK: - pValues[nProp] <<= GetOption( VOPT_FORMULAS_MARKS ); + pValues[nProp] <<= GetOption(sc::ViewOption::FORMULAS_MARKS); break; case SCDISPLAYOPT_VALUEHI: - pValues[nProp] <<= GetOption( VOPT_SYNTAX ); + pValues[nProp] <<= GetOption(sc::ViewOption::SYNTAX); break; case SCDISPLAYOPT_ANCHOR: - pValues[nProp] <<= GetOption( VOPT_ANCHOR ); + pValues[nProp] <<= GetOption(sc::ViewOption::ANCHOR); break; case SCDISPLAYOPT_OBJECTGRA: - pValues[nProp] <<= static_cast<sal_Int32>(GetObjMode( VOBJ_TYPE_OLE )); + pValues[nProp] <<= static_cast<sal_Int32>(GetObjMode(sc::ViewObjectType::OLE)); break; case SCDISPLAYOPT_CHART: - pValues[nProp] <<= static_cast<sal_Int32>(GetObjMode( VOBJ_TYPE_CHART )); + pValues[nProp] <<= static_cast<sal_Int32>(GetObjMode(sc::ViewObjectType::CHART)); break; case SCDISPLAYOPT_DRAWING: - pValues[nProp] <<= static_cast<sal_Int32>(GetObjMode( VOBJ_TYPE_DRAW )); + pValues[nProp] <<= static_cast<sal_Int32>(GetObjMode(sc::ViewObjectType::DRAW)); break; } } diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 4263f5deb9c7..173049091223 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -785,9 +785,9 @@ void ImportExcel::Hideobj() break; } - aOpts.SetObjMode( VOBJ_TYPE_OLE, eOle ); - aOpts.SetObjMode( VOBJ_TYPE_CHART, eChart ); - aOpts.SetObjMode( VOBJ_TYPE_DRAW, eDraw ); + aOpts.SetObjMode(sc::ViewObjectType::OLE, eOle ); + aOpts.SetObjMode(sc::ViewObjectType::CHART, eChart ); + aOpts.SetObjMode(sc::ViewObjectType::DRAW, eDraw ); rD.SetViewOptions( aOpts ); } diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index c5760fafcdb7..5280f234eed8 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -38,9 +38,9 @@ XclExpWindow1::XclExpWindow1( const XclExpRoot& rRoot ) , mnTabBarSize(600) { const ScViewOptions& rViewOpt = rRoot.GetDoc().GetViewOptions(); - ::set_flag( mnFlags, EXC_WIN1_HOR_SCROLLBAR, rViewOpt.GetOption( VOPT_HSCROLL ) ); - ::set_flag( mnFlags, EXC_WIN1_VER_SCROLLBAR, rViewOpt.GetOption( VOPT_VSCROLL ) ); - ::set_flag( mnFlags, EXC_WIN1_TABBAR, rViewOpt.GetOption( VOPT_TABCONTROLS ) ); + ::set_flag( mnFlags, EXC_WIN1_HOR_SCROLLBAR, rViewOpt.GetOption(sc::ViewOption::HSCROLL) ); + ::set_flag( mnFlags, EXC_WIN1_VER_SCROLLBAR, rViewOpt.GetOption(sc::ViewOption::VSCROLL) ); + ::set_flag( mnFlags, EXC_WIN1_TABBAR, rViewOpt.GetOption(sc::ViewOption::TABCONTROLS) ); double fTabBarWidth = rRoot.GetExtDocOptions().GetDocSettings().mfTabBarWidth; if( (0.0 <= fTabBarWidth) && (fTabBarWidth <= 1.0) ) @@ -296,10 +296,10 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc maData.mbMirrored = rTabInfo.IsMirroredTab( nScTab ); const ScViewOptions& rViewOpt = GetDoc().GetViewOptions(); - maData.mbShowFormulas = rViewOpt.GetOption( VOPT_FORMULAS ); - maData.mbShowHeadings = rViewOpt.GetOption( VOPT_HEADER ); - maData.mbShowZeros = rViewOpt.GetOption( VOPT_NULLVALS ); - maData.mbShowOutline = rViewOpt.GetOption( VOPT_OUTLINER ); + maData.mbShowFormulas = rViewOpt.GetOption(sc::ViewOption::FORMULAS); + maData.mbShowHeadings = rViewOpt.GetOption(sc::ViewOption::HEADER); + maData.mbShowZeros = rViewOpt.GetOption(sc::ViewOption::NULLVALS); + maData.mbShowOutline = rViewOpt.GetOption(sc::ViewOption::OUTLINER); // *** sheet options: cursor, selection, splits, grid color, zoom *** diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index 49878de6eeb2..d38455b1908f 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -63,9 +63,9 @@ SCTAB XclImpDocViewSettings::GetDisplScTab() const void XclImpDocViewSettings::Finalize() { ScViewOptions aViewOpt( GetDoc().GetViewOptions() ); - aViewOpt.SetOption( VOPT_HSCROLL, ::get_flag( maData.mnFlags, EXC_WIN1_HOR_SCROLLBAR ) ); - aViewOpt.SetOption( VOPT_VSCROLL, ::get_flag( maData.mnFlags, EXC_WIN1_VER_SCROLLBAR ) ); - aViewOpt.SetOption( VOPT_TABCONTROLS, ::get_flag( maData.mnFlags, EXC_WIN1_TABBAR ) ); + aViewOpt.SetOption(sc::ViewOption::HSCROLL, ::get_flag( maData.mnFlags, EXC_WIN1_HOR_SCROLLBAR ) ); + aViewOpt.SetOption(sc::ViewOption::VSCROLL, ::get_flag( maData.mnFlags, EXC_WIN1_VER_SCROLLBAR ) ); + aViewOpt.SetOption(sc::ViewOption::TABCONTROLS, ::get_flag( maData.mnFlags, EXC_WIN1_TABBAR ) ); GetDoc().SetViewOptions( aViewOpt ); // displayed sheet @@ -285,10 +285,10 @@ void XclImpTabViewSettings::Finalize() { // set Excel sheet settings globally at Calc document, take settings from displayed sheet ScViewOptions aViewOpt( rDoc.GetViewOptions() ); - aViewOpt.SetOption( VOPT_FORMULAS, maData.mbShowFormulas ); - aViewOpt.SetOption( VOPT_HEADER, maData.mbShowHeadings ); - aViewOpt.SetOption( VOPT_NULLVALS, maData.mbShowZeros ); - aViewOpt.SetOption( VOPT_OUTLINER, maData.mbShowOutline ); + aViewOpt.SetOption(sc::ViewOption::FORMULAS, maData.mbShowFormulas ); + aViewOpt.SetOption(sc::ViewOption::HEADER, maData.mbShowHeadings ); + aViewOpt.SetOption(sc::ViewOption::NULLVALS, maData.mbShowZeros ); + aViewOpt.SetOption(sc::ViewOption::OUTLINER, maData.mbShowOutline ); rDoc.SetViewOptions( aViewOpt ); } diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index df9abffe67a1..8d3e7f86fbb5 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -715,7 +715,7 @@ void ScDrawTransferObj::InitDocShell() m_aDocShellRef->SetVisArea(aDestArea); ScViewOptions aViewOpt( rDestDoc.GetViewOptions() ); - aViewOpt.SetOption( VOPT_GRID, false ); + aViewOpt.SetOption(sc::ViewOption::GRID, false); rDestDoc.SetViewOptions( aViewOpt ); ScViewData aViewData(*m_aDocShellRef, nullptr); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a4b22c473b76..d9d11e1a07e6 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1084,8 +1084,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) ScViewData& rViewData = pViewSh->GetViewData(); const ScViewOptions& rOldOpt = rViewData.GetOptions(); - bool bAnchorList = ( rOldOpt.GetOption( VOPT_ANCHOR ) != - rNewOpt.GetOption( VOPT_ANCHOR ) ); + bool bAnchorList = rOldOpt.GetOption(sc::ViewOption::ANCHOR) != + rNewOpt.GetOption(sc::ViewOption::ANCHOR); if ( rOldOpt != rNewOpt ) { diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 112282e65a56..d1de5fcc5e8c 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -381,7 +381,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt aTextOptions.mbAddQuotes = false; } aObj.SetExportTextOptions(aTextOptions); - aObj.SetFormulas( m_pDoc->GetViewOptions().GetOption( VOPT_FORMULAS ) ); + aObj.SetFormulas(m_pDoc->GetViewOptions().GetOption(sc::ViewOption::FORMULAS)); aObj.SetIncludeFiltered( bIncludeFiltered ); // DataType depends on format type: diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index c0ec382cdb98..f54e1a080088 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -240,7 +240,7 @@ IMPL_STATIC_LINK( SearchResultsDlg, OnShowToggled, weld::Toggleable&, rButton, v if (ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell()) { ScViewOptions aViewOpt( pScViewShell->GetViewData().GetOptions() ); - aViewOpt.SetOption( VOPT_SUMMARY, rButton.get_active() ); + aViewOpt.SetOption(sc::ViewOption::SUMMARY, rButton.get_active()); pScViewShell->GetViewData().SetOptions( aViewOpt ); } } diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index c974c31e4f8d..68e9830dda8e 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -554,16 +554,16 @@ public: const ScViewOptions& GetOptions() const { return maOptions; } SC_DLLPUBLIC void SetOptions( const ScViewOptions& rOpt ); - bool IsGridMode () const { return maOptions.GetOption(VOPT_GRID); } - bool IsSyntaxMode () const { return maOptions.GetOption(VOPT_SYNTAX); } - void SetSyntaxMode ( bool bNewMode ) { maOptions.SetOption(VOPT_SYNTAX, bNewMode); } - bool IsHeaderMode () const { return maOptions.GetOption(VOPT_HEADER); } - void SetHeaderMode ( bool bNewMode ) { maOptions.SetOption(VOPT_HEADER, bNewMode); } - bool IsTabMode () const { return maOptions.GetOption(VOPT_TABCONTROLS); } - bool IsVScrollMode () const { return maOptions.GetOption(VOPT_VSCROLL); } - bool IsHScrollMode () const { return maOptions.GetOption(VOPT_HSCROLL); } - bool IsOutlineMode () const { return maOptions.GetOption(VOPT_OUTLINER); } - bool IsThemedCursor () const { return maOptions.GetOption(VOPT_THEMEDCURSOR); } + bool IsGridMode () const { return maOptions.GetOption(sc::ViewOption::GRID); } + bool IsSyntaxMode () const { return maOptions.GetOption(sc::ViewOption::SYNTAX); } + void SetSyntaxMode ( bool bNewMode ) { maOptions.SetOption(sc::ViewOption::SYNTAX, bNewMode); } + bool IsHeaderMode () const { return maOptions.GetOption(sc::ViewOption::HEADER); } + void SetHeaderMode ( bool bNewMode ) { maOptions.SetOption(sc::ViewOption::HEADER, bNewMode); } + bool IsTabMode () const { return maOptions.GetOption(sc::ViewOption::TABCONTROLS); } + bool IsVScrollMode () const { return maOptions.GetOption(sc::ViewOption::VSCROLL); } + bool IsHScrollMode () const { return maOptions.GetOption(sc::ViewOption::HSCROLL); } + bool IsOutlineMode () const { return maOptions.GetOption(sc::ViewOption::OUTLINER); } + bool IsThemedCursor () const { return maOptions.GetOption(sc::ViewOption::THEMEDCURSOR); } bool GetEditHighlight() const { return bEditHighlight; } void SetEditHighlight(bool bNewHighlight) { bEditHighlight = bNewHighlight; } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 822313b046f6..246d939c93e4 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -194,7 +194,7 @@ void ScMoveTableDlg::Init() // tdf#96854 - remember last used option for copy/move sheet bool bIsCopyActive = false; if (ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell()) - bIsCopyActive = pViewSh->GetViewData().GetOptions().GetOption(VOPT_COPY_SHEET); + bIsCopyActive = pViewSh->GetViewData().GetOptions().GetOption(sc::ViewOption::COPY_SHEET); m_xBtnMove->set_active(!bIsCopyActive); m_xBtnCopy->set_active(bIsCopyActive); m_xEdTabName->set_sensitive(false); @@ -255,7 +255,7 @@ void ScMoveTableDlg::SetOkBtnLabel() if (ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell()) { ScViewOptions aViewOpt(pScViewShell->GetViewData().GetOptions()); - aViewOpt.SetOption(VOPT_COPY_SHEET, bIsCopyActive); + aViewOpt.SetOption(sc::ViewOption::COPY_SHEET, bIsCopyActive); pScViewShell->GetViewData().SetOptions(aViewOpt); } } diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index f3871b9c7659..9364f2c62194 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -213,35 +213,35 @@ void ScTpContentOptions::Reset( const SfxItemSet* rCoreSet ) m_xLocalOptions.reset( new ScViewOptions( pViewItem->GetViewOptions() ) ); else m_xLocalOptions.reset( new ScViewOptions ); - m_xFormulaCB ->set_active(m_xLocalOptions->GetOption(VOPT_FORMULAS)); - m_xNilCB ->set_active(m_xLocalOptions->GetOption(VOPT_NULLVALS)); - m_xAnnotCB ->set_active(m_xLocalOptions->GetOption(VOPT_NOTES)); - m_xNoteAuthorCB->set_active(m_xLocalOptions->GetOption(VOPT_NOTEAUTHOR)); - m_xFormulaMarkCB->set_active(m_xLocalOptions->GetOption(VOPT_FORMULAS_MARKS)); - m_xValueCB ->set_active(m_xLocalOptions->GetOption(VOPT_SYNTAX)); + m_xFormulaCB ->set_active(m_xLocalOptions->GetOption(sc::ViewOption::FORMULAS)); + m_xNilCB ->set_active(m_xLocalOptions->GetOption(sc::ViewOption::NULLVALS)); + m_xAnnotCB ->set_active(m_xLocalOptions->GetOption(sc::ViewOption::NOTES)); + m_xNoteAuthorCB->set_active(m_xLocalOptions->GetOption(sc::ViewOption::NOTEAUTHOR)); + m_xFormulaMarkCB->set_active(m_xLocalOptions->GetOption(sc::ViewOption::FORMULAS_MARKS)); + m_xValueCB ->set_active(m_xLocalOptions->GetOption(sc::ViewOption::SYNTAX)); m_xColRowHighCB->set_active(officecfg::Office::Calc::Content::Display::ColumnRowHighlighting::get()); m_xEditCellBgHighCB->set_active(officecfg::Office::Calc::Content::Display::EditCellBackgroundHighlighting::get()); - m_xAnchorCB ->set_active(m_xLocalOptions->GetOption(VOPT_ANCHOR)); - - m_xObjGrfLB ->set_active( static_cast<sal_uInt16>(m_xLocalOptions->GetObjMode(VOBJ_TYPE_OLE)) ); - m_xDiagramLB ->set_active( static_cast<sal_uInt16>(m_xLocalOptions->GetObjMode(VOBJ_TYPE_CHART)) ); - m_xDrawLB ->set_active( static_cast<sal_uInt16>(m_xLocalOptions->GetObjMode(VOBJ_TYPE_DRAW)) ); - - m_xRowColHeaderCB->set_active( m_xLocalOptions->GetOption(VOPT_HEADER) ); - m_xHScrollCB->set_active( m_xLocalOptions->GetOption(VOPT_HSCROLL) ); - m_xVScrollCB->set_active( m_xLocalOptions->GetOption(VOPT_VSCROLL) ); - m_xTblRegCB ->set_active( m_xLocalOptions->GetOption(VOPT_TABCONTROLS) ); - m_xOutlineCB->set_active( m_xLocalOptions->GetOption(VOPT_OUTLINER) ); - m_xSummaryCB->set_active( m_xLocalOptions->GetOption(VOPT_SUMMARY) ); - if ( m_xLocalOptions->GetOption(VOPT_THEMEDCURSOR) ) + m_xAnchorCB ->set_active(m_xLocalOptions->GetOption(sc::ViewOption::ANCHOR)); + + m_xObjGrfLB ->set_active( static_cast<sal_uInt16>(m_xLocalOptions->GetObjMode(sc::ViewObjectType::OLE)) ); + m_xDiagramLB ->set_active( static_cast<sal_uInt16>(m_xLocalOptions->GetObjMode(sc::ViewObjectType::CHART)) ); + m_xDrawLB ->set_active( static_cast<sal_uInt16>(m_xLocalOptions->GetObjMode(sc::ViewObjectType::DRAW)) ); + + m_xRowColHeaderCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::HEADER) ); + m_xHScrollCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::HSCROLL) ); + m_xVScrollCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::VSCROLL) ); + m_xTblRegCB ->set_active( m_xLocalOptions->GetOption(sc::ViewOption::TABCONTROLS) ); + m_xOutlineCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::OUTLINER) ); + m_xSummaryCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::SUMMARY) ); + if ( m_xLocalOptions->GetOption(sc::ViewOption::THEMEDCURSOR) ) m_xThemedCursorRB->set_active( true ); else m_xSystemCursorRB->set_active( true ); InitGridOpt(); - m_xBreakCB->set_active( m_xLocalOptions->GetOption(VOPT_PAGEBREAKS) ); - m_xGuideLineCB->set_active( m_xLocalOptions->GetOption(VOPT_HELPLINES) ); + m_xBreakCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::PAGEBREAKS) ); + m_xGuideLineCB->set_active( m_xLocalOptions->GetOption(sc::ViewOption::HELPLINES) ); if(const SfxBoolItem* pFinderItem = rCoreSet->GetItemIfSet(SID_SC_INPUT_RANGEFINDER, false)) m_xRangeFindCB->set_active(pFinderItem->GetValue()); @@ -389,46 +389,62 @@ DeactivateRC ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) IMPL_LINK( ScTpContentOptions, SelLbObjHdl, weld::ComboBox&, rLb, void ) { const sal_Int32 nSelPos = rLb.get_active(); - ScVObjMode eMode = ScVObjMode(nSelPos); - ScVObjType eType = VOBJ_TYPE_OLE; + ScVObjMode eMode = ScVObjMode(nSelPos); + sc::ViewObjectType eType = sc::ViewObjectType::OLE; if ( &rLb == m_xDiagramLB.get() ) - eType = VOBJ_TYPE_CHART; + eType = sc::ViewObjectType::CHART; else if ( &rLb == m_xDrawLB.get() ) - eType = VOBJ_TYPE_DRAW; + eType = sc::ViewObjectType::DRAW; m_xLocalOptions->SetObjMode( eType, eMode ); } IMPL_LINK( ScTpContentOptions, CBHdl, weld::Toggleable&, rBtn, void ) { - ScViewOption eOption = VOPT_FORMULAS; + sc::ViewOption eOption =sc::ViewOption::FORMULAS; bool bChecked = rBtn.get_active(); - if (m_xFormulaCB.get() == &rBtn ) eOption = VOPT_FORMULAS; - else if ( m_xNilCB.get() == &rBtn ) eOption = VOPT_NULLVALS; - else if ( m_xAnnotCB.get() == &rBtn ) eOption = VOPT_NOTES; - else if ( m_xNoteAuthorCB.get() == &rBtn ) eOption = VOPT_NOTEAUTHOR; - else if ( m_xFormulaMarkCB.get() == &rBtn ) eOption = VOPT_FORMULAS_MARKS; - else if ( m_xValueCB.get() == &rBtn ) eOption = VOPT_SYNTAX; - else if ( m_xAnchorCB.get() == &rBtn ) eOption = VOPT_ANCHOR; - else if ( m_xVScrollCB.get() == &rBtn ) eOption = VOPT_VSCROLL; - else if ( m_xHScrollCB.get() == &rBtn ) eOption = VOPT_HSCROLL; - else if ( m_xTblRegCB.get() == &rBtn ) eOption = VOPT_TABCONTROLS; - else if ( m_xOutlineCB.get() == &rBtn ) eOption = VOPT_OUTLINER; - else if ( m_xBreakCB.get() == &rBtn ) eOption = VOPT_PAGEBREAKS; - else if ( m_xGuideLineCB.get() == &rBtn ) eOption = VOPT_HELPLINES; - else if ( m_xRowColHeaderCB.get() == &rBtn ) eOption = VOPT_HEADER; - else if ( m_xSummaryCB.get() == &rBtn ) eOption = VOPT_SUMMARY; - else if ( m_xThemedCursorRB.get() == &rBtn ) eOption = VOPT_THEMEDCURSOR; + if (m_xFormulaCB.get() == &rBtn ) + eOption = sc::ViewOption::FORMULAS; + else if ( m_xNilCB.get() == &rBtn ) + eOption = sc::ViewOption::NULLVALS; + else if ( m_xAnnotCB.get() == &rBtn ) + eOption = sc::ViewOption::NOTES; + else if ( m_xNoteAuthorCB.get() == &rBtn ) + eOption = sc::ViewOption::NOTEAUTHOR; + else if ( m_xFormulaMarkCB.get() == &rBtn ) + eOption = sc::ViewOption::FORMULAS_MARKS; + else if ( m_xValueCB.get() == &rBtn ) + eOption = sc::ViewOption::SYNTAX; + else if ( m_xAnchorCB.get() == &rBtn ) + eOption = sc::ViewOption::ANCHOR; + else if ( m_xVScrollCB.get() == &rBtn ) + eOption = sc::ViewOption::VSCROLL; + else if ( m_xHScrollCB.get() == &rBtn ) + eOption = sc::ViewOption::HSCROLL; + else if ( m_xTblRegCB.get() == &rBtn ) + eOption = sc::ViewOption::TABCONTROLS; + else if ( m_xOutlineCB.get() == &rBtn ) + eOption = sc::ViewOption::OUTLINER; + else if ( m_xBreakCB.get() == &rBtn ) + eOption = sc::ViewOption::PAGEBREAKS; + else if ( m_xGuideLineCB.get() == &rBtn ) + eOption = sc::ViewOption::HELPLINES; + else if ( m_xRowColHeaderCB.get() == &rBtn ) + eOption = sc::ViewOption::HEADER; + else if ( m_xSummaryCB.get() == &rBtn ) + eOption = sc::ViewOption::SUMMARY; + else if ( m_xThemedCursorRB.get() == &rBtn ) + eOption = sc::ViewOption::THEMEDCURSOR; m_xLocalOptions->SetOption( eOption, bChecked ); } void ScTpContentOptions::InitGridOpt() { - bool bGrid = m_xLocalOptions->GetOption( VOPT_GRID ); - bool bGridOnTop = m_xLocalOptions->GetOption( VOPT_GRID_ONTOP ); + bool bGrid = m_xLocalOptions->GetOption(sc::ViewOption::GRID); + bool bGridOnTop = m_xLocalOptions->GetOption(sc::ViewOption::GRID_ONTOP); sal_Int32 nSelPos = 0; if ( bGrid || bGridOnTop ) @@ -450,8 +466,8 @@ IMPL_LINK( ScTpContentOptions, GridHdl, weld::ComboBox&, rLb, void ) bool bGrid = ( nSelPos <= 1 ); bool bGridOnTop = ( nSelPos == 1 ); - m_xLocalOptions->SetOption( VOPT_GRID, bGrid ); - m_xLocalOptions->SetOption( VOPT_GRID_ONTOP, bGridOnTop ); + m_xLocalOptions->SetOption(sc::ViewOption::GRID, bGrid); + m_xLocalOptions->SetOption(sc::ViewOption::GRID_ONTOP, bGridOnTop); } ScTpLayoutOptions::ScTpLayoutOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet) diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 6e6fa79defcf..284ed81208d1 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -151,15 +151,15 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( /*Stampit enable/disable print cancel */ else if ( aPropertyName == SC_UNO_SHOWZERO ) - aViewOpt.SetOption(VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWNOTES ) - aViewOpt.SetOption(VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::NOTES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWNOTEAUTHOR ) - aViewOpt.SetOption(VOPT_NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWFORMULASMARKS ) - aViewOpt.SetOption(VOPT_FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWGRID ) - aViewOpt.SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::GRID, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_GRIDCOLOR ) { Color aColor; @@ -167,7 +167,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( aViewOpt.SetGridColor(aColor, OUString()); } else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) - aViewOpt.SetOption(VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNONAME_LINKUPD ) { // XXX NOTE: this is the css::document::Settings property @@ -202,11 +202,11 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( rDoc.SetLinkMode( eMode ); } else if ( aPropertyName == SC_UNO_COLROWHDR ) - aViewOpt.SetOption(VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::HEADER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHEETTABS ) - aViewOpt.SetOption(VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_OUTLSYMB ) - aViewOpt.SetOption(VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aViewOpt.SetOption(sc::ViewOption::OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_AUTOCALC ) rDoc.SetAutoCalc( ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_PRINTERNAME ) @@ -461,15 +461,15 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr /*Stampit enable/disable print cancel */ else if ( aPropertyName == SC_UNO_SHOWZERO ) - aRet <<= aViewOpt.GetOption( VOPT_NULLVALS ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::NULLVALS); else if ( aPropertyName == SC_UNO_SHOWNOTES ) - aRet <<= aViewOpt.GetOption( VOPT_NOTES ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::NOTES); else if ( aPropertyName == SC_UNO_SHOWNOTEAUTHOR ) - aRet <<= aViewOpt.GetOption( VOPT_NOTEAUTHOR ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::NOTEAUTHOR); else if ( aPropertyName == SC_UNO_SHOWFORMULASMARKS ) - aRet <<= aViewOpt.GetOption( VOPT_FORMULAS_MARKS ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::FORMULAS_MARKS); else if ( aPropertyName == SC_UNO_SHOWGRID ) - aRet <<= aViewOpt.GetOption( VOPT_GRID ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::GRID); else if ( aPropertyName == SC_UNO_GRIDCOLOR ) { OUString aColorName; @@ -477,7 +477,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr aRet <<= aColor; } else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) - aRet <<= aViewOpt.GetOption( VOPT_PAGEBREAKS ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::PAGEBREAKS); else if ( aPropertyName == SC_UNONAME_LINKUPD ) { sal_Int16 nLUM; @@ -500,11 +500,11 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr aRet <<= nLUM; } else if ( aPropertyName == SC_UNO_COLROWHDR ) - aRet <<= aViewOpt.GetOption( VOPT_HEADER ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::HEADER); else if ( aPropertyName == SC_UNO_SHEETTABS ) - aRet <<= aViewOpt.GetOption( VOPT_TABCONTROLS ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::TABCONTROLS); else if ( aPropertyName == SC_UNO_OUTLSYMB ) - aRet <<= aViewOpt.GetOption( VOPT_OUTLINER ); + aRet <<= aViewOpt.GetOption(sc::ViewOption::OUTLINER); else if ( aPropertyName == SC_UNO_AUTOCALC ) aRet <<= rDoc.GetAutoCalc(); else if ( aPropertyName == SC_UNO_PRINTERNAME ) diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index f505ae7606d6..300a554e25ba 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1765,35 +1765,35 @@ void SAL_CALL ScTabViewObj::setPropertyValue( ScViewOptions aNewOpt(rOldOpt); if ( aPropertyName == SC_UNO_COLROWHDR || aPropertyName == OLD_UNO_COLROWHDR ) - aNewOpt.SetOption( VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::HEADER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_HORSCROLL || aPropertyName == OLD_UNO_HORSCROLL ) - aNewOpt.SetOption( VOPT_HSCROLL, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::HSCROLL, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_OUTLSYMB || aPropertyName == OLD_UNO_OUTLSYMB ) - aNewOpt.SetOption( VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::OUTLINER, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHEETTABS || aPropertyName == OLD_UNO_SHEETTABS ) - aNewOpt.SetOption( VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWANCHOR ) - aNewOpt.SetOption( VOPT_ANCHOR, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::ANCHOR, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWFORM ) - aNewOpt.SetOption( VOPT_FORMULAS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::FORMULAS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWGRID ) - aNewOpt.SetOption( VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::GRID, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWHELP ) - aNewOpt.SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWNOTES ) - aNewOpt.SetOption( VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::NOTES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWNOTEAUTHOR ) - aNewOpt.SetOption( VOPT_NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWFORMULASMARKS ) - aNewOpt.SetOption( VOPT_FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) - aNewOpt.SetOption( VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWZERO ) - aNewOpt.SetOption( VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_VALUEHIGH || aPropertyName == OLD_UNO_VALUEHIGH ) - aNewOpt.SetOption( VOPT_SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_VERTSCROLL || aPropertyName == OLD_UNO_VERTSCROLL ) - aNewOpt.SetOption( VOPT_VSCROLL, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); + aNewOpt.SetOption(sc::ViewOption::VSCROLL, ScUnoHelpFunctions::GetBoolFromAny( aValue ) ); else if ( aPropertyName == SC_UNO_SHOWOBJ ) { sal_Int16 nIntVal = 0; @@ -1802,7 +1802,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( //#i80528# adapt to new range eventually if(sal_Int16(VOBJ_MODE_HIDE) < nIntVal) nIntVal = sal_Int16(VOBJ_MODE_SHOW); - aNewOpt.SetObjMode( VOBJ_TYPE_OLE, static_cast<ScVObjMode>(nIntVal)); + aNewOpt.SetObjMode(sc::ViewObjectType::OLE, static_cast<ScVObjMode>(nIntVal)); } } else if ( aPropertyName == SC_UNO_SHOWCHARTS ) @@ -1813,7 +1813,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( //#i80528# adapt to new range eventually if(sal_Int16(VOBJ_MODE_HIDE) < nIntVal) nIntVal = sal_Int16(VOBJ_MODE_SHOW); - aNewOpt.SetObjMode( VOBJ_TYPE_CHART, static_cast<ScVObjMode>(nIntVal)); + aNewOpt.SetObjMode(sc::ViewObjectType::CHART, static_cast<ScVObjMode>(nIntVal)); } } else if ( aPropertyName == SC_UNO_SHOWDRAW ) @@ -1824,7 +1824,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue( //#i80528# adapt to new range eventually if(sal_Int16(VOBJ_MODE_HIDE) < nIntVal) nIntVal = sal_Int16(VOBJ_MODE_SHOW); - aNewOpt.SetObjMode( VOBJ_TYPE_DRAW, static_cast<ScVObjMode>(nIntVal)); + aNewOpt.SetObjMode(sc::ViewObjectType::DRAW, static_cast<ScVObjMode>(nIntVal)); } } else if ( aPropertyName == SC_UNO_GRIDCOLOR ) @@ -1904,29 +1904,29 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName const ScViewOptions& rOpt = rViewData.GetOptions(); if ( aPropertyName == SC_UNO_COLROWHDR || aPropertyName == OLD_UNO_COLROWHDR ) - aRet <<= rOpt.GetOption( VOPT_HEADER ); + aRet <<= rOpt.GetOption(sc::ViewOption::HEADER); else if ( aPropertyName == SC_UNO_HORSCROLL || aPropertyName == OLD_UNO_HORSCROLL ) - aRet <<= rOpt.GetOption( VOPT_HSCROLL ); + aRet <<= rOpt.GetOption(sc::ViewOption::HSCROLL); else if ( aPropertyName == SC_UNO_OUTLSYMB || aPropertyName == OLD_UNO_OUTLSYMB ) - aRet <<= rOpt.GetOption( VOPT_OUTLINER ); + aRet <<= rOpt.GetOption(sc::ViewOption::OUTLINER); else if ( aPropertyName == SC_UNO_SHEETTABS || aPropertyName == OLD_UNO_SHEETTABS ) - aRet <<= rOpt.GetOption( VOPT_TABCONTROLS ); - else if ( aPropertyName == SC_UNO_SHOWANCHOR ) aRet <<= rOpt.GetOption( VOPT_ANCHOR ); - else if ( aPropertyName == SC_UNO_SHOWFORM ) aRet <<= rOpt.GetOption( VOPT_FORMULAS ); - else if ( aPropertyName == SC_UNO_SHOWGRID ) aRet <<= rOpt.GetOption( VOPT_GRID ); - else if ( aPropertyName == SC_UNO_SHOWHELP ) aRet <<= rOpt.GetOption( VOPT_HELPLINES ); - else if ( aPropertyName == SC_UNO_SHOWNOTES ) aRet <<= rOpt.GetOption( VOPT_NOTES ); - else if ( aPropertyName == SC_UNO_SHOWNOTEAUTHOR ) aRet <<= rOpt.GetOption( VOPT_NOTEAUTHOR ); - else if ( aPropertyName == SC_UNO_SHOWFORMULASMARKS ) aRet <<= rOpt.GetOption( VOPT_FORMULAS_MARKS ); - else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) aRet <<= rOpt.GetOption( VOPT_PAGEBREAKS ); - else if ( aPropertyName == SC_UNO_SHOWZERO ) aRet <<= rOpt.GetOption( VOPT_NULLVALS ); + aRet <<= rOpt.GetOption(sc::ViewOption::TABCONTROLS); + else if ( aPropertyName == SC_UNO_SHOWANCHOR ) aRet <<= rOpt.GetOption(sc::ViewOption::ANCHOR); + else if ( aPropertyName == SC_UNO_SHOWFORM ) aRet <<= rOpt.GetOption(sc::ViewOption::FORMULAS); + else if ( aPropertyName == SC_UNO_SHOWGRID ) aRet <<= rOpt.GetOption(sc::ViewOption::GRID); + else if ( aPropertyName == SC_UNO_SHOWHELP ) aRet <<= rOpt.GetOption(sc::ViewOption::HELPLINES); + else if ( aPropertyName == SC_UNO_SHOWNOTES ) aRet <<= rOpt.GetOption(sc::ViewOption::NOTES); + else if ( aPropertyName == SC_UNO_SHOWNOTEAUTHOR ) aRet <<= rOpt.GetOption(sc::ViewOption::NOTEAUTHOR); + else if ( aPropertyName == SC_UNO_SHOWFORMULASMARKS ) aRet <<= rOpt.GetOption(sc::ViewOption::FORMULAS_MARKS); + else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) aRet <<= rOpt.GetOption(sc::ViewOption::PAGEBREAKS); + else if ( aPropertyName == SC_UNO_SHOWZERO ) aRet <<= rOpt.GetOption(sc::ViewOption::NULLVALS); else if ( aPropertyName == SC_UNO_VALUEHIGH || aPropertyName == OLD_UNO_VALUEHIGH ) - aRet <<= rOpt.GetOption( VOPT_SYNTAX ); + aRet <<= rOpt.GetOption(sc::ViewOption::SYNTAX); else if ( aPropertyName == SC_UNO_VERTSCROLL || aPropertyName == OLD_UNO_VERTSCROLL ) - aRet <<= rOpt.GetOption( VOPT_VSCROLL ); - else if ( aPropertyName == SC_UNO_SHOWOBJ ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode( VOBJ_TYPE_OLE ) ); - else if ( aPropertyName == SC_UNO_SHOWCHARTS ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode( VOBJ_TYPE_CHART ) ); - else if ( aPropertyName == SC_UNO_SHOWDRAW ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) ); + aRet <<= rOpt.GetOption(sc::ViewOption::VSCROLL); + else if ( aPropertyName == SC_UNO_SHOWOBJ ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode(sc::ViewObjectType::OLE) ); + else if ( aPropertyName == SC_UNO_SHOWCHARTS ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode(sc::ViewObjectType::CHART) ); + else if ( aPropertyName == SC_UNO_SHOWDRAW ) aRet <<= static_cast<sal_Int16>( rOpt.GetObjMode(sc::ViewObjectType::DRAW) ); else if ( aPropertyName == SC_UNO_GRIDCOLOR ) aRet <<= rOpt.GetGridColor(); else if ( aPropertyName == SC_UNO_VISAREA ) aRet <<= GetVisArea(); else if ( aPropertyName == SC_UNO_ZOOMTYPE ) aRet <<= GetZoomType(); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 0221a047cd26..376d2b88c92d 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -608,7 +608,7 @@ void ScDrawView::UpdateUserViewOptions() const ScViewOptions& rOpt = rViewData.GetOptions(); const ScGridOptions& rGrid = rOpt.GetGridOptions(); - SetDragStripes( rOpt.GetOption( VOPT_HELPLINES ) ); + SetDragStripes( rOpt.GetOption(sc::ViewOption::HELPLINES) ); SetMarkHdlSizePixel( SC_HANDLESIZE_BIG ); SetGridVisible( rGrid.GetGridVisible() ); diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 3b257fabc226..020766cce334 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -260,9 +260,9 @@ void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, SdrLayerID nLayer ) const ScViewOptions& rOpts = mrViewData.GetOptions(); // use new flags at SdrPaintView for hiding objects - const bool bDrawOle(VOBJ_MODE_SHOW == rOpts.GetObjMode(VOBJ_TYPE_OLE)); - const bool bDrawChart(VOBJ_MODE_SHOW == rOpts.GetObjMode(VOBJ_TYPE_CHART)); - const bool bDrawDraw(VOBJ_MODE_SHOW == rOpts.GetObjMode(VOBJ_TYPE_DRAW)); + const bool bDrawOle(VOBJ_MODE_SHOW == rOpts.GetObjMode(sc::ViewObjectType::OLE)); + const bool bDrawChart(VOBJ_MODE_SHOW == rOpts.GetObjMode(sc::ViewObjectType::CHART)); + const bool bDrawDraw(VOBJ_MODE_SHOW == rOpts.GetObjMode(sc::ViewObjectType::DRAW)); if(!(bDrawOle || bDrawChart || bDrawDraw)) return; @@ -369,7 +369,7 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres if (pDrView) { const ScViewOptions& rOpts = mrViewData.GetOptions(); - if(rOpts.GetOption( VOPT_ANCHOR )) + if(rOpts.GetOption(sc::ViewOption::ANCHOR)) { bool bNegativePage = mrViewData.GetDocument().IsNegativePage( mrViewData.GetTabNo() ); Point aPos = mrViewData.GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, true ); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 7a828e5c6a87..7e938db95e5c 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -537,7 +537,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod ScTableInfo aTabInfo(nY1, nY2, true); rDoc.FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, - nPPTX, nPPTY, false, rOpts.GetOption(VOPT_FORMULAS), + nPPTX, nPPTY, false, rOpts.GetOption(sc::ViewOption::FORMULAS), &mrViewData.GetMarkData() ); Fraction aZoomX = mrViewData.GetZoomX(); @@ -697,8 +697,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOutputData.SetSyntaxMode ( mrViewData.IsSyntaxMode() ); aOutputData.SetGridColor ( aGridColor ); - aOutputData.SetShowNullValues ( rOpts.GetOption( VOPT_NULLVALS ) ); - aOutputData.SetShowFormulas ( rOpts.GetOption( VOPT_FORMULAS ) ); + aOutputData.SetShowNullValues ( rOpts.GetOption(sc::ViewOption::NULLVALS) ); + aOutputData.SetShowFormulas ( rOpts.GetOption(sc::ViewOption::FORMULAS) ); aOutputData.SetShowSpellErrors ( pCurTabViewShell && pCurTabViewShell->IsAutoSpell() ); aOutputData.SetMarkClipped ( pScMod->GetColorConfig().GetColorValue(svtools::CALCTEXTOVERFLOW).bIsVisible ); @@ -706,10 +706,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOutputData.SetViewShell(pCurTabViewShell); - bool bGrid = rOpts.GetOption( VOPT_GRID ) && mrViewData.GetShowGrid(); - bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP ); + bool bGrid = rOpts.GetOption(sc::ViewOption::GRID) && mrViewData.GetShowGrid(); + bool bGridFirst = !rOpts.GetOption(sc::ViewOption::GRID_ONTOP); - bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS ) && !bIsTiledRendering; + bool bPage = rOpts.GetOption(sc::ViewOption::PAGEBREAKS) && !bIsTiledRendering; bool bPageMode = mrViewData.IsPagebreakMode(); if (bPageMode) // after FindChanged @@ -937,10 +937,10 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI aOutputData.DrawSparklines(*pContentDev); // Show Note Mark - if ( rOpts.GetOption( VOPT_NOTES ) ) + if ( rOpts.GetOption(sc::ViewOption::NOTES) ) aOutputData.DrawNoteMarks(*pContentDev); - if ( rOpts.GetOption( VOPT_FORMULAS_MARKS ) ) + if ( rOpts.GetOption(sc::ViewOption::FORMULAS_MARKS) ) aOutputData.DrawFormulaMarks(*pContentDev); if ( !bLogicText ) @@ -2594,7 +2594,7 @@ IMPL_LINK(ScGridWindow, InitiatePageBreaksTimer, Timer*, pTimer, void) return; const ScViewOptions& rOpts = mrViewData.GetOptions(); - const bool bPage = rOpts.GetOption(VOPT_PAGEBREAKS); + const bool bPage = rOpts.GetOption(sc::ViewOption::PAGEBREAKS); // tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page // breaks is enabled, breaks should be visible. If the document is // opened the first time or a tab is activated the first time, the diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 4d028ea91e22..3b9e689206ff 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -204,7 +204,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) bDone = true; } - if ( rOpts.GetOption( VOPT_FORMULAS_MARKS ) ) + if ( rOpts.GetOption(sc::ViewOption::FORMULAS_MARKS) ) { aFormulaText = rDoc.GetFormula( nPosX, nPosY, nTab ); if ( !aFormulaText.isEmpty() ) { diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 60055b9aed97..abdc270a5b4f 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -454,9 +454,9 @@ void ScPrintFunc::DrawToDev(ScDocument& rDoc, OutputDevice* pDev, double /* nPri else { const ScViewOptions& rOpt = rDoc.GetViewOptions(); - bDoGrid = rOpt.GetOption(VOPT_GRID); - bNullVal = rOpt.GetOption(VOPT_NULLVALS); - bFormula = rOpt.GetOption(VOPT_FORMULAS); + bDoGrid = rOpt.GetOption(sc::ViewOption::GRID); + bNullVal = rOpt.GetOption(sc::ViewOption::NULLVALS); + bFormula = rOpt.GetOption(sc::ViewOption::FORMULAS); } MapMode aMode = pDev->GetMapMode(); diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index a792e6749173..35a5481737d4 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -538,8 +538,8 @@ void ScTabView::DrawEnableAnim(bool bSet) return; // don't start animations if display of graphics is disabled - // graphics are controlled by VOBJ_TYPE_OLE - if ( bSet && aViewData.GetOptions().GetObjMode(VOBJ_TYPE_OLE) == VOBJ_MODE_SHOW ) + // graphics are controlled by sc::ViewObjectType::OLE + if ( bSet && aViewData.GetOptions().GetObjMode(sc::ViewObjectType::OLE) == VOBJ_MODE_SHOW ) { if ( !pDrawView->IsAnimationEnabled() ) { diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 2d61476276b3..5a4fd2fc700a 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -951,13 +951,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScViewData& rViewData = GetViewData(); const ScViewOptions& rOpts = rViewData.GetOptions(); - bool bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS ); + bool bFormulaMode = !rOpts.GetOption(sc::ViewOption::FORMULAS); const SfxPoolItem *pItem; if( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SfxItemState::SET ) bFormulaMode = static_cast<const SfxBoolItem *>(pItem)->GetValue(); ScViewOptions aSetOpts = rOpts; - aSetOpts.SetOption( VOPT_FORMULAS, bFormulaMode ); + aSetOpts.SetOption(sc::ViewOption::FORMULAS, bFormulaMode); rViewData.SetOptions( aSetOpts ); ScDocument& rDoc = rViewData.GetDocument(); rDoc.SetViewOptions(aSetOpts); diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 5c77c71dab7e..0a27a60f5c77 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -390,7 +390,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) case FID_TOGGLEFORMULA: { const ScViewOptions& rOpts = rViewData.GetOptions(); - bool bFormulaMode = rOpts.GetOption( VOPT_FORMULAS ); + bool bFormulaMode = rOpts.GetOption(sc::ViewOption::FORMULAS); rSet.Put(SfxBoolItem(nWhich, bFormulaMode )); } break; @@ -905,7 +905,7 @@ void ScTabViewShell::ExecDrawOpt( const SfxRequest& rReq ) case SID_HELPLINES_MOVE: if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SfxItemState::SET ) { - aViewOptions.SetOption( VOPT_HELPLINES, static_cast<const SfxBoolItem*>(pItem)->GetValue() ); + aViewOptions.SetOption(sc::ViewOption::HELPLINES, static_cast<const SfxBoolItem*>(pItem)->GetValue() ); rBindings.Invalidate(SID_HELPLINES_MOVE); } break; @@ -929,7 +929,7 @@ void ScTabViewShell::GetDrawOptState( SfxItemSet& rSet ) aBool.SetWhich( SID_GRID_USE ); rSet.Put( aBool ); - aBool.SetValue(rViewOptions.GetOption( VOPT_HELPLINES )); + aBool.SetValue(rViewOptions.GetOption(sc::ViewOption::HELPLINES)); aBool.SetWhich( SID_HELPLINES_MOVE ); rSet.Put( aBool ); } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a3b5abfa6939..6b48eed5a4d4 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -3799,29 +3799,29 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe pSettings[SC_PAGE_BREAK_PREVIEW].Value <<= bPagebreak; pSettings[SC_SHOWZERO].Name = SC_UNO_SHOWZERO; - pSettings[SC_SHOWZERO].Value <<= maOptions.GetOption(VOPT_NULLVALS); + pSettings[SC_SHOWZERO].Value <<= maOptions.GetOption(sc::ViewOption::NULLVALS); pSettings[SC_SHOWNOTES].Name = SC_UNO_SHOWNOTES; - pSettings[SC_SHOWNOTES].Value <<= maOptions.GetOption(VOPT_NOTES); + pSettings[SC_SHOWNOTES].Value <<= maOptions.GetOption(sc::ViewOption::NOTES); pSettings[SC_SHOWNOTEAUTHOR].Name = SC_UNO_SHOWNOTEAUTHOR; - pSettings[SC_SHOWNOTEAUTHOR].Value <<= maOptions.GetOption(VOPT_NOTEAUTHOR); + pSettings[SC_SHOWNOTEAUTHOR].Value <<= maOptions.GetOption(sc::ViewOption::NOTEAUTHOR); pSettings[SC_SHOWFORMULASMARKS].Name = SC_UNO_SHOWFORMULASMARKS; - pSettings[SC_SHOWFORMULASMARKS].Value <<= maOptions.GetOption(VOPT_FORMULAS_MARKS); + pSettings[SC_SHOWFORMULASMARKS].Value <<= maOptions.GetOption(sc::ViewOption::FORMULAS_MARKS); pSettings[SC_SHOWGRID].Name = SC_UNO_SHOWGRID; - pSettings[SC_SHOWGRID].Value <<= maOptions.GetOption(VOPT_GRID); + pSettings[SC_SHOWGRID].Value <<= maOptions.GetOption(sc::ViewOption::GRID); pSettings[SC_GRIDCOLOR].Name = SC_UNO_GRIDCOLOR; OUString aColorName; Color aColor = maOptions.GetGridColor(&aColorName); pSettings[SC_GRIDCOLOR].Value <<= aColor; pSettings[SC_SHOWPAGEBR].Name = SC_UNO_SHOWPAGEBR; - pSettings[SC_SHOWPAGEBR].Value <<= maOptions.GetOption(VOPT_PAGEBREAKS); + pSettings[SC_SHOWPAGEBR].Value <<= maOptions.GetOption(sc::ViewOption::PAGEBREAKS); pSettings[SC_COLROWHDR].Name = SC_UNO_COLROWHDR; - pSettings[SC_COLROWHDR].Value <<= maOptions.GetOption(VOPT_HEADER); + pSettings[SC_COLROWHDR].Value <<= maOptions.GetOption(sc::ViewOption::HEADER); pSettings[SC_SHEETTABS].Name = SC_UNO_SHEETTABS; - pSettings[SC_SHEETTABS].Value <<= maOptions.GetOption(VOPT_TABCONTROLS); + pSettings[SC_SHEETTABS].Value <<= maOptions.GetOption(sc::ViewOption::TABCONTROLS); pSettings[SC_OUTLSYMB].Name = SC_UNO_OUTLSYMB; - pSettings[SC_OUTLSYMB].Value <<= maOptions.GetOption(VOPT_OUTLINER); + pSettings[SC_OUTLSYMB].Value <<= maOptions.GetOption(sc::ViewOption::OUTLINER); pSettings[SC_VALUE_HIGHLIGHTING].Name = SC_UNO_VALUEHIGH; - pSettings[SC_VALUE_HIGHLIGHTING].Value <<= maOptions.GetOption(VOPT_SYNTAX); + pSettings[SC_VALUE_HIGHLIGHTING].Value <<= maOptions.GetOption(sc::ViewOption::SYNTAX); pSettings[SC_FORMULA_BAR_HEIGHT].Name = SC_FORMULABARHEIGHT; pSettings[SC_FORMULA_BAR_HEIGHT].Value <<= GetFormulaBarLines();; @@ -3947,15 +3947,15 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> else if (sName == SC_SHOWPAGEBREAKPREVIEW) bPageMode = ScUnoHelpFunctions::GetBoolFromAny( rSetting.Value ); else if ( sName == SC_UNO_SHOWZERO ) - maOptions.SetOption(VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::NULLVALS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_SHOWNOTES ) - maOptions.SetOption(VOPT_NOTES, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::NOTES, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_SHOWNOTEAUTHOR ) - maOptions.SetOption(VOPT_NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::NOTEAUTHOR, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_SHOWFORMULASMARKS ) - maOptions.SetOption(VOPT_FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::FORMULAS_MARKS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_SHOWGRID ) - maOptions.SetOption(VOPT_GRID, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::GRID, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_GRIDCOLOR ) { Color aColor; @@ -3963,33 +3963,33 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> maOptions.SetGridColor(aColor, OUString()); } else if ( sName == SC_UNO_SHOWPAGEBR ) - maOptions.SetOption(VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_COLROWHDR ) - maOptions.SetOption(VOPT_HEADER, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::HEADER, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_SHEETTABS ) - maOptions.SetOption(VOPT_TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::TABCONTROLS, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_OUTLSYMB ) - maOptions.SetOption(VOPT_OUTLINER, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::OUTLINER, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else if ( sName == SC_UNO_SHOWOBJ ) { // #i80528# placeholders not supported anymore if ( rSetting.Value >>= nTemp16 ) - maOptions.SetObjMode(VOBJ_TYPE_OLE, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW); + maOptions.SetObjMode(sc::ViewObjectType::OLE, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW); } else if ( sName == SC_UNO_SHOWCHARTS ) { // #i80528# placeholders not supported anymore if ( rSetting.Value >>= nTemp16 ) - maOptions.SetObjMode(VOBJ_TYPE_CHART, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW); + maOptions.SetObjMode(sc::ViewObjectType::CHART, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW); } else if ( sName == SC_UNO_SHOWDRAW ) { // #i80528# placeholders not supported anymore if ( rSetting.Value >>= nTemp16 ) - maOptions.SetObjMode(VOBJ_TYPE_DRAW, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW); + maOptions.SetObjMode(sc::ViewObjectType::DRAW, (nTemp16 == 1) ? VOBJ_MODE_HIDE : VOBJ_MODE_SHOW); } else if ( sName == SC_UNO_VALUEHIGH && !comphelper::LibreOfficeKit::isActive() ) - maOptions.SetOption(VOPT_SYNTAX, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); + maOptions.SetOption(sc::ViewOption::SYNTAX, ScUnoHelpFunctions::GetBoolFromAny(rSetting.Value)); else { ScGridOptions aGridOpt(maOptions.GetGridOptions()); @@ -4038,12 +4038,11 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> void ScViewData::SetOptions( const ScViewOptions& rOpt ) { // if visibility of horizontal ScrollBar is changed, TabBar may have to be resized... - bool bHScrollChanged = (rOpt.GetOption(VOPT_HSCROLL) != maOptions.GetOption(VOPT_HSCROLL)); + bool bHScrollChanged = (rOpt.GetOption(sc::ViewOption::HSCROLL) != maOptions.GetOption(sc::ViewOption::HSCROLL)); // if graphics are turned on or off, animation has to be started or stopped - // graphics are controlled by VOBJ_TYPE_OLE - bool bGraphicsChanged = (maOptions.GetObjMode(VOBJ_TYPE_OLE) != - rOpt.GetObjMode(VOBJ_TYPE_OLE) ); + // graphics are controlled by sc::ViewObjectType::OLE + bool bGraphicsChanged = maOptions.GetObjMode(sc::ViewObjectType::OLE) != rOpt.GetObjMode(sc::ViewObjectType::OLE); maOptions = rOpt; OSL_ENSURE( pView, "No View" ); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 6dd70c5511e1..85482f5d0f09 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2071,7 +2071,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, if (nCommand == SvxSearchCmd::FIND_ALL || nCommand == SvxSearchCmd::REPLACE_ALL) { SfxViewFrame* pViewFrm = SfxViewFrame::Current(); - bool bShow = GetViewData().GetViewShell()->GetViewData().GetOptions().GetOption( VOPT_SUMMARY ); + bool bShow = GetViewData().GetViewShell()->GetViewData().GetOptions().GetOption(sc::ViewOption::SUMMARY); if (bShow && pViewFrm && !comphelper::LibreOfficeKit::isActive()) { diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 3d8e4b921498..2452d3d507f5 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -2339,7 +2339,7 @@ void ScViewFunc::SetWidthOrHeight( if ( eMode == SC_SIZE_OPTIMAL ) { const ScViewOptions& rOpts = GetViewData().GetOptions(); - bFormula = rOpts.GetOption( VOPT_FORMULAS ); + bFormula = rOpts.GetOption(sc::ViewOption::FORMULAS); } ScDocumentUniquePtr pUndoDoc;
